X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/510132b69d4fdceca750f6de39b2be84c49006c8..48eb121209c8235fd433f2d941654bde9f5b427f:/openssh/auth-options.c diff --git a/openssh/auth-options.c b/openssh/auth-options.c index 2787d29..9f90437 100644 --- a/openssh/auth-options.c +++ b/openssh/auth-options.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); +RCSID("$OpenBSD: auth-options.c,v 1.20 2001/08/30 20:36:34 stevesk Exp $"); #include "packet.h" #include "xmalloc.h" @@ -20,10 +20,7 @@ RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); #include "channels.h" #include "auth-options.h" #include "servconf.h" -#include "bufaux.h" #include "misc.h" -#include "monitor_wrap.h" -#include "auth.h" /* Flags set authorized_keys flags */ int no_port_forwarding_flag = 0; @@ -57,7 +54,6 @@ auth_clear_options(void) forced_command = NULL; } channel_clear_permitted_opens(); - auth_debug_reset(); } /* @@ -79,28 +75,28 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) while (*opts && *opts != ' ' && *opts != '\t') { cp = "no-port-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { - auth_debug_add("Port forwarding disabled."); + packet_send_debug("Port forwarding disabled."); no_port_forwarding_flag = 1; opts += strlen(cp); goto next_option; } cp = "no-agent-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { - auth_debug_add("Agent forwarding disabled."); + packet_send_debug("Agent forwarding disabled."); no_agent_forwarding_flag = 1; opts += strlen(cp); goto next_option; } cp = "no-X11-forwarding"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { - auth_debug_add("X11 forwarding disabled."); + packet_send_debug("X11 forwarding disabled."); no_x11_forwarding_flag = 1; opts += strlen(cp); goto next_option; } cp = "no-pty"; if (strncasecmp(opts, cp, strlen(cp)) == 0) { - auth_debug_add("Pty allocation disabled."); + packet_send_debug("Pty allocation disabled."); no_pty_flag = 1; opts += strlen(cp); goto next_option; @@ -123,14 +119,14 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if (!*opts) { debug("%.100s, line %lu: missing end quote", file, linenum); - auth_debug_add("%.100s, line %lu: missing end quote", + packet_send_debug("%.100s, line %lu: missing end quote", file, linenum); xfree(forced_command); forced_command = NULL; goto bad_option; } forced_command[i] = 0; - auth_debug_add("Forced command: %.900s", forced_command); + packet_send_debug("Forced command: %.900s", forced_command); opts++; goto next_option; } @@ -155,13 +151,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if (!*opts) { debug("%.100s, line %lu: missing end quote", file, linenum); - auth_debug_add("%.100s, line %lu: missing end quote", + packet_send_debug("%.100s, line %lu: missing end quote", file, linenum); xfree(s); goto bad_option; } s[i] = 0; - auth_debug_add("Adding to environment: %.900s", s); + packet_send_debug("Adding to environment: %.900s", s); debug("Adding to environment: %.900s", s); opts++; new_envstring = xmalloc(sizeof(struct envstring)); @@ -174,7 +170,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if (strncasecmp(opts, cp, strlen(cp)) == 0) { const char *remote_ip = get_remote_ipaddr(); const char *remote_host = get_canonical_hostname( - options.verify_reverse_mapping); + options.reverse_mapping_check); char *patterns = xmalloc(strlen(opts) + 1); opts += strlen(cp); @@ -192,7 +188,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if (!*opts) { debug("%.100s, line %lu: missing end quote", file, linenum); - auth_debug_add("%.100s, line %lu: missing end quote", + packet_send_debug("%.100s, line %lu: missing end quote", file, linenum); xfree(patterns); goto bad_option; @@ -206,7 +202,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) "correct key but not from a permitted " "host (host=%.200s, ip=%.200s).", pw->pw_name, remote_host, remote_ip); - auth_debug_add("Your host '%.200s' is not " + packet_send_debug("Your host '%.200s' is not " "permitted to use this key for login.", remote_host); /* deny access */ @@ -237,7 +233,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if (!*opts) { debug("%.100s, line %lu: missing end quote", file, linenum); - auth_debug_add("%.100s, line %lu: missing end quote", + packet_send_debug("%.100s, line %lu: missing end quote", file, linenum); xfree(patterns); goto bad_option; @@ -248,7 +244,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) sscanf(patterns, "%255[^/]/%5[0-9]", host, sport) != 2) { debug("%.100s, line %lu: Bad permitopen specification " "<%.100s>", file, linenum, patterns); - auth_debug_add("%.100s, line %lu: " + packet_send_debug("%.100s, line %lu: " "Bad permitopen specification", file, linenum); xfree(patterns); goto bad_option; @@ -256,7 +252,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) if ((port = a2port(sport)) == 0) { debug("%.100s, line %lu: Bad permitopen port <%.100s>", file, linenum, sport); - auth_debug_add("%.100s, line %lu: " + packet_send_debug("%.100s, line %lu: " "Bad permitopen port", file, linenum); xfree(patterns); goto bad_option; @@ -280,22 +276,14 @@ next_option: opts++; /* Process the next option. */ } - - if (!use_privsep) - auth_debug_send(); - /* grant access */ return 1; bad_option: log("Bad options in %.100s file, line %lu: %.50s", file, linenum, opts); - auth_debug_add("Bad options in %.100s file, line %lu: %.50s", + packet_send_debug("Bad options in %.100s file, line %lu: %.50s", file, linenum, opts); - - if (!use_privsep) - auth_debug_send(); - /* deny access */ return 0; }