- (bal) Fix bug id 383 and only call loginrestrict for AIX if not root.
This commit is contained in:
Ben Lindstrom 2002-10-16 00:13:52 +00:00
parent 94f628f0ab
commit 97e38d8667
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,6 @@
20021015
- (bal) Fix bug id 383 and only call loginrestrict for AIX if not root.
20021015
- (tim) [contrib/caldera/openssh.spec] make ssh-agent setgid nobody
@ -764,4 +767,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
$Id: ChangeLog,v 1.2494 2002/10/15 20:16:55 tim Exp $
$Id: ChangeLog,v 1.2495 2002/10/16 00:13:52 mouring Exp $

8
auth.c
View File

@ -202,7 +202,13 @@ allowed_user(struct passwd * pw)
}
#ifdef WITH_AIXAUTHENTICATE
if (loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &loginmsg) != 0) {
/*
* Don't check loginrestrictions() for root account (use
* PermitRootLogin to control logins via ssh), or if running as
* non-root user (since loginrestrictions will always fail).
*/
if ( (pw->pw_uid != 0) && (geteuid() == 0) &&
loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &loginmsg) != 0) {
if (loginmsg && *loginmsg) {
/* Remove embedded newlines (if any) */
char *p;