diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | auth1.c | 10 | ||||
-rw-r--r-- | auth2.c | 9 | ||||
-rw-r--r-- | sshd.c | 7 |
4 files changed, 16 insertions, 18 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010211 | ||
2 | - (bal) OpenBSD Sync | ||
3 | - markus@cvs.openbsd.org 2001/02/07 22:35:46 | ||
4 | [auth1.c auth2.c sshd.c] | ||
5 | move k_setpag() to a central place; ok dugsong@ | ||
6 | |||
1 | 20010210 | 7 | 20010210 |
2 | - (djm) Sync sftp and scp stuff from OpenBSD: | 8 | - (djm) Sync sftp and scp stuff from OpenBSD: |
3 | - djm@cvs.openbsd.org 2001/02/07 03:55:13 | 9 | - djm@cvs.openbsd.org 2001/02/07 03:55:13 |
@@ -3780,4 +3786,4 @@ | |||
3780 | - Wrote replacements for strlcpy and mkdtemp | 3786 | - Wrote replacements for strlcpy and mkdtemp |
3781 | - Released 1.0pre1 | 3787 | - Released 1.0pre1 |
3782 | 3788 | ||
3783 | $Id: ChangeLog,v 1.712 2001/02/10 00:37:17 mouring Exp $ | 3789 | $Id: ChangeLog,v 1.713 2001/02/10 21:27:11 mouring Exp $ |
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.14 2001/01/22 23:06:39 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $"); |
14 | 14 | ||
15 | #ifdef HAVE_OSF_SIA | 15 | #ifdef HAVE_OSF_SIA |
16 | # include <sia.h> | 16 | # include <sia.h> |
@@ -389,14 +389,6 @@ do_authentication() | |||
389 | 389 | ||
390 | setproctitle("%s", user); | 390 | setproctitle("%s", user); |
391 | 391 | ||
392 | #ifdef AFS | ||
393 | /* If machine has AFS, set process authentication group. */ | ||
394 | if (k_hasafs()) { | ||
395 | k_setpag(); | ||
396 | k_unlog(); | ||
397 | } | ||
398 | #endif /* AFS */ | ||
399 | |||
400 | /* Verify that the user is a valid user. */ | 392 | /* Verify that the user is a valid user. */ |
401 | pw = getpwnam(user); | 393 | pw = getpwnam(user); |
402 | if (pw && allowed_user(pw)) { | 394 | if (pw && allowed_user(pw)) { |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.36 2001/02/04 15:32:22 stevesk Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.37 2001/02/07 22:35:46 markus Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_OSF_SIA | 28 | #ifdef HAVE_OSF_SIA |
29 | # include <sia.h> | 29 | # include <sia.h> |
@@ -126,13 +126,6 @@ do_authentication2() | |||
126 | if (options.challenge_reponse_authentication) | 126 | if (options.challenge_reponse_authentication) |
127 | options.kbd_interactive_authentication = 1; | 127 | options.kbd_interactive_authentication = 1; |
128 | 128 | ||
129 | #ifdef AFS | ||
130 | /* If machine has AFS, set process authentication group. */ | ||
131 | if (k_hasafs()) { | ||
132 | k_setpag(); | ||
133 | k_unlog(); | ||
134 | } | ||
135 | #endif | ||
136 | dispatch_init(&protocol_error); | 129 | dispatch_init(&protocol_error); |
137 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); | 130 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); |
138 | dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); | 131 | dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); |
@@ -1148,6 +1148,13 @@ main(int ac, char **av) | |||
1148 | options.kerberos_authentication = 0; | 1148 | options.kerberos_authentication = 0; |
1149 | } | 1149 | } |
1150 | #endif /* KRB4 */ | 1150 | #endif /* KRB4 */ |
1151 | #ifdef AFS | ||
1152 | /* If machine has AFS, set process authentication group. */ | ||
1153 | if (k_hasafs()) { | ||
1154 | k_setpag(); | ||
1155 | k_unlog(); | ||
1156 | } | ||
1157 | #endif /* AFS */ | ||
1151 | 1158 | ||
1152 | packet_set_nonblocking(); | 1159 | packet_set_nonblocking(); |
1153 | 1160 | ||