Define preprocessor symbols in config.h instead of the command line.

Avoid duplicating symbols.

Force specific ownership and privileges on the installed files only
when installing them as root.

Makefile.am

@@ -1,18 +1,8 @@
-CC=@PTHREAD_CC@
 AM_CFLAGS=\
  -DF_CONF=\"@sysconfdir@/pound.cfg\"\
- -DVERSION=\"@PACKAGE_VERSION@\"\
- -DC_SSL=\"@C_SSL@\"\
- -DC_T_RSA=\"@C_T_RSA@\"\
- -DC_DH_LEN=\"@C_DH_LEN@\"\
- -DC_MAXBUF=\"@C_MAXBUF@\"\
- -DC_OWNER=\"@C_OWNER@\"\
- -DC_GROUP=\"@C_GROUP@\"\
- -DC_SUPER=\"@C_SUPER@\"\
- -DC_CERT1L=\"@C_CERT1L@\"\
- @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@
+ @PTHREAD_CFLAGS@
 
-LIBS=@LIBS@ @PTHREAD_LIBS@
+LDADD=@PTHREAD_LIBS@
 
 sbin_PROGRAMS=pound
 pound_SOURCES=\
@@ -21,7 +11,15 @@ pound_SOURCES=\
  pound.c\
  svc.c
 
-INSTALL_PROGRAM = ${INSTALL} -o @I_OWNER@ -g @I_GRP@ -m 555
+install-exec-hook:
+	-@if test "$${EUID:-65535}" -eq 0; then \
+		for program in $(sbin_PROGRAMS); do \
+			chown @I_OWNER@:@I_GRP@ $(DESTDIR)$(sbindir)/$$program$(EXEEXT); \
+		done; \
+		for program in $(bin_PROGRAMS); do \
+			chown @I_OWNER@:@I_GRP@ $(DESTDIR)$(bindir)/$$program$(EXEEXT); \
+		done; \
+	fi
 
 noinst_HEADERS=pound.h config.h dh.h
 
@@ -33,5 +31,6 @@ bin_PROGRAMS=poundctl
 poundctl_SOURCES=poundctl.c
 
 BUILT_SOURCES=dh.h
+DISTCLEANFILES=dh.h
 
 dist_man_MANS=pound.8 poundctl.8

config.c

@@ -25,15 +25,13 @@
  * EMail: roseg@apsis.ch
  */
 
-#ifndef MISS_FACILITYNAMES
-#define SYSLOG_NAMES    1
-#endif
+#define NEED_FACILITYNAMES
 
 #include    "pound.h"
 
 #include    <openssl/x509v3.h>
 
-#ifdef MISS_FACILITYNAMES
+#ifndef HAVE_FACILITYNAMES
 
 /* This is lifted verbatim from the Linux sys/syslog.h */
 
@@ -1534,28 +1532,20 @@ config_parse(const int argc, char **const argv)
             break;
         case 'V':
             print_log = 1;
-            logmsg(LOG_DEBUG, "Version %s", VERSION);
+            logmsg(LOG_DEBUG, "Version %s", PACKAGE_VERSION);
             logmsg(LOG_DEBUG, "  Configuration switches:");
-#ifdef  C_SUPER
-            if(strcmp(C_SUPER, "0"))
-                logmsg(LOG_DEBUG, "    --disable-super");
-#endif
-#ifdef  C_CERT1L
-            if(strcmp(C_CERT1L, "1"))
-                logmsg(LOG_DEBUG, "    --enable-cert1l");
-#endif
+	    if (!SUPERVISOR)
+		    logmsg(LOG_DEBUG, "    --disable-super");
+	    if (CERT1L)
+		    logmsg(LOG_DEBUG, "    --enable-cert1l");
 #ifdef  C_SSL
             if(strcmp(C_SSL, ""))
                 logmsg(LOG_DEBUG, "    --with-ssl=%s", C_SSL);
 #endif
