Remove BROKEN_SYSLOG define which was for obsolete versions of HP-UX.

Remove last remnants of 4.2BSD syslog support.

diff --git a/config.h.in b/config.h.in
index b66bfd2133b0f8fc9490098d6c02a015daab3d29..866b64b61287ce9d3ebd08beadc85be2e8e8d602 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,10 +3,6 @@
 #ifndef SUDO_CONFIG_H
 #define SUDO_CONFIG_H
 
-/* Define to 1 if the `syslog' function returns a non-zero int to denote
-   failure. */
-#undef BROKEN_SYSLOG
-
 /* Define to 1 if you want the insults from the "classic" version sudo. */
 #undef CLASSIC_INSULTS
 

diff --git a/configure b/configure
index 36374aba4d49892fa76802685c3b9ad18cfccf09..011769c92eb20e2b741a12495d475e29a974e7c0 100755 (executable)
--- a/configure
+++ b/configure
@@ -14959,14 +14959,7 @@ $as_echo "$sudo_cv_var_daportable" >&6; }
                esac
 
                case "$host_os" in
-                       hpux[1-8].*)
-                           $as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h
-
-                       ;;
                        hpux9.*)
-                           $as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h
-
-
                            shadow_funcs="getspwuid"
 
                            # DCE support (requires ANSI C compiler)
@@ -26855,6 +26848,5 @@ fi
 
 
 
-
 
 

diff --git a/configure.ac b/configure.ac
index 3330a5534fb3a6506c7e04f1eff778eb1e624025..71f251cebfd538596c25522af8890e3d4783ce97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1828,12 +1828,7 @@ case "$host" in
                esac
 
                case "$host_os" in
-                       hpux[[1-8]].*)
-                           AC_DEFINE(BROKEN_SYSLOG)
-                       ;;
                        hpux9.*)
-                           AC_DEFINE(BROKEN_SYSLOG)
-
                            shadow_funcs="getspwuid"
 
                            # DCE support (requires ANSI C compiler)
@@ -4237,7 +4232,6 @@ fi
 dnl
 dnl Autoheader templates
 dnl
-AH_TEMPLATE(BROKEN_SYSLOG, [Define to 1 if the `syslog' function returns a non-zero int to denote failure.])
 AH_TEMPLATE(CLASSIC_INSULTS, [Define to 1 if you want the insults from the "classic" version sudo.])
 AH_TEMPLATE(CSOPS_INSULTS, [Define to 1 if you want insults culled from the twisted minds of CSOps.])
 AH_TEMPLATE(DONT_LEAK_PATH_INFO, [Define to 1 if you want sudo to display "command not allowed" instead of "command not found" when a command cannot be found.])

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index 1e3547ecc65f16feb273103ceb1bbfd39c88392d..f27aad82587447c4023f792d3a4a876097e36176 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -55,7 +55,6 @@ struct strmap {
     int num;
 };
 
-#ifdef LOG_NFACILITIES
 static struct strmap facilities[] = {
 #ifdef LOG_AUTHPRIV
        { "authpriv",   LOG_AUTHPRIV },
@@ -73,7 +72,6 @@ static struct strmap facilities[] = {
        { "local7",     LOG_LOCAL7 },
        { NULL,         -1 }
 };
-#endif /* LOG_NFACILITIES */
 
 static struct strmap priorities[] = {
        { "alert",      LOG_ALERT },
@@ -777,7 +775,6 @@ store_syslogfac(char *val, struct sudo_defs_types *def, int op)
        def->sd_un.ival = false;
        debug_return_bool(true);
     }
-#ifdef LOG_NFACILITIES
     if (!val)
        debug_return_bool(false);
     for (fac = facilities; fac->name && strcmp(val, fac->name); fac++)
@@ -786,25 +783,18 @@ store_syslogfac(char *val, struct sudo_defs_types *def, int op)
        debug_return_bool(false);               /* not found */
 
     def->sd_un.ival = fac->num;
-#else
-    def->sd_un.ival = -1;
-#endif /* LOG_NFACILITIES */
     debug_return_bool(true);
 }
 
 static const char *
 logfac2str(int n)
 {
-#ifdef LOG_NFACILITIES
     struct strmap *fac;
     debug_decl(logfac2str, SUDOERS_DEBUG_DEFAULTS)
 
     for (fac = facilities; fac->name && fac->num != n; fac++)
        ;
     debug_return_const_str(fac->name);
-#else
-    return "default";
-#endif /* LOG_NFACILITIES */
 }
 
 static bool

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 25632dcad4dd8e24d4ce38d84a1dca3d3e02ff07..57bc5b9a659b2ad406625ab4955d8ace1d5e751c 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -77,37 +77,18 @@ static char *new_logline(const char *, int);
  * own nefarious purposes and may call openlog(3) and closelog(3).
  * Note that because we don't want to assume that all systems have
  * vsyslog(3) (HP-UX doesn't) "%m" will not be expanded.
- * Sadly this is a maze of #ifdefs.
  */
 static void
 mysyslog(int pri, const char *fmt, ...)
 {
-#ifdef BROKEN_SYSLOG
-    int i;
-#endif
     char buf[MAXSYSLOGLEN+1];
     va_list ap;
     debug_decl(mysyslog, SUDOERS_DEBUG_LOGGING)
 
     va_start(ap, fmt);
-#ifdef LOG_NFACILITIES
     openlog("sudo", 0, def_syslog);
-#else
-    openlog("sudo", 0);
-#endif
     vsnprintf(buf, sizeof(buf), fmt, ap);
-#ifdef BROKEN_SYSLOG
-    /*
-     * Some versions of syslog(3) don't guarantee success and return
-     * an int (notably HP-UX < 10.0).  So, if at first we don't succeed,
-     * try, try again...
-     */
-    for (i = 0; i < MAXSYSLOGTRIES; i++)
-       if (syslog(pri, "%s", buf) == 0)
-           break;
-#else
     syslog(pri, "%s", buf);
-#endif /* BROKEN_SYSLOG */
     va_end(ap);
     closelog();
     debug_return;