Path #defines are traditionally prefixed with _PATH.

Pointed out by deraadt

diff --git a/usr.sbin/ractl/ractl.c b/usr.sbin/ractl/ractl.c
index e3e0219..39fefa4 100644 (file)
--- a/usr.sbin/ractl/ractl.c
+++ b/usr.sbin/ractl/ractl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ractl.c,v 1.2 2019/11/01 18:15:28 florian Exp $       */
+/*     $OpenBSD: ractl.c,v 1.3 2021/02/27 10:35:20 florian Exp $       */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
        int                      ch;
        char                    *sockname;
 
-       sockname = RAD_SOCKET;
+       sockname = _PATH_RAD_SOCKET;
        while ((ch = getopt(argc, argv, "s:")) != -1) {
                switch (ch) {
                case 's':

diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c
index ad6d16a..3bb4851 100644 (file)
--- a/usr.sbin/rad/rad.c
+++ b/usr.sbin/rad/rad.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rad.c,v 1.26 2021/01/19 16:54:48 florian Exp $        */
+/*     $OpenBSD: rad.c,v 1.27 2021/02/27 10:35:20 florian Exp $        */
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -133,8 +133,8 @@ main(int argc, char *argv[])
        int                      control_fd;
        char                    *csock;
 
-       conffile = CONF_FILE;
-       csock = RAD_SOCKET;
+       conffile = _PATH_CONF_FILE;
+       csock = _PATH_RAD_SOCKET;
 
        log_init(1, LOG_DAEMON);        /* Log to stderr until daemonized. */
        log_setverbose(1);

diff --git a/usr.sbin/rad/rad.h b/usr.sbin/rad/rad.h
index fb6565b..d6fdaf5 100644 (file)
--- a/usr.sbin/rad/rad.h
+++ b/usr.sbin/rad/rad.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rad.h,v 1.20 2021/01/19 16:53:27 florian Exp $        */
+/*     $OpenBSD: rad.h,v 1.21 2021/02/27 10:35:20 florian Exp $        */
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -18,8 +18,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define        CONF_FILE               "/etc/rad.conf"
-#define        RAD_SOCKET              "/var/run/rad.sock"
+#define        _PATH_CONF_FILE         "/etc/rad.conf"
+#define        _PATH_RAD_SOCKET        "/var/run/rad.sock"
 #define        RAD_USER                "_rad"
 
 #define        OPT_VERBOSE     0x00000001