tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Bug #178: On AIX /etc/nologin wasnt't shown to users. Fix from 

Ralf.Wenk@fh-karlsruhe.de and dtucker@zip.com.au
This commit is contained in:
Damien Miller 2003-01-07 17:38:58 +11:00
parent b93addb6d6
commit f25c18d7e8
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -10,6 +10,8 @@
on one by peak@argo.troja.mff.cuni.cz on one by peak@argo.troja.mff.cuni.cz
- (djm) Bug #111: Run syslog and stderr logging through strnvis to eliminate - (djm) Bug #111: Run syslog and stderr logging through strnvis to eliminate
nasties. Report from peak@argo.troja.mff.cuni.cz nasties. Report from peak@argo.troja.mff.cuni.cz
- (djm) Bug #178: On AIX /etc/nologin wasnt't shown to users. Fix from
Ralf.Wenk@fh-karlsruhe.de and dtucker@zip.com.au
20030103 20030103
- (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from
@ -938,4 +940,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2546 2003/01/07 06:04:18 djm Exp $ $Id: ChangeLog,v 1.2547 2003/01/07 06:38:58 djm Exp $

10
auth.c
View File

@ -218,6 +218,8 @@ allowed_user(struct passwd * pw)
*/ */
if ( (pw->pw_uid != 0) && (geteuid() == 0) && if ( (pw->pw_uid != 0) && (geteuid() == 0) &&
loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &loginmsg) != 0) { loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &loginmsg) != 0) {
int loginrestrict_errno = errno;
if (loginmsg && *loginmsg) { if (loginmsg && *loginmsg) {
/* Remove embedded newlines (if any) */ /* Remove embedded newlines (if any) */
char *p; char *p;
@ -227,9 +229,13 @@ allowed_user(struct passwd * pw)
} }
/* Remove trailing newline */ /* Remove trailing newline */
*--p = '\0'; *--p = '\0';
log("Login restricted for %s: %.100s", pw->pw_name, loginmsg); log("Login restricted for %s: %.100s", pw->pw_name,
loginmsg);
} }
return 0; /* Don't fail if /etc/nologin set */
if (!(loginrestrict_errno == EPERM &&
stat(_PATH_NOLOGIN, &st) == 0))
return 0;
} }
#endif /* WITH_AIXAUTHENTICATE */ #endif /* WITH_AIXAUTHENTICATE */

1
session.c
View File

@ -1194,6 +1194,7 @@ do_nologin(struct passwd *pw)
while (fgets(buf, sizeof(buf), f)) while (fgets(buf, sizeof(buf), f))
fputs(buf, stderr); fputs(buf, stderr);
fclose(f); fclose(f);
fflush(NULL);
exit(254); exit(254);
} }
} }