diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-07 22:35:47 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-07 22:35:47 +0000 |
| commit | 9d35834aa1343aad60fcce719b4aab0e0cbdb191 (patch) | |
| tree | d95bb4f383b3b8c4d7b136db21ece15727c6025a /usr.bin/ssh | |
| parent | bbfc3bb73825f97856bf29f30ccf007edb39cc46 (diff) | |
move k_setpag() to a central place; ok dugsong@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/auth1.c | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/auth2.c | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 9 |
3 files changed, 10 insertions, 18 deletions
diff --git a/usr.bin/ssh/auth1.c b/usr.bin/ssh/auth1.c index b19901d0578..6d4126f2a91 100644 --- a/usr.bin/ssh/auth1.c +++ b/usr.bin/ssh/auth1.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.14 2001/01/22 23:06:39 markus Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -336,14 +336,6 @@ do_authentication() setproctitle("%s", user); -#ifdef AFS - /* If machine has AFS, set process authentication group. */ - if (k_hasafs()) { - k_setpag(); - k_unlog(); - } -#endif /* AFS */ - /* Verify that the user is a valid user. */ pw = getpwnam(user); if (pw && allowed_user(pw)) { diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index a4e84a0e17d..7fa18c37e3c 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.36 2001/02/04 15:32:22 stevesk Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.37 2001/02/07 22:35:46 markus Exp $"); #include <openssl/evp.h> @@ -113,13 +113,6 @@ do_authentication2() if (options.challenge_reponse_authentication) options.kbd_interactive_authentication = 1; -#ifdef AFS - /* If machine has AFS, set process authentication group. */ - if (k_hasafs()) { - k_setpag(); - k_unlog(); - } -#endif dispatch_init(&protocol_error); dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index bae91bf9888..7ae326e46bb 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.164 2001/02/07 22:35:46 markus Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1129,6 +1129,13 @@ main(int ac, char **av) options.kerberos_authentication = 0; } #endif /* KRB4 */ +#ifdef AFS + /* If machine has AFS, set process authentication group. */ + if (k_hasafs()) { + k_setpag(); + k_unlog(); + } +#endif /* AFS */ packet_set_nonblocking(); |