summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/port-aix.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 55319fc23..95a69597b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120070809
2 - (dtucker) [openbsd-compat/port-aix.c] Comment typo.
3
120070808 420070808
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - ray@cvs.openbsd.org 2007/07/12 05:48:05 6 - ray@cvs.openbsd.org 2007/07/12 05:48:05
@@ -3135,4 +3138,4 @@
3135 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3138 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3136 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3139 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3137 3140
3138$Id: ChangeLog,v 1.4718 2007/08/08 04:32:41 djm Exp $ 3141$Id: ChangeLog,v 1.4719 2007/08/09 04:29:47 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index b9fabf61f..94faec670 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -240,7 +240,7 @@ sys_auth_allowed_user(struct passwd *pw, Buffer *loginmsg)
240 240
241 /* 241 /*
242 * Don't perform checks for root account (PermitRootLogin controls 242 * Don't perform checks for root account (PermitRootLogin controls
243 * logins via * ssh) or if running as non-root user (since 243 * logins via ssh) or if running as non-root user (since
244 * loginrestrictions will always fail due to insufficient privilege). 244 * loginrestrictions will always fail due to insufficient privilege).
245 */ 245 */
246 if (pw->pw_uid == 0 || geteuid() != 0) { 246 if (pw->pw_uid == 0 || geteuid() != 0) {