- markus@cvs.openbsd.org 2001/02/07 22:35:46
[auth1.c auth2.c sshd.c] move k_setpag() to a central place; ok dugsong@
This commit is contained in:
parent
c5dbf7fdc9
commit
f79aeffe3b
|
@ -1,3 +1,9 @@
|
||||||
|
20010211
|
||||||
|
- (bal) OpenBSD Sync
|
||||||
|
- markus@cvs.openbsd.org 2001/02/07 22:35:46
|
||||||
|
[auth1.c auth2.c sshd.c]
|
||||||
|
move k_setpag() to a central place; ok dugsong@
|
||||||
|
|
||||||
20010210
|
20010210
|
||||||
- (djm) Sync sftp and scp stuff from OpenBSD:
|
- (djm) Sync sftp and scp stuff from OpenBSD:
|
||||||
- djm@cvs.openbsd.org 2001/02/07 03:55:13
|
- djm@cvs.openbsd.org 2001/02/07 03:55:13
|
||||||
|
@ -3780,4 +3786,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.712 2001/02/10 00:37:17 mouring Exp $
|
$Id: ChangeLog,v 1.713 2001/02/10 21:27:11 mouring Exp $
|
||||||
|
|
10
auth1.c
10
auth1.c
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 $");
|
||||||
|
|
||||||
#ifdef HAVE_OSF_SIA
|
#ifdef HAVE_OSF_SIA
|
||||||
# include <sia.h>
|
# include <sia.h>
|
||||||
|
@ -389,14 +389,6 @@ do_authentication()
|
||||||
|
|
||||||
setproctitle("%s", user);
|
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. */
|
/* Verify that the user is a valid user. */
|
||||||
pw = getpwnam(user);
|
pw = getpwnam(user);
|
||||||
if (pw && allowed_user(pw)) {
|
if (pw && allowed_user(pw)) {
|
||||||
|
|
9
auth2.c
9
auth2.c
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 $");
|
||||||
|
|
||||||
#ifdef HAVE_OSF_SIA
|
#ifdef HAVE_OSF_SIA
|
||||||
# include <sia.h>
|
# include <sia.h>
|
||||||
|
@ -126,13 +126,6 @@ do_authentication2()
|
||||||
if (options.challenge_reponse_authentication)
|
if (options.challenge_reponse_authentication)
|
||||||
options.kbd_interactive_authentication = 1;
|
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_init(&protocol_error);
|
||||||
dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);
|
dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);
|
||||||
dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt);
|
dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt);
|
||||||
|
|
7
sshd.c
7
sshd.c
|
@ -1148,6 +1148,13 @@ main(int ac, char **av)
|
||||||
options.kerberos_authentication = 0;
|
options.kerberos_authentication = 0;
|
||||||
}
|
}
|
||||||
#endif /* KRB4 */
|
#endif /* KRB4 */
|
||||||
|
#ifdef AFS
|
||||||
|
/* If machine has AFS, set process authentication group. */
|
||||||
|
if (k_hasafs()) {
|
||||||
|
k_setpag();
|
||||||
|
k_unlog();
|
||||||
|
}
|
||||||
|
#endif /* AFS */
|
||||||
|
|
||||||
packet_set_nonblocking();
|
packet_set_nonblocking();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue