diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-19 15:44:10 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-19 15:44:10 +0000 |
commit | cf0809d6444bcc0030c9cb82ebc592a261023fe4 (patch) | |
tree | 85ff44157c4ceefcd62d6bbb47f5b1e07fe18da5 | |
parent | 5dc81502cbac042e3e66e9f31bd932623ca43e31 (diff) |
Removed one more 'ISSUE' comment in auth1.c
20010120
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26
[ssh-chall.c servconf.c servconf.h ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-chall.c | 4 | ||||
-rw-r--r-- | auth1.c | 2 | ||||
-rw-r--r-- | servconf.c | 12 | ||||
-rw-r--r-- | servconf.h | 4 | ||||
-rw-r--r-- | ssh.h | 8 | ||||
-rw-r--r-- | sshd.c | 4 |
7 files changed, 14 insertions, 26 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010120 | ||
2 | - (bal) OpenBSD Resync | ||
3 | - markus@cvs.openbsd.org 2001/01/19 12:45:26 | ||
4 | [ssh-chall.c servconf.c servconf.h ssh.h sshd.c] | ||
5 | only auth-chall.c needs #ifdef SKEY | ||
6 | |||
1 | 20010119 | 7 | 20010119 |
2 | - (djm) Update versions in RPM specfiles | 8 | - (djm) Update versions in RPM specfiles |
3 | - (bal) OpenBSD Resync | 9 | - (bal) OpenBSD Resync |
diff --git a/auth-chall.c b/auth-chall.c index e02e99d36..e99ddb39f 100644 --- a/auth-chall.c +++ b/auth-chall.c | |||
@@ -23,12 +23,14 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth-chall.c,v 1.1 2001/01/18 17:12:43 markus Exp $"); | 26 | RCSID("$OpenBSD: auth-chall.c,v 1.2 2001/01/19 12:45:26 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
30 | 30 | ||
31 | #ifdef SKEY | 31 | #ifdef SKEY |
32 | #include <skey.h> | ||
33 | |||
32 | char * | 34 | char * |
33 | get_challenge(Authctxt *authctxt, char *devs) | 35 | get_challenge(Authctxt *authctxt, char *devs) |
34 | { | 36 | { |
@@ -322,7 +322,7 @@ do_authloop(Authctxt *authctxt) | |||
322 | fatal("INTERNAL ERROR: authenticated invalid user %s", | 322 | fatal("INTERNAL ERROR: authenticated invalid user %s", |
323 | authctxt->user); | 323 | authctxt->user); |
324 | 324 | ||
325 | #ifdef HAVE_CYGWIN /* ISSUE: Right place? */ | 325 | #ifdef HAVE_CYGWIN |
326 | if (authenticated && | 326 | if (authenticated && |
327 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) { | 327 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) { |
328 | packet_disconnect("Authentication rejected for uid %d.", | 328 | packet_disconnect("Authentication rejected for uid %d.", |
diff --git a/servconf.c b/servconf.c index 544bb340e..801267b48 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.58 2001/01/18 16:20:22 markus Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.59 2001/01/19 12:45:26 markus Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | 15 | #include "ssh.h" |
16 | #include "servconf.h" | 16 | #include "servconf.h" |
@@ -61,9 +61,7 @@ initialize_server_options(ServerOptions *options) | |||
61 | #endif | 61 | #endif |
62 | options->password_authentication = -1; | 62 | options->password_authentication = -1; |
63 | options->kbd_interactive_authentication = -1; | 63 | options->kbd_interactive_authentication = -1; |
64 | #ifdef SKEY | ||
65 | options->skey_authentication = -1; | 64 | options->skey_authentication = -1; |
66 | #endif | ||
67 | options->permit_empty_passwd = -1; | 65 | options->permit_empty_passwd = -1; |
68 | options->use_login = -1; | 66 | options->use_login = -1; |
69 | options->allow_tcp_forwarding = -1; | 67 | options->allow_tcp_forwarding = -1; |
@@ -157,10 +155,8 @@ fill_default_server_options(ServerOptions *options) | |||
157 | options->password_authentication = 1; | 155 | options->password_authentication = 1; |
158 | if (options->kbd_interactive_authentication == -1) | 156 | if (options->kbd_interactive_authentication == -1) |
159 | options->kbd_interactive_authentication = 0; | 157 | options->kbd_interactive_authentication = 0; |
160 | #ifdef SKEY | ||
161 | if (options->skey_authentication == -1) | 158 | if (options->skey_authentication == -1) |
162 | options->skey_authentication = 1; | 159 | options->skey_authentication = 1; |
163 | #endif | ||
164 | if (options->permit_empty_passwd == -1) | 160 | if (options->permit_empty_passwd == -1) |
165 | options->permit_empty_passwd = 0; | 161 | options->permit_empty_passwd = 0; |
166 | if (options->use_login == -1) | 162 | if (options->use_login == -1) |
@@ -189,9 +185,7 @@ typedef enum { | |||
189 | #ifdef AFS | 185 | #ifdef AFS |
190 | sKerberosTgtPassing, sAFSTokenPassing, | 186 | sKerberosTgtPassing, sAFSTokenPassing, |
191 | #endif | 187 | #endif |
192 | #ifdef SKEY | ||
193 | sSkeyAuthentication, | 188 | sSkeyAuthentication, |
194 | #endif | ||
195 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, | 189 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, |
196 | sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset, | 190 | sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset, |
197 | sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail, | 191 | sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail, |
@@ -233,9 +227,7 @@ static struct { | |||
233 | #endif | 227 | #endif |
234 | { "passwordauthentication", sPasswordAuthentication }, | 228 | { "passwordauthentication", sPasswordAuthentication }, |
235 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, | 229 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, |
236 | #ifdef SKEY | ||
237 | { "skeyauthentication", sSkeyAuthentication }, | 230 | { "skeyauthentication", sSkeyAuthentication }, |
238 | #endif | ||
239 | { "checkmail", sCheckMail }, | 231 | { "checkmail", sCheckMail }, |
240 | { "listenaddress", sListenAddress }, | 232 | { "listenaddress", sListenAddress }, |
241 | { "printmotd", sPrintMotd }, | 233 | { "printmotd", sPrintMotd }, |
@@ -530,11 +522,9 @@ parse_flag: | |||
530 | intptr = &options->check_mail; | 522 | intptr = &options->check_mail; |
531 | goto parse_flag; | 523 | goto parse_flag; |
532 | 524 | ||
533 | #ifdef SKEY | ||
534 | case sSkeyAuthentication: | 525 | case sSkeyAuthentication: |
535 | intptr = &options->skey_authentication; | 526 | intptr = &options->skey_authentication; |
536 | goto parse_flag; | 527 | goto parse_flag; |
537 | #endif | ||
538 | 528 | ||
539 | case sPrintMotd: | 529 | case sPrintMotd: |
540 | intptr = &options->print_motd; | 530 | intptr = &options->print_motd; |
diff --git a/servconf.h b/servconf.h index 532b22f6e..ea0694905 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: servconf.h,v 1.33 2001/01/08 22:29:05 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: servconf.h,v 1.34 2001/01/19 12:45:27 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
@@ -80,10 +80,8 @@ typedef struct { | |||
80 | int password_authentication; /* If true, permit password | 80 | int password_authentication; /* If true, permit password |
81 | * authentication. */ | 81 | * authentication. */ |
82 | int kbd_interactive_authentication; /* If true, permit */ | 82 | int kbd_interactive_authentication; /* If true, permit */ |
83 | #ifdef SKEY | ||
84 | int skey_authentication; /* If true, permit s/key | 83 | int skey_authentication; /* If true, permit s/key |
85 | * authentication. */ | 84 | * authentication. */ |
86 | #endif | ||
87 | int permit_empty_passwd; /* If false, do not permit empty | 85 | int permit_empty_passwd; /* If false, do not permit empty |
88 | * passwords. */ | 86 | * passwords. */ |
89 | int use_login; /* If true, login(1) is used */ | 87 | int use_login; /* If true, login(1) is used */ |
@@ -12,7 +12,7 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* RCSID("$OpenBSD: ssh.h,v 1.58 2001/01/18 16:20:22 markus Exp $"); */ | 15 | /* RCSID("$OpenBSD: ssh.h,v 1.59 2001/01/19 12:45:27 markus Exp $"); */ |
16 | 16 | ||
17 | #ifndef SSH_H | 17 | #ifndef SSH_H |
18 | #define SSH_H | 18 | #define SSH_H |
@@ -549,12 +549,6 @@ int radix_to_creds(const char *buf, CREDENTIALS * creds); | |||
549 | 549 | ||
550 | #endif /* KRB4 */ | 550 | #endif /* KRB4 */ |
551 | 551 | ||
552 | #ifdef SKEY | ||
553 | #include <skey.h> | ||
554 | char *skey_fake_keyinfo(char *username); | ||
555 | int auth_skey_password(struct passwd * pw, const char *password); | ||
556 | #endif /* SKEY */ | ||
557 | |||
558 | /* AF_UNSPEC or AF_INET or AF_INET6 */ | 552 | /* AF_UNSPEC or AF_INET or AF_INET6 */ |
559 | extern int IPv4or6; | 553 | extern int IPv4or6; |
560 | 554 | ||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.152 2001/01/18 16:20:22 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.153 2001/01/19 12:45:27 markus Exp $"); |
44 | 44 | ||
45 | #include "xmalloc.h" | 45 | #include "xmalloc.h" |
46 | #include "rsa.h" | 46 | #include "rsa.h" |
@@ -1250,10 +1250,8 @@ do_ssh1_kex(void) | |||
1250 | if (options.afs_token_passing) | 1250 | if (options.afs_token_passing) |
1251 | auth_mask |= 1 << SSH_PASS_AFS_TOKEN; | 1251 | auth_mask |= 1 << SSH_PASS_AFS_TOKEN; |
1252 | #endif | 1252 | #endif |
1253 | #ifdef SKEY | ||
1254 | if (options.skey_authentication == 1) | 1253 | if (options.skey_authentication == 1) |
1255 | auth_mask |= 1 << SSH_AUTH_TIS; | 1254 | auth_mask |= 1 << SSH_AUTH_TIS; |
1256 | #endif | ||
1257 | if (options.password_authentication) | 1255 | if (options.password_authentication) |
1258 | auth_mask |= 1 << SSH_AUTH_PASSWORD; | 1256 | auth_mask |= 1 << SSH_AUTH_PASSWORD; |
1259 | packet_put_int(auth_mask); | 1257 | packet_put_int(auth_mask); |