diff -uprk.orig openssh-3.6.1p1.orig/auth-options.c openssh-3.6.1p1/auth-options.c --- openssh-3.6.1p1.orig/auth-options.c 2002-08-01 05:28:38 +0400 +++ openssh-3.6.1p1/auth-options.c 2003-04-11 18:51:48 +0400 @@ -63,7 +63,7 @@ auth_clear_options(void) * side effect: sets key option flags */ int -auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) +auth_parse_options(struct passwd *pw, char *opts, const char *file, u_long linenum) { const char *cp; int i; @@ -77,6 +77,7 @@ auth_parse_options(struct passwd *pw, ch while (*opts && *opts != ' ' && *opts != '\t') { cp = "no-port-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { + debug("Port forwarding disabled."); auth_debug_add("Port forwarding disabled."); no_port_forwarding_flag = 1; opts += strlen(cp); @@ -84,6 +85,7 @@ auth_parse_options(struct passwd *pw, ch } cp = "no-agent-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { + debug("Agent forwarding disabled."); auth_debug_add("Agent forwarding disabled."); no_agent_forwarding_flag = 1; opts += strlen(cp); @@ -91,6 +93,7 @@ auth_parse_options(struct passwd *pw, ch } cp = "no-X11-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { + debug("X11 forwarding disabled."); auth_debug_add("X11 forwarding disabled."); no_x11_forwarding_flag = 1; opts += strlen(cp); @@ -98,6 +101,7 @@ auth_parse_options(struct passwd *pw, ch } cp = "no-pty"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { + debug("Pty allocation disabled."); auth_debug_add("Pty allocation disabled."); no_pty_flag = 1; opts += strlen(cp); @@ -128,6 +132,7 @@ auth_parse_options(struct passwd *pw, ch goto bad_option; } forced_command[i] = 0; + debug("Forced command: %.900s", forced_command); auth_debug_add("Forced command: %.900s", forced_command); opts++; goto next_option; @@ -160,8 +165,8 @@ auth_parse_options(struct passwd *pw, ch goto bad_option; } s[i] = 0; - auth_debug_add("Adding to environment: %.900s", s); debug("Adding to environment: %.900s", s); + auth_debug_add("Adding to environment: %.900s", s); opts++; new_envstring = xmalloc(sizeof(struct envstring)); new_envstring->s = s; diff -uprk.orig openssh-3.6.1p1.orig/auth-options.h openssh-3.6.1p1/auth-options.h --- openssh-3.6.1p1.orig/auth-options.h 2002-07-24 01:07:46 +0400 +++ openssh-3.6.1p1/auth-options.h 2003-04-11 18:51:48 +0400 @@ -29,7 +29,7 @@ extern int no_pty_flag; extern char *forced_command; extern struct envstring *custom_environment; -int auth_parse_options(struct passwd *, char *, char *, u_long); +int auth_parse_options(struct passwd *, char *, const char *, u_long); void auth_clear_options(void); #endif