Import syslogging fix from -devel.

diff --git a/CHANGES b/CHANGES
index def58aa2422de46b982e758a7c437fb42b146085..9a2575dee9bd78583fb06fdf3786192d64954b81 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ Changes included in OpenLDAP 1.1.1
        CVS Tag: OPENLDAP_REL_ENG_1_1
        Updated INSTALL and hints
        Updated slapd/ldif2dbm to disable write sync'ing
+       Fixed slapd & slurpd syslogging
        Fixed libldif/line64 analyzed 3 not 4 bug
        Fixed slapd/value.c value_cmp bug
        Fixed slapd/back-ldbm/cache.c delete_internal dntree/idtree bug

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index f860472101c461ee64397d8edf6acba62462e2e9..053feea4495bfca86d83d800ebdea7c3294bf45d 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -5,6 +5,10 @@
 
 #include <stdlib.h>
 
+#ifndef LDAP_SYSLOG
+#define LDAP_SYSLOG 1
+#endif
+
 #include <sys/types.h>
 #include <ac/syslog.h>
 #include <ac/regex.h>

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 9ec47d2f75e422323846f2c979ad2c41f82e6d95..02262270da5e1b8ba4a40c32caecfc160a8a50fd 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -15,7 +15,9 @@
 #ifndef _SLURPD_H_
 #define _SLURPD_H_
 
-#define LDAP_SYSLOG
+#ifndef LDAP_SYSLOG
+#define LDAP_SYSLOG 1
+#endif
 
 #include <ac/syslog.h>
 #include <ac/errno.h>