diff options
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/auth-options.c b/auth-options.c index ef61d8df8..5457d9b14 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,12 +10,14 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.8 2001/01/13 18:38:00 markus Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.11 2001/01/21 19:05:41 markus Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | ||
16 | #include "packet.h" | 15 | #include "packet.h" |
17 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
18 | #include "match.h" | 17 | #include "match.h" |
18 | #include "log.h" | ||
19 | #include "canohost.h" | ||
20 | #include "auth-options.h" | ||
19 | 21 | ||
20 | /* Flags set authorized_keys flags */ | 22 | /* Flags set authorized_keys flags */ |
21 | int no_port_forwarding_flag = 0; | 23 | int no_port_forwarding_flag = 0; |
@@ -48,9 +50,12 @@ auth_clear_options(void) | |||
48 | } | 50 | } |
49 | } | 51 | } |
50 | 52 | ||
51 | /* return 1 if access is granted, 0 if not. side effect: sets key option flags */ | 53 | /* |
54 | * return 1 if access is granted, 0 if not. | ||
55 | * side effect: sets key option flags | ||
56 | */ | ||
52 | int | 57 | int |
53 | auth_parse_options(struct passwd *pw, char *options, u_long linenum) | 58 | auth_parse_options(struct passwd *pw, char *options, char *file, u_long linenum) |
54 | { | 59 | { |
55 | const char *cp; | 60 | const char *cp; |
56 | if (!options) | 61 | if (!options) |
@@ -106,9 +111,9 @@ auth_parse_options(struct passwd *pw, char *options, u_long linenum) | |||
106 | } | 111 | } |
107 | if (!*options) { | 112 | if (!*options) { |
108 | debug("%.100s, line %lu: missing end quote", | 113 | debug("%.100s, line %lu: missing end quote", |
109 | SSH_USER_PERMITTED_KEYS, linenum); | 114 | file, linenum); |
110 | packet_send_debug("%.100s, line %lu: missing end quote", | 115 | packet_send_debug("%.100s, line %lu: missing end quote", |
111 | SSH_USER_PERMITTED_KEYS, linenum); | 116 | file, linenum); |
112 | continue; | 117 | continue; |
113 | } | 118 | } |
114 | forced_command[i] = 0; | 119 | forced_command[i] = 0; |
@@ -136,9 +141,9 @@ auth_parse_options(struct passwd *pw, char *options, u_long linenum) | |||
136 | } | 141 | } |
137 | if (!*options) { | 142 | if (!*options) { |
138 | debug("%.100s, line %lu: missing end quote", | 143 | debug("%.100s, line %lu: missing end quote", |
139 | SSH_USER_PERMITTED_KEYS, linenum); | 144 | file, linenum); |
140 | packet_send_debug("%.100s, line %lu: missing end quote", | 145 | packet_send_debug("%.100s, line %lu: missing end quote", |
141 | SSH_USER_PERMITTED_KEYS, linenum); | 146 | file, linenum); |
142 | continue; | 147 | continue; |
143 | } | 148 | } |
144 | s[i] = 0; | 149 | s[i] = 0; |
@@ -170,9 +175,9 @@ auth_parse_options(struct passwd *pw, char *options, u_long linenum) | |||
170 | } | 175 | } |
171 | if (!*options) { | 176 | if (!*options) { |
172 | debug("%.100s, line %lu: missing end quote", | 177 | debug("%.100s, line %lu: missing end quote", |
173 | SSH_USER_PERMITTED_KEYS, linenum); | 178 | file, linenum); |
174 | packet_send_debug("%.100s, line %lu: missing end quote", | 179 | packet_send_debug("%.100s, line %lu: missing end quote", |
175 | SSH_USER_PERMITTED_KEYS, linenum); | 180 | file, linenum); |
176 | continue; | 181 | continue; |
177 | } | 182 | } |
178 | patterns[i] = 0; | 183 | patterns[i] = 0; |
@@ -219,9 +224,9 @@ next_option: | |||
219 | 224 | ||
220 | bad_option: | 225 | bad_option: |
221 | log("Bad options in %.100s file, line %lu: %.50s", | 226 | log("Bad options in %.100s file, line %lu: %.50s", |
222 | SSH_USER_PERMITTED_KEYS, linenum, options); | 227 | file, linenum, options); |
223 | packet_send_debug("Bad options in %.100s file, line %lu: %.50s", | 228 | packet_send_debug("Bad options in %.100s file, line %lu: %.50s", |
224 | SSH_USER_PERMITTED_KEYS, linenum, options); | 229 | file, linenum, options); |
225 | /* deny access */ | 230 | /* deny access */ |
226 | return 0; | 231 | return 0; |
227 | } | 232 | } |