From 168427c5f19a2d98058f7abffb1f9f0f2dc4c25c Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 27 Feb 2021 10:28:12 +0000 Subject: [PATCH] Path #defines are traditionally prefixed with _PATH. pointed out by deraadt --- sbin/slaacd/slaacd.c | 4 ++-- sbin/slaacd/slaacd.h | 4 ++-- usr.sbin/slaacctl/slaacctl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c index 9a113237443..391680b22da 100644 --- 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 @@ -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 296e40f7f8e..0e41d615d96 100644 --- 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 @@ -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 4b17fa3b02f..7dcffdb32d1 100644 --- 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 @@ -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': -- 2.20.1