about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-09-28 09:47:13 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-09-28 09:47:13 +0000
commitd061785438d489058141a831fbd2818909f3d11d (patch)
tree76dde8793d68756d1b3729db6e7f6a755dbcb9aa
parent966ff3a185ba150625cd14022392d310cf9c1649 (diff)
downloadzsh-d061785438d489058141a831fbd2818909f3d11d.tar.gz
zsh-d061785438d489058141a831fbd2818909f3d11d.tar.xz
zsh-d061785438d489058141a831fbd2818909f3d11d.zip
22783: Frank Terbeck: don't load zsh/newuser unless interactive
-rw-r--r--ChangeLog5
-rw-r--r--Src/init.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4695a9a2c..cf48542aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-28  Peter Stephenson  <pws@csr.com>
+
+	* 22783: Frank Terbeck: Src/init.c: don't load zsh/newuser
+	unless interactive.
+
 2006-09-27  Peter Stephenson  <pws@csr.com>
 
 	* 22780: Completion/Base/Utility/_arguments:
diff --git a/Src/init.c b/Src/init.c
index 50bdec59d..4121e9b70 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -958,7 +958,7 @@ run_init_scripts(void)
 	source(GLOBAL_ZSHENV);
 #endif
 
-	if (isset(RCS) && unset(PRIVILEGED))
+	if (isset(RCS) && isset(INTERACTIVE) && unset(PRIVILEGED))
 	{
 	    /*
 	     * Always attempt to load the newuser module to perform