diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /auth-options.c | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
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 | } |