Move contents of /var/at into /var/cron since at is now intergrated into

cron.  When ISC cron 5.0 is out the integration will be even tighter.

Also rename /var/cron/{allow,deny} -> /var/cron/cron.{allow,deny}
for consistency with POSIX and at.{allow,deny} and install an empty
cron.deny file (as we do at.deny) since crontab will require this
in the near future for POSIX compliance.

After a "make build" you can update your system as follows:
# mv /var/at/* /var/cron
# mv /var/cron/jobs /var/cron/atjobs
# mv /var/cron.allow /var/cron/cron.allow
# mv /var/cron.deny /var/cron/cron.deny
# rm -rf /var/at
# kill `cat /var/run/cron.pid` ; cron

9 files changed, 53 insertions, 55 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 0fef39f3638..1cc86761071 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.176 2003/02/06 16:34:51 henning Exp $
+#	$OpenBSD: Makefile,v 1.177 2003/02/19 22:11:42 millert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -192,7 +192,9 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \
 		${DESTDIR}/etc/dumpdates
 	${INSTALL} -c -o root -g crontab -m 660 /dev/null \
-		${DESTDIR}/var/at/at.deny
+		${DESTDIR}/var/cron/at.deny
+	${INSTALL} -c -o root -g crontab -m 660 /dev/null \
+		${DESTDIR}/var/cron/cron.deny
 	${INSTALL} -c -o root -g wheel -m 600 /dev/null \
 		${DESTDIR}/var/cron/log
 	${INSTALL} -c -o root -g wheel -m 444 /dev/null \
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index f6b0f9d28c6..dc5ff5b3a93 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.143 2003/02/04 01:35:08 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.144 2003/02/19 22:11:42 millert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1792,17 +1792,6 @@ dev		mode=0555
 # ./var/empty
 ..
 
-# ./var/at
-at		gname=daemon
-
-# ./var/at/jobs
-jobs		gname=crontab mode=01770
-# ./var/at/jobs
-..
-
-# ./var/at
-..
-
 # ./var/backups
 backups		mode=0700
 # ./var/backups
@@ -1821,8 +1810,15 @@ crash		mode=770
 # ./var/cron
 cron		mode=0555
 
+# ./var/cron/atjobs
+atjobs		gname=crontab mode=01770
+
 # ./var/cron/tabs
-tabs		gname=crontab mode=1730
+..
+
+# ./var/cron/tabs
+tabs		gname=crontab mode=01730
+
 # ./var/cron/tabs
 ..
 
diff --git a/etc/mtree/special b/etc/mtree/special
index a8391373408..081fd73a38e 100644
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.50 2003/02/06 16:34:51 henning Exp $
+#	$OpenBSD: special,v 1.51 2003/02/19 22:11:42 millert Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -134,15 +134,15 @@ var		type=dir mode=0755 uname=root gname=wheel
 account		type=dir mode=0755 uname=root gname=wheel
 acct		type=file mode=0644 uname=root gname=wheel optional
 ..	#var/account
-at		type=dir mode=0755 uname=root gname=daemon ignore
-..	#var/at
 yp		type=dir mode=0755 uname=root gname=wheel optional ignore
 ..	#var/yp
 backups		type=dir mode=0700 uname=root gname=wheel ignore
 ..	#var/backups
 cron		type=dir mode=0555 uname=root gname=wheel
 log		type=file mode=0600 uname=root gname=wheel
-tabs		type=dir mode=1730 uname=root gname=crontab ignore
+atjobs		type=dir mode=01770 uname=root gname=crontab ignore
+..	#var/cron/atjobs
+tabs		type=dir mode=01730 uname=root gname=crontab ignore
 ..	#var/cron/tabs
 ..	#var/cron
 db		type=dir mode=0755 uname=root gname=wheel
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 407967fcfbd..6e3efed1e10 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.29 2003/02/19 20:47:09 millert Exp $
+.\" $OpenBSD: at.1,v 1.30 2003/02/19 22:11:42 millert Exp $
 .\"
 .\" Copyright (C) 1993, 1994  Thomas Koenig
 .\" Copyright (C) 1993  David Parsons
