Path #defines are traditionally prefixed with _PATH.

pointed out by deraadt

diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c
index 9a11323..391680b 100644 (file)
--- a/sbin/slaacd/slaacd.c
+++ b/sbin/slaacd/slaacd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: slaacd.c,v 1.56 2021/01/19 16:49:56 florian Exp $     */
+/*     $OpenBSD: slaacd.c,v 1.57 2021/02/27 10:28:12 florian Exp $     */
 
 /*
  * Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -131,7 +131,7 @@ main(int argc, char *argv[])
        int                      pipe_main2engine[2];
        int                      frontend_routesock, rtfilter;
        int                      rtable_any = RTABLE_ANY;
-       char                    *csock = SLAACD_SOCKET;
+       char                    *csock = _PATH_SLAACD_SOCKET;
 #ifndef SMALL
        struct imsg_propose_rdns rdns;
        int                      control_fd;

diff --git a/sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h
index 296e40f..0e41d61 100644 (file)
--- a/sbin/slaacd/slaacd.h
+++ b/sbin/slaacd/slaacd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: slaacd.h,v 1.28 2021/01/19 16:48:20 florian Exp $     */
+/*     $OpenBSD: slaacd.h,v 1.29 2021/02/27 10:28:12 florian Exp $     */
 
 /*
  * Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -18,7 +18,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define        SLAACD_SOCKET           "/dev/slaacd.sock"
+#define        _PATH_SLAACD_SOCKET     "/dev/slaacd.sock"
 #define SLAACD_USER            "_slaacd"
 #define SLAACD_RTA_LABEL       "slaacd"
 

diff --git a/usr.sbin/slaacctl/slaacctl.c b/usr.sbin/slaacctl/slaacctl.c
index 4b17fa3..7dcffdb 100644 (file)
--- a/usr.sbin/slaacctl/slaacctl.c
+++ b/usr.sbin/slaacctl/slaacctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: slaacctl.c,v 1.20 2020/09/14 09:07:05 florian Exp $   */
+/*     $OpenBSD: slaacctl.c,v 1.21 2021/02/27 10:28:12 florian Exp $   */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
        int                      ch;
        char                    *sockname;
 
-       sockname = SLAACD_SOCKET;
+       sockname = _PATH_SLAACD_SOCKET;
        while ((ch = getopt(argc, argv, "s:")) != -1) {
                switch (ch) {
                case 's':