From 94e91aa0e60551ebfe1c236176f455761909df7c Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Thu, 19 Nov 2020 14:29:56 +0000
Subject: Update libcap support

---
 src/Makefile.in | 2 +-
 src/ircd.c      | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.in b/src/Makefile.in
index c9990c8..d758c1c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -356,7 +356,7 @@ AUTOMAKE_OPTIONS = foreign
 AM_YFLAGS = -d
 AM_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/include
 ircd_LDFLAGS = -export-dynamic
-ircd_LDADD = $(LIBLTDL) -lcap
+ircd_LDADD = $(LIBLTDL)
 ircd_DEPENDENCIES = $(LTDLDEPS)
 ircd_SOURCES = channel.c         \
                channel_mode.c    \
diff --git a/src/ircd.c b/src/ircd.c
index 72c6d40..abd3997 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -23,7 +23,6 @@
  * \brief Starts up and runs the ircd.
  * \version $Id$
  */
-#define USE_LINUX_CAP
 #define _GNU_SOURCE
 #include "stdinc.h"
 #include "s_user.h"
@@ -62,7 +61,7 @@
 #include "conf_db.h"
 #include "conf_class.h"
 
-#ifdef USE_LINUX_CAP
+#ifdef HAVE_LIBCAP
 #include <pwd.h>
 #include <grp.h>
 #include <sys/prctl.h>
@@ -465,7 +464,7 @@ ssl_init(void)
 #endif /* HAVE_LIBCRYPTO */
 }
 
-#ifdef USE_LINUX_CAP
+#ifdef HAVE_LIBCAP
 /* This drops ALL privs except for CAP_NET_BIND_SERVICE */
 static int drop_priv(char *user, char *group)
 {
@@ -530,7 +529,7 @@ main(int argc, char *argv[])
   /* Check to see if the user is running us as root, which is a nono */
   if (geteuid() == 0)
   {
-#ifdef USE_LINUX_CAP
+#ifdef HAVE_LIBCAP
     if (drop_priv(getenv("IRCD_USER"), getenv("IRCD_GROUP"))) {
       fprintf(stderr, "Unable to drop capabilities\n");
       return -1;
-- 
cgit