summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/login.conf4
-rw-r--r--libexec/ftpd/ftpd.86
-rw-r--r--libexec/rlogind/rlogind.84
-rw-r--r--libexec/rshd/rshd.86
-rw-r--r--release/picobsd/dial/floppy.tree/etc/login.conf4
-rw-r--r--release/picobsd/isp/floppy.tree/etc/login.conf4
-rw-r--r--release/picobsd/isp/lang/rc.en3
-rw-r--r--release/picobsd/net/floppy.tree/etc/login.conf4
-rw-r--r--release/picobsd/net/lang/rc.en3
-rw-r--r--release/picobsd/router/floppy.tree/etc/login.conf4
-rw-r--r--sbin/nologin/nologin.512
-rw-r--r--usr.sbin/nologin/nologin.512
12 files changed, 32 insertions, 34 deletions
diff --git a/etc/login.conf b/etc/login.conf
index f3d08d4..27365ef 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -9,7 +9,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $Id: login.conf,v 1.24 1998/12/29 22:17:31 hoek Exp $
+# $Id: login.conf,v 1.25 1999/01/11 09:07:38 asami Exp $
#
# Default settings effectively disable resource limits, see the
@@ -125,7 +125,7 @@ russian:Russian Users Accounts:\
# :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
# :path=~/bin /bin /usr/bin /usr/local/bin:\
# :manpath=/usr/share/man /usr/local/man:\
-# :nologin=/etc/nologin:\
+# :nologin=/var/run/nologin:\
# :cputime=1h30m:\
# :datasize=8M:\
# :stacksize=2M:\
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 5cb6620..df63932 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
-.\" $Id: ftpd.8,v 1.23 1998/09/29 22:02:06 alex Exp $
+.\" $Id: ftpd.8,v 1.24 1998/12/02 22:11:02 billf Exp $
.\"
.Dd April 19, 1994
.Dt FTPD 8
@@ -138,7 +138,7 @@ Allow only anonymous ftp access.
.El
.Pp
The file
-.Pa /etc/nologin
+.Pa /var/run/nologin
can be used to disable ftp access.
If the file exists,
.Nm
@@ -436,7 +436,7 @@ Virtual hosting configuration file.
Welcome notice.
.It Pa /etc/ftpmotd
Welcome notice after login.
-.It Pa /etc/nologin
+.It Pa /var/run/nologin
Displayed and access refused.
.It Pa /var/log/ftpd
Log file for anonymous transfers.
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index e3f3593..4f8ae93 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rlogind.8 8.1 (Berkeley) 6/4/93
-.\" $Id: rlogind.8,v 1.8 1997/02/22 14:22:07 peter Exp $
+.\" $Id: rlogind.8,v 1.9 1997/11/25 07:17:13 charnier Exp $
.\"
.Dd June 4, 1993
.Dt RLOGIND 8
@@ -177,7 +177,7 @@ by the server failed.
.It Pa /etc/hosts
.It Pa /etc/hosts.equiv
.It Pa $HOME/.rhosts
-.It Pa /etc/nologin
+.It Pa /var/run/nologin
.El
.Sh BUGS
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 314f3fe..7af12ec 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rshd.8 8.1 (Berkeley) 6/4/93
-.\" $Id: rshd.8,v 1.13 1998/12/03 05:45:18 bde Exp $
+.\" $Id: rshd.8,v 1.14 1998/12/16 07:20:44 peter Exp $
.\"
.Dd June 4, 1993
.Dt RSHD 8
@@ -126,7 +126,7 @@ file,
unless the user is the superuser.
.It
If the file
-.Pa /etc/nologin
+.Pa /var/run/nologin
exists and the user is not the superuser,
the connection is closed.
The name of the nologin file may be overridden
@@ -231,7 +231,7 @@ and is not preceded by a flag byte.
.It Pa /etc/hosts.equiv
.It Pa /etc/login.conf
.It Pa $HOME/.rhosts
-.It Pa /etc/nologin
+.It Pa /var/run/nologin
.El
.Sh BUGS
The authentication procedure used here assumes the integrity
diff --git a/release/picobsd/dial/floppy.tree/etc/login.conf b/release/picobsd/dial/floppy.tree/etc/login.conf
index 97ea6e8..9361a33 100644
--- a/release/picobsd/dial/floppy.tree/etc/login.conf
+++ b/release/picobsd/dial/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:41 abial Exp $
+# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
#
@@ -45,7 +45,7 @@ standard:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
:path=~/bin /bin /usr/bin:\
- :nologin=/etc/nologin:\
+ :nologin=/var/run/nologin:\
:cputime=1h30m:\
:datasize=8M:\
:stacksize=2M:\
diff --git a/release/picobsd/isp/floppy.tree/etc/login.conf b/release/picobsd/isp/floppy.tree/etc/login.conf
index 3bfdd8a..9361a33 100644
--- a/release/picobsd/isp/floppy.tree/etc/login.conf
+++ b/release/picobsd/isp/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:45 abial Exp $
+# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
#
@@ -45,7 +45,7 @@ standard:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
:path=~/bin /bin /usr/bin:\
- :nologin=/etc/nologin:\
+ :nologin=/var/run/nologin:\
:cputime=1h30m:\
:datasize=8M:\
:stacksize=2M:\
diff --git a/release/picobsd/isp/lang/rc.en b/release/picobsd/isp/lang/rc.en
index 785c0ac..90423c4 100644
--- a/release/picobsd/isp/lang/rc.en
+++ b/release/picobsd/isp/lang/rc.en
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: rc.en,v 1.2 1998/09/26 17:27:22 abial Exp $
+# $Id: rc.en,v 1.3 1998/11/01 20:19:19 abial Exp $
############################################
### Special setup for one floppy PICOBSD ###
### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
@@ -25,7 +25,6 @@ fi
mount -a -t nfs
chmod 666 /dev/tty[pqrsPQRS]*
# clean up left-over files
-rm -f /etc/nologin
(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
if [ -n "$network_pass1_done" ]; then
network_pass2
diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf
index bde6121..8e0451e 100644
--- a/release/picobsd/net/floppy.tree/etc/login.conf
+++ b/release/picobsd/net/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:49 abial Exp $
+# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
#
@@ -45,7 +45,7 @@ standard:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
:path=~/bin /bin /usr/bin:\
- :nologin=/etc/nologin:\
+ :nologin=/var/run/nologin:\
:cputime=1h30m:\
:datasize=8M:\
:stacksize=2M:\
diff --git a/release/picobsd/net/lang/rc.en b/release/picobsd/net/lang/rc.en
index 03391d0..e4a0fe3 100644
--- a/release/picobsd/net/lang/rc.en
+++ b/release/picobsd/net/lang/rc.en
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: rc.en,v 1.2 1998/09/26 17:27:24 abial Exp $
+# $Id: rc.en,v 1.3 1998/11/01 20:19:23 abial Exp $
############################################
### Special setup for one floppy PICOBSD ###
### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
@@ -25,7 +25,6 @@ fi
mount -a -t nfs
chmod 666 /dev/tty[pqrsPQRS]*
# clean up left-over files
-rm -f /etc/nologin
(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
if [ -n "$network_pass1_done" ]; then
network_pass2
diff --git a/release/picobsd/router/floppy.tree/etc/login.conf b/release/picobsd/router/floppy.tree/etc/login.conf
index d6a8d95..caa5699 100644
--- a/release/picobsd/router/floppy.tree/etc/login.conf
+++ b/release/picobsd/router/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $Id: login.conf,v 1.1 1998/08/02 13:03:30 abial Exp $
+# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
#
@@ -45,7 +45,7 @@ standard:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
:path=~/bin /bin /usr/bin:\
- :nologin=/etc/nologin:\
+ :nologin=/var/run/nologin:\
:cputime=1h30m:\
:datasize=8M:\
:stacksize=2M:\
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index d84c566..19a070d 100644
--- a/sbin/nologin/nologin.5
+++ b/sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nologin.8 8.1 (Berkeley) 6/19/93
-.\" $Id$
+.\" $Id: nologin.5,v 1.4 1998/07/15 06:37:06 charnier Exp $
.\"
.Dd June 19, 1993
.Dt NOLOGIN 5
@@ -41,22 +41,22 @@
.Sh DESCRIPTION
.Nm Nologin
disallows logins if the file
-.Pa /etc/nologin
+.Pa /var/run/nologin
exists.
Programs display the contents of
-.Pa /etc/nologin
+.Pa /var/run/nologin
to the user and exit.
.Sh SECURITY
Ignored by
.Xr login 1
for user root.
.Sh FILES
-.Bl -tag -width /etc/nologinxxx -compact
-.It Pa /etc/nologin
+.Bl -tag -width /var/run/nologinxxx -compact
+.It Pa /var/run/nologin
The
.Nm
file resides in
-.Pa /etc .
+.Pa /var/run .
.El
.Sh SEE ALSO
.Xr login 1 ,
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index d84c566..19a070d 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nologin.8 8.1 (Berkeley) 6/19/93
-.\" $Id$
+.\" $Id: nologin.5,v 1.4 1998/07/15 06:37:06 charnier Exp $
.\"
.Dd June 19, 1993
.Dt NOLOGIN 5
@@ -41,22 +41,22 @@
.Sh DESCRIPTION
.Nm Nologin
disallows logins if the file
-.Pa /etc/nologin
+.Pa /var/run/nologin
exists.
Programs display the contents of
-.Pa /etc/nologin
+.Pa /var/run/nologin
to the user and exit.
.Sh SECURITY
Ignored by
.Xr login 1
for user root.
.Sh FILES
-.Bl -tag -width /etc/nologinxxx -compact
-.It Pa /etc/nologin
+.Bl -tag -width /var/run/nologinxxx -compact
+.It Pa /var/run/nologin
The
.Nm
file resides in
-.Pa /etc .
+.Pa /var/run .
.El
.Sh SEE ALSO
.Xr login 1 ,
OpenPOWER on IntegriCloud