@@ -276,20 +276,20 @@ shell, the owner of the login shell will receive the mail.
 For non-root users, permission to run
 .Nm
 is determined by the files
-.Pa /var/at/at.allow
+.Pa /var/cron/at.allow
 and
-.Pa /var/at/at.deny .
+.Pa /var/cron/at.deny .
 .Em Note :
 these files must be readable by group crontab (if they exist).
 .Pp
 If the file
-.Pa /var/at/at.allow
+.Pa /var/cron/at.allow
 exists, only usernames mentioned in it are allowed to use
 .Nm at .
 If
-.Pa /var/at/at.allow
+.Pa /var/cron/at.allow
 does not exist,
-.Pa /var/at/at.deny
+.Pa /var/cron/at.deny
 is checked.
 Every username not mentioned in it is then allowed to use
 .Nm at .
@@ -297,16 +297,16 @@ If neither exists, only the superuser is allowed to run
 .Nm at .
 .Pp
 An empty
-.Pa /var/at/at.deny
+.Pa /var/cron/at.deny
 means that every user is allowed use these commands.
 This is the default configuration.
 .Sh FILES
-.Bl -tag -width /var/at/at.allow -compact
-.It Pa /var/at/jobs
+.Bl -tag -width /var/cron/at.allow -compact
+.It Pa /var/cron/atjobs
 directory containing job files
-.It Pa /var/at/at.allow
+.It Pa /var/cron/at.allow
 allow permission control
-.It Pa /var/at/at.deny
+.It Pa /var/cron/at.deny
 deny permission control
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/at/atq.1 b/usr.bin/at/atq.1
index 37ab415efd2..284ee8def7a 100644
--- a/usr.bin/at/atq.1
+++ b/usr.bin/at/atq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atq.1,v 1.1 2002/05/14 18:05:39 millert Exp $
+.\"	$OpenBSD: atq.1,v 1.2 2003/02/19 22:11:42 millert Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -92,8 +92,8 @@ Jobs that have completed but have not yet been removed are also displayed.
 If a name(s) is provided, only those files belonging to that user(s) are
 displayed.
 .Sh FILES
-.Bl -tag -width /var/at/jobs -compact
-.It Pa /var/at/jobs
+.Bl -tag -width /var/cron/atjobs -compact
+.It Pa /var/cron/atjobs
 directory containing job files
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/at/atrm.1 b/usr.bin/at/atrm.1
index 4448d21a793..bfc41e2694e 100644
--- a/usr.bin/at/atrm.1
+++ b/usr.bin/at/atrm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atrm.1,v 1.2 2003/02/19 00:22:54 millert Exp $
+.\"	$OpenBSD: atrm.1,v 1.3 2003/02/19 22:11:42 millert Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -78,8 +78,8 @@ If one or more user names are specified, all jobs belonging to those users
 are removed.
 Only the superuser may remove other users' jobs.
 .Sh FILES
-.Bl -tag -width /var/at/jobs -compact
-.It Pa /var/at/jobs
+.Bl -tag -width /var/cron/atjobs -compact
+.It Pa /var/cron/atjobs
 directory containing job files
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/cron/cron.8 b/usr.sbin/cron/cron.8
index 92cfe1fe207..e6fe731e9ef 100644
--- a/usr.sbin/cron/cron.8
+++ b/usr.sbin/cron/cron.8
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: cron.8,v 1.18 2003/02/17 18:40:11 millert Exp $
+.\" $OpenBSD: cron.8,v 1.19 2003/02/19 22:11:42 millert Exp $
 .\"
 .Dd July 6, 2002
 .Dt CRON 8
@@ -76,7 +76,7 @@ checks the modification time on the system crontab file
 the crontab spool
 .Pq Pa /var/cron/tabs ,
 and the at spool
-.Pq Pa /var/at/jobs
+.Pq Pa /var/cron/atjobs
 once a minute.
 If the modification time has changed, the affected files are reloaded.
 .Pp