-#ifdef  C_T_RSA
-            if(strcmp(C_T_RSA, "0"))
-                logmsg(LOG_DEBUG, "    --with-t_rsa=%s", C_T_RSA);
-#endif
-#ifdef  C_MAXBUF
-            if(strcmp(C_MAXBUF, "0"))
-                logmsg(LOG_DEBUG, "    --with-maxbuf=%s", C_MAXBUF);
-#endif
+            if(T_RSA_KEYS != 7200)
+                logmsg(LOG_DEBUG, "    --with-t_rsa=%d", T_RSA_KEYS);
+            if(MAXBUF != 4096)
+                logmsg(LOG_DEBUG, "    --with-maxbuf=%d", MAXBUF);
 #ifdef  C_OWNER
             if(strcmp(C_OWNER, ""))
                 logmsg(LOG_DEBUG, "    --with-owner=%s", C_OWNER);
@@ -1564,10 +1554,8 @@ config_parse(const int argc, char **const argv)
             if(strcmp(C_GROUP, ""))
                 logmsg(LOG_DEBUG, "    --with-group=%s", C_GROUP);
 #endif
-#ifdef  C_DH_LEN
-            if(strcmp(C_DH_LEN, "0"))
-                logmsg(LOG_DEBUG, "    --with-dh=%s", C_DH_LEN);
-#endif
+            if(DH_LEN != 2048)
+                logmsg(LOG_DEBUG, "    --with-dh=%d", DH_LEN);
             logmsg(LOG_DEBUG, "Exiting...");
             exit(0);
             break;

configure.ac

@@ -187,38 +187,42 @@ else
         PTHREAD_CC="$CC"
 fi
 
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_pthread_ok" = xyes; then
-        LIBS="$PTHREAD_LIBS $LIBS"; CFLAGS="$CFLAGS $PTHREAD_CFLAGS"; CC="$PTHREAD_CC"; LDFLAGS="${LDFLAGS} ${PTHREAD_CFLAGS}"
-        :
-else
-        acx_pthread_ok=no
-
+	CC="$PTHREAD_CC";
 fi
 
 AC_MSG_NOTICE([*** Parsing options ***])
 
 AC_ARG_WITH([ssl],
  AC_HELP_STRING([--with-ssl=directory],[location of OpenSSL package]),
- [CPPFLAGS="-I${with_ssl}/include ${CPPFLAGS}"; LDFLAGS="-L${with_ssl}/lib ${LDFLAGS}"; C_SSL="${with_ssl}"],
+ [CPPFLAGS="-I${withval}/include ${CPPFLAGS}"; LDFLAGS="-L${withval}/lib ${LDFLAGS}"; C_SSL="${withval}"],
  [C_SSL=""])
 
 AC_ARG_WITH([t_rsa],
- AC_HELP_STRING([--with-t_rsa=nnn],[Time-out for RSA ephemeral keys generation]),
- [CPPFLAGS="-DT_RSA_KEYS=${with_t_rsa} ${CPPFLAGS}"; C_T_RSA="${with_t_rsa}"],
- [C_T_RSA="0"])
+ AC_HELP_STRING([--with-t_rsa=nnn],
+                [Timeout for RSA ephemeral keys generation]),
+ [T_RSA_KEYS=${withval}],
+ [T_RSA_KEYS=7200])
 
+AC_DEFINE_UNQUOTED([T_RSA_KEYS],[$T_RSA_KEYS],
+ [Timeout for RSA ephemeral keys generation])
+ 
 AC_ARG_WITH([dh],
  AC_HELP_STRING([--with-dh=nnn],[DH key length parameter (default: 2048, can set to 1024)]),
- [CPPFLAGS="-DDH_LEN=${with_dh} ${CPPFLAGS}"; C_DH_LEN="${with_dh}"],
- [CPPFLAGS="-DDH_LEN=2048 ${CPPFLAGS}"; C_DH_LEN="2048"])
-AC_SUBST(C_DH_LEN)
+ [DH_LEN=${withval}],
+ [DH_LEN=2048])
+
+AC_DEFINE_UNQUOTED([DH_LEN],[$DH_LEN],
+ [DH key length])
 
 AC_ARG_WITH([maxbuf],
  AC_HELP_STRING([--with-maxbuf=nnn],[Value of the MAXBUF parameter (default: 4096)]),
- [CPPFLAGS="-DMAXBUF=${with_maxbuf} ${CPPFLAGS}"; C_MAXBUF="${with_maxbuf}"],
- [C_MAXBUF="0"])
+ [MAXBUF=${withval}],
+ [MAXBUF=4096])
 
