Module Name: src
Committed By: christos
Date: Sun Feb 21 09:54:57 UTC 2010
Modified Files:
src/bin/sh: main.c
Log Message:
fix faulty logic in previous change.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/bin/sh/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/main.c
diff -u src/bin/sh/main.c:1.55 src/bin/sh/main.c:1.56
--- src/bin/sh/main.c:1.55 Sat Feb 20 18:15:17 2010
+++ src/bin/sh/main.c Sun Feb 21 04:54:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.55 2010/02/20 23:15:17 christos Exp $ */
+/* $NetBSD: main.c,v 1.56 2010/02/21 09:54:57 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.55 2010/02/20 23:15:17 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.56 2010/02/21 09:54:57 christos Exp $");
#endif
#endif /* not lint */
@@ -187,7 +187,8 @@
}
state2:
state = 3;
- if (iflag && posix && getuid() == geteuid() && getgid() == getegid()) {
+ if ((iflag || !posix) &&
+ getuid() == geteuid() && getgid() == getegid()) {
if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
state = 3;
read_profile(shinit);
