From 0acf3e2d891bdf6c7073ca5365adc5715b778d14 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 3 Jun 2017 10:00:29 +0000 Subject: [PATCH] Move slaacd to /sbin jca points out that all the other interface configuration tools live there (like ifconfig or dhclient). Furthermore it starts so early in the boot process that /usr might not be mounted yet if it's a nfs filesystem. sthen and deraadt agree --- etc/rc.d/slaacd | 4 ++-- sbin/Makefile | 4 ++-- {usr.sbin => sbin}/slaacd/Makefile | 2 +- {usr.sbin => sbin}/slaacd/control.c | 2 +- {usr.sbin => sbin}/slaacd/control.h | 2 +- {usr.sbin => sbin}/slaacd/engine.c | 2 +- {usr.sbin => sbin}/slaacd/engine.h | 2 +- {usr.sbin => sbin}/slaacd/frontend.c | 2 +- {usr.sbin => sbin}/slaacd/frontend.h | 2 +- {usr.sbin => sbin}/slaacd/log.c | 2 +- {usr.sbin => sbin}/slaacd/log.h | 2 +- {usr.sbin => sbin}/slaacd/slaacd.8 | 4 ++-- {usr.sbin => sbin}/slaacd/slaacd.c | 2 +- {usr.sbin => sbin}/slaacd/slaacd.h | 2 +- usr.sbin/Makefile | 4 ++-- usr.sbin/slaacctl/Makefile | 4 ++-- 16 files changed, 21 insertions(+), 21 deletions(-) rename {usr.sbin => sbin}/slaacd/Makefile (86%) rename {usr.sbin => sbin}/slaacd/control.c (99%) rename {usr.sbin => sbin}/slaacd/control.h (94%) rename {usr.sbin => sbin}/slaacd/engine.c (99%) rename {usr.sbin => sbin}/slaacd/engine.h (95%) rename {usr.sbin => sbin}/slaacd/frontend.c (99%) rename {usr.sbin => sbin}/slaacd/frontend.h (94%) rename {usr.sbin => sbin}/slaacd/log.c (98%) rename {usr.sbin => sbin}/slaacd/log.h (96%) rename {usr.sbin => sbin}/slaacd/slaacd.8 (96%) rename {usr.sbin => sbin}/slaacd/slaacd.c (99%) rename {usr.sbin => sbin}/slaacd/slaacd.h (98%) diff --git a/etc/rc.d/slaacd b/etc/rc.d/slaacd index 7790863b9b1..fbb474930d3 100644 --- a/etc/rc.d/slaacd +++ b/etc/rc.d/slaacd @@ -1,8 +1,8 @@ #!/bin/sh # -# $OpenBSD: slaacd,v 1.1 2017/05/29 10:24:06 florian Exp $ +# $OpenBSD: slaacd,v 1.2 2017/06/03 10:00:29 florian Exp $ -daemon="/usr/sbin/slaacd" +daemon="/sbin/slaacd" . /etc/rc.d/rc.subr diff --git a/sbin/Makefile b/sbin/Makefile index 8100ac541f1..f93db6aa573 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.105 2016/09/17 18:37:01 florian Exp $ +# $OpenBSD: Makefile,v 1.106 2017/06/03 10:00:29 florian Exp $ SUBDIR= atactl badsect bioctl clri dhclient \ disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs \ @@ -9,7 +9,7 @@ SUBDIR= atactl badsect bioctl clri dhclient \ mount_vnd mountd ncheck_ffs newfs newfs_ext2fs newfs_msdos \ nfsd nologin pdisk pfctl pflogd ping quotacheck \ reboot restore route savecore scan_ffs \ - scsi shutdown swapctl sysctl ttyflags tunefs \ + scsi slaacd shutdown swapctl sysctl ttyflags tunefs \ umount wsconsctl .include diff --git a/usr.sbin/slaacd/Makefile b/sbin/slaacd/Makefile similarity index 86% rename from usr.sbin/slaacd/Makefile rename to sbin/slaacd/Makefile index 665b14cabe7..989f432c621 100644 --- a/usr.sbin/slaacd/Makefile +++ b/sbin/slaacd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2017/05/27 16:16:49 florian Exp $ +# $OpenBSD: Makefile,v 1.1 2017/06/03 10:00:29 florian Exp $ PROG= slaacd SRCS= control.c engine.c frontend.c log.c slaacd.c diff --git a/usr.sbin/slaacd/control.c b/sbin/slaacd/control.c similarity index 99% rename from usr.sbin/slaacd/control.c rename to sbin/slaacd/control.c index a1226d42947..76b0f3b15ea 100644 --- a/usr.sbin/slaacd/control.c +++ b/sbin/slaacd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.1 2017/03/18 17:33:13 florian Exp $ */ +/* $OpenBSD: control.c,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer diff --git a/usr.sbin/slaacd/control.h b/sbin/slaacd/control.h similarity index 94% rename from usr.sbin/slaacd/control.h rename to sbin/slaacd/control.h index 69eb08346b0..49d6bd8105b 100644 --- a/usr.sbin/slaacd/control.h +++ b/sbin/slaacd/control.h @@ -1,4 +1,4 @@ -/* $OpenBSD: control.h,v 1.1 2017/03/18 17:33:13 florian Exp $ */ +/* $OpenBSD: control.h,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer diff --git a/usr.sbin/slaacd/engine.c b/sbin/slaacd/engine.c similarity index 99% rename from usr.sbin/slaacd/engine.c rename to sbin/slaacd/engine.c index 4debc8b3562..3231599e2d8 100644 --- a/usr.sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.38 2017/05/31 09:39:03 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser diff --git a/usr.sbin/slaacd/engine.h b/sbin/slaacd/engine.h similarity index 95% rename from usr.sbin/slaacd/engine.h rename to sbin/slaacd/engine.h index 0956f7dbd33..e7f520f1fba 100644 --- a/usr.sbin/slaacd/engine.h +++ b/sbin/slaacd/engine.h @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.h,v 1.7 2017/05/28 19:57:38 florian Exp $ */ +/* $OpenBSD: engine.h,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby diff --git a/usr.sbin/slaacd/frontend.c b/sbin/slaacd/frontend.c similarity index 99% rename from usr.sbin/slaacd/frontend.c rename to sbin/slaacd/frontend.c index 39198f1b96f..18fb1affa40 100644 --- a/usr.sbin/slaacd/frontend.c +++ b/sbin/slaacd/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.16 2017/05/31 07:14:58 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser diff --git a/usr.sbin/slaacd/frontend.h b/sbin/slaacd/frontend.h similarity index 94% rename from usr.sbin/slaacd/frontend.h rename to sbin/slaacd/frontend.h index 45c743ff71e..ced99d3921d 100644 --- a/usr.sbin/slaacd/frontend.h +++ b/sbin/slaacd/frontend.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.h,v 1.1 2017/03/18 17:33:13 florian Exp $ */ +/* $OpenBSD: frontend.h,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby diff --git a/usr.sbin/slaacd/log.c b/sbin/slaacd/log.c similarity index 98% rename from usr.sbin/slaacd/log.c rename to sbin/slaacd/log.c index d261550cc76..fa7718246e5 100644 --- a/usr.sbin/slaacd/log.c +++ b/sbin/slaacd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.2 2017/03/21 12:38:23 bluhm Exp $ */ +/* $OpenBSD: log.c,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer diff --git a/usr.sbin/slaacd/log.h b/sbin/slaacd/log.h similarity index 96% rename from usr.sbin/slaacd/log.h rename to sbin/slaacd/log.h index adb45af607e..8653cffd8c8 100644 --- a/usr.sbin/slaacd/log.h +++ b/sbin/slaacd/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.1 2017/03/18 17:33:13 florian Exp $ */ +/* $OpenBSD: log.h,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer diff --git a/usr.sbin/slaacd/slaacd.8 b/sbin/slaacd/slaacd.8 similarity index 96% rename from usr.sbin/slaacd/slaacd.8 rename to sbin/slaacd/slaacd.8 index 2d71b0a35ae..b753403ebb1 100644 --- a/usr.sbin/slaacd/slaacd.8 +++ b/sbin/slaacd/slaacd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: slaacd.8,v 1.5 2017/05/30 12:39:33 jmc Exp $ +.\" $OpenBSD: slaacd.8,v 1.1 2017/06/03 10:00:29 florian Exp $ .\" .\" Copyright (c) 2017 Florian Obser .\" Copyright (c) 2016 Kenneth R Westerback @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 30 2017 $ +.Dd $Mdocdate: June 3 2017 $ .Dt SLAACD 8 .Os .Sh NAME diff --git a/usr.sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c similarity index 99% rename from usr.sbin/slaacd/slaacd.c rename to sbin/slaacd/slaacd.c index 61df0d6f50a..04ae07444e6 100644 --- a/usr.sbin/slaacd/slaacd.c +++ b/sbin/slaacd/slaacd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.c,v 1.23 2017/05/30 22:04:46 florian Exp $ */ +/* $OpenBSD: slaacd.c,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser diff --git a/usr.sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h similarity index 98% rename from usr.sbin/slaacd/slaacd.h rename to sbin/slaacd/slaacd.h index 3d1a59f91d5..632ed46d256 100644 --- a/usr.sbin/slaacd/slaacd.h +++ b/sbin/slaacd/slaacd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.h,v 1.17 2017/05/31 07:14:58 florian Exp $ */ +/* $OpenBSD: slaacd.h,v 1.1 2017/06/03 10:00:29 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index be56b7b8065..c142fab8b8e 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.200 2017/05/29 12:51:56 florian Exp $ +# $OpenBSD: Makefile,v 1.201 2017/06/03 10:00:29 florian Exp $ .include @@ -15,7 +15,7 @@ SUBDIR= ac accton acme-client acpidump adduser amd apm apmd arp \ quot quotaon radiusctl radiusd rarpd rbootd \ rcctl rdate rebound relayctl relayd repquota ripctl ripd \ rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \ - sa sasyncd sensorsd slaacctl slaacd slowcgi smtpd \ + sa sasyncd sensorsd slaacctl slowcgi smtpd \ snmpctl snmpd spamdb switchctl switchd syslogc syslogd sysmerge \ syspatch tcpdrop tcpdump tftp-proxy tftpd tokenadm tokeninit \ traceroute trpt unbound usbdevs user vmd vmctl vipw watchdogd \ diff --git a/usr.sbin/slaacctl/Makefile b/usr.sbin/slaacctl/Makefile index 487819d2e45..9bc1d6dc90c 100644 --- a/usr.sbin/slaacctl/Makefile +++ b/usr.sbin/slaacctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2017/04/10 13:35:42 florian Exp $ +# $OpenBSD: Makefile,v 1.2 2017/06/03 10:00:29 florian Exp $ PROG= slaacctl SRCS= slaacctl.c parser.c @@ -10,7 +10,7 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../slaacd +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sbin/slaacd LDADD= -lutil DPADD= ${LIBUTIL} -- 2.20.1