diff svr-runopts.c @ 122:cb7ef2f63bf0 private-rez

propagate of f51a272341ee12268fe7028bc2f2bad66c603069 and ab35ee4292ea910d4871c3609d6100fe34300720 from branch 'matt.dbclient.rez' to 'matt.dbclient.work'
author Matt Johnston <matt@ucc.asn.au>
date Tue, 14 Sep 2004 13:09:29 +0000
parents 9337c9f9a607
children 0cfba3034be5
line wrap: on
line diff
--- a/svr-runopts.c	Sun Sep 12 05:53:48 2004 +0000
+++ b/svr-runopts.c	Tue Sep 14 13:09:29 2004 +0000
@@ -59,7 +59,7 @@
 					"-m		Don't display the motd on login\n"
 #endif
 					"-w		Disallow root logins\n"
-#ifdef ENABLE_SVR_PASSWORD_AUTH
+#if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH)
 					"-s		Disable password logins\n"
 					"-g		Disable password logins for root\n"
 #endif
@@ -183,7 +183,7 @@
 				case 'w':
 					svr_opts.norootlogin = 1;
 					break;
-#ifdef ENABLE_SVR_PASSWORD_AUTH
+#if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH)
 				case 's':
 					svr_opts.noauthpass = 1;
 					break;