@@ -187,7 +187,7 @@ logs via
 .Bl -tag -width "/var/cron/tabs/.sock" -compact
 .It Pa /etc/crontab
 system crontab file
-.It Pa /var/at/jobs
+.It Pa /var/cron/atjobs
 directory containing
 .Xr at 1
 jobs
diff --git a/usr.sbin/cron/crontab.1 b/usr.sbin/cron/crontab.1
index 31150510cdf..31615ed524c 100644
--- a/usr.sbin/cron/crontab.1
+++ b/usr.sbin/cron/crontab.1
@@ -15,7 +15,7 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.\" $OpenBSD: crontab.1,v 1.15 2002/07/15 19:13:29 millert Exp $
+.\" $OpenBSD: crontab.1,v 1.16 2003/02/19 22:11:42 millert Exp $
 .\"
 .Dd June 8, 1999
 .Dt CRONTAB 1
@@ -52,17 +52,17 @@ named file, or standard input if the pseudo-filename
 is given.
 .Pp
 If the
-.Pa /var/cron/allow
+.Pa /var/cron/at.allow
 file exists, then you must be listed therein in order to use
 .Nm crontab .
 If the
-.Pa /var/cron/allow
+.Pa /var/cron/at.allow
 file does not exist but the
-.Pa /var/cron/deny
+.Pa /var/cron/at.deny
 file does exist, then you must
 .Em not
 be listed in the
-.Pa /var/cron/deny
+.Pa /var/cron/at.deny
 file in order to use
 .Nm crontab .
 If neither of these files exists, then
@@ -72,9 +72,9 @@ will be allowed to use
 or all users will be able to use it.
 .Em NOTE :
 if they exist,
-.Pa /var/cron/allow
+.Pa /var/cron/at.allow
 and
-.Pa /var/cron/deny
+.Pa /var/cron/at.deny
 must be readable by group crontab.
 If
 .Nm
@@ -119,10 +119,10 @@ After you exit from the editor, the modified
 will be installed automatically.
 .El
 .Sh FILES
-.Bl -tag -width "/var/cron/allow" -compact
-.It Pa /var/cron/allow
+.Bl -tag -width "/var/cron/at.allow" -compact
+.It Pa /var/cron/at.allow
 list of users allowed to use crontab
-.It Pa /var/cron/deny
+.It Pa /var/cron/at.deny
 list of users prohibited from using crontab
 .It Pa /var/cron/tabs
 directory of individual crontabs
diff --git a/usr.sbin/cron/pathnames.h b/usr.sbin/cron/pathnames.h
index 52a4f6255cd..2164d99fd53 100644
--- a/usr.sbin/cron/pathnames.h
+++ b/usr.sbin/cron/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.8 2002/07/15 19:13:29 millert Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.9 2003/02/19 22:11:42 millert Exp $	*/
 
 /* Copyright 1993,1994 by Paul Vixie
  * All rights reserved
@@ -60,8 +60,8 @@
 			 * LOG_CRON is defined by <syslog.h>, LOG_FILE will not
 			 * be used.
 			 */
-#define	ALLOW_FILE	"allow"
-#define DENY_FILE	"deny"
+#define	ALLOW_FILE	"cron.allow"
+#define DENY_FILE	"cron.deny"
 #define LOG_FILE	"log"
 
 			/* where should the daemon stick its PID?
@@ -108,8 +108,8 @@
 #endif /*SENDMAIL*/
 
 /* XXX */
-#define _PATH_ATJOBS	"/var/at/jobs"
-#define _PATH_AT_ALLOW	"/var/at/at.allow"
-#define _PATH_AT_DENY	"/var/at/at.deny"
+#define _PATH_ATJOBS	"/var/cron/atjobs"
+#define _PATH_AT_ALLOW	"/var/cron/at.allow"
+#define _PATH_AT_DENY	"/var/cron/at.deny"
 
 #endif /* _PATHNAMES_H_ */