+AC_DEFINE_UNQUOTED([MAXBUF],[$MAXBUF],
+ [Max. buffer size])
+ 
 AC_SUBST(I_OWNER)
 AC_ARG_WITH([owner],
  AC_HELP_STRING([--with-owner=name],
@@ -236,13 +240,24 @@ AC_ARG_WITH([group],
 AC_ARG_ENABLE([super], 
  AC_HELP_STRING([--enable-super],
                 [enable or disable running with supervisor process (default: enabled)]),
- [test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DUPER"; C_SUPER="1"],
- [CFLAGS="${CFLAGS} -DUPER"; C_SUPER="0"])
+ [if test ${enableval} = "yes"; then
+    SUPERVISOR=1
+  else
+    SUPERVISOR=0
+  fi],
+ [SUPERVISOR=1])
+
+AC_DEFINE_UNQUOTED([SUPERVISOR],[$SUPERVISOR],
+ [Run supervisor process])
  
 AC_ARG_ENABLE([cert1l], 
  AC_HELP_STRING([--enable-cert1l],
                 [enable or disable single-line certificate (default: disabled)]),
- [test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DCERT1L"; C_CERT1L="1"])
+ [test ${enableval} = "yes"; CERT1L=$?],
+ [CERT1L=0])
+
+AC_DEFINE_UNQUOTED([CERT1L],[$CERT1L],
+ [Enable single-line certificates])
  
 AC_ARG_ENABLE([pcreposix],
  AC_HELP_STRING([--enable-pcreposix],
@@ -299,7 +314,7 @@ AC_MSG_RESULT([OK]);
 
 AC_MSG_NOTICE([*** Checking for header files ***])
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h fnmatch.h])
+AC_CHECK_HEADERS([arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h sys/syslog.h syslog.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h fnmatch.h])
 
 AC_MSG_NOTICE([*** Checking for additonal information ***])
 
@@ -314,11 +329,12 @@ AC_TRY_LINK([#include <stdio.h>
 	    [ok=no])
 if test x"$ok" = xyes; then
   AC_MSG_RESULT([yes])
-  CFLAGS="$save_CFLAGS -DHAVE_SYS_SYSLOG_H=1"
+  AC_DEFINE([HAVE_FACILITYNAMES],1,
+    [The facilitynames array is defined in sys/syslog.h])
 else
   AC_MSG_RESULT([missing])
-  CFLAGS="$save_CFLAGS -DHAVE_SYSLOG_H=1 -DMISS_FACILITYNAMES"
 fi  
+CFLAGS=$save_CFLAGS
 
 AC_TYPE_SIGNAL
 AC_C_CONST
@@ -348,6 +364,13 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([getaddrinfo inet_ntop memset regcomp poll socket strcasecmp strchr strdup\
  strerror strncasecmp strspn strtol setsid X509_STORE_set_flags localtime_r gettimeofday])
 
+AC_DEFINE_UNQUOTED([C_SSL], ["$C_SSL"],
+ [Location of OpenSSL package])
+AC_DEFINE_UNQUOTED([C_OWNER],["$C_OWNER"],
+ [Account that owns Pound files])
+AC_DEFINE_UNQUOTED([C_GROUP],["$C_GROUP"],
+ [Group for the Pound files])
+
 if test -z "${I_OWNER}"
 then
     egrep -s '^root' /etc/passwd > /dev/null && I_OWNER=root

pound.c

@@ -434,7 +434,7 @@ main(const int argc, char **argv)
 
     /* split off into monitor and working process if necessary */
     for(;;) {
-#ifdef  UPER
+#ifdef SUPERVISOR
         if((son = fork()) > 0) {
             int status;
 
@@ -547,7 +547,7 @@ main(const int argc, char **argv)
                     }
                 }
             }
-#ifdef  UPER
+#ifdef SUPERVISOR
         } else {
             /* failed to spawn son */
             logmsg(LOG_ERR, "Can't fork worker (%s) - aborted", strerror(errno));

pound.h

@@ -165,6 +165,10 @@
 #error "Pound needs grp.h"
 #endif
 
+#if defined(HAVE_FACILITYNAMES) && defined(NEED_FACILITYNAMES)
+#define SYSLOG_NAMES    1
+#endif
+
 #if HAVE_SYSLOG_H
 #include    <syslog.h>
 #endif