head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2001.03.02.17.33.57;	author nectar;	state dead;
branches;
next	1.1;

1.1
date	2001.01.09.16.25.22;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update 1.2.1 -> 1.2.2
@
text
@--- appl/bsd/krshd.c~	Thu Jun 29 22:27:05 2000
+++ appl/bsd/krshd.c	Sat Jan  6 12:57:23 2001
@@@@ -160,6 +160,16 @@@@
 Key_schedule v4_schedule;
 #endif
 
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+
+#if defined(_PATH_NOLOGIN)
+#define NOLOGIN		_PATH_NOLOGIN
+#else
+#define NOLOGIN		"/etc/nologin"
+#endif
+
 #include "defines.h"
 
 #if HAVE_ARPA_NAMESER_H
@@@@ -1119,7 +1129,7 @@@@
 	goto signout_please;
     }
     
-    if (pwd->pw_uid && !access("/etc/nologin", F_OK)) {
+    if (pwd->pw_uid && !access(NOLOGIN, F_OK)) {
 	error("Logins currently disabled.\n");
 	goto signout_please;
     }
@


1.1
log
@kshd  has /etc/nologin hardcoded instead of using _PATH_NOLOGIN
from <paths.h> (if available) like login.krb5 does.   As a result,
on FreeBSD 4.2 these two programs end up using different paths
for the nologin file (which is /var/run/nologin on FreeBSD).

Submitted by:	<djm@@test.pubnix.com>
@
text
@@

