ldapd did not compile

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index fc2db5a5cf7ac151c2ac95a6e00ad136f7ef789b..002f02ecebb0b82201e356d5ce98074b90492176 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -3,10 +3,10 @@
 ##
 PROGRAMS=ldapd
 XPROGRAMS=sldapd
-SRCS   = main.c detach.c setproctitle.c request.c bind.c result.c error.c \
+SRCS   = main.c detach.c request.c bind.c result.c error.c \
        search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \
        abandon.c syntax.c association.c kerberos.c certificate.c
-OBJS   = main.o detach.o setproctitle.o request.o bind.o result.o error.o \
+OBJS   = main.o detach.o request.o bind.o result.o error.o \
        search.o util.o compare.o message.o add.o delete.o modrdn.o modify.o \
        abandon.o syntax.o association.o kerberos.o LDAP_tables.o \
        certificate.o
@@ -27,7 +27,7 @@ ldapd:        version.o
 sldapd:        version.o
        $(CC) $(LDFLAGS) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
 
-version.c: $(OBJS) $(LDIR)/liblber/liblber.a
+version.c: $(OBJS) $(LDAP_LIBDIR)/liblber/liblber.a
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
         t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \

diff --git a/servers/ldapd/bind.c b/servers/ldapd/bind.c
index defcb19e0a0b9ab060cc95d143a0562c66c4aa07..20f97de57621bfa25a91a42d05770d1983faaab7 100644 (file)
--- a/servers/ldapd/bind.c
+++ b/servers/ldapd/bind.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 
 #include <ac/socket.h>
+#include <ac/string.h>         /* get SAFEMEMCPY */
 
 #include <quipu/commonarg.h>
 #include <quipu/attrvalue.h>

diff --git a/servers/ldapd/common.h b/servers/ldapd/common.h
index 82ef371fbc61ef266e757e3563fddaa35e8508a4..3193b8b452f70d43a0a402eae9d302cc56cd6521 100644 (file)
--- a/servers/ldapd/common.h
+++ b/servers/ldapd/common.h
@@ -56,5 +56,6 @@ struct msg {
 #define DEFAULT_REFERRAL_TIMEOUT       900     /* DSA connections */
 
 #include "proto-ldapd.h"
+#include "ldap_log.h"
 
 #endif

diff --git a/servers/ldapd/delete.c b/servers/ldapd/delete.c
index 008f341ee3e31ff1afc83c4a145c1d154eb874b2..7c7b6ebfe86cb7ef75d62cf050490401cca49ed6 100644 (file)
--- a/servers/ldapd/delete.c
+++ b/servers/ldapd/delete.c
@@ -13,6 +13,10 @@
 #include "portable.h"
 
 #include <stdio.h>
+/* ac/socket.h must precede ISODE #includes or p_type must be #undeffed
+ * after it is included.  (Because ISODE uses p_type as a field name, and
+ * SunOS 5.5:sys/vtype.h defines it (and ac/socket.h indirectly includes it) */
+#include <ac/socket.h>
 
 #include <quipu/commonarg.h>
 #include <quipu/attrvalue.h>
@@ -21,8 +25,6 @@
 #include <quipu/dap2.h>
 #include <quipu/dua.h>
 
-#include <ac/socket.h>
-
 #include "lber.h"
 #include "ldap.h"
 #include "common.h"

diff --git a/servers/ldapd/error.c b/servers/ldapd/error.c
index 597481798867aaf0ad46df32f402dfae80a64844..2a92880065c33b7e3c6ea72dc392ba0575c160ab 100644 (file)
--- a/servers/ldapd/error.c
+++ b/servers/ldapd/error.c
@@ -24,6 +24,7 @@
 
 #include "lber.h"
 #include "ldap.h"
+#include "ldap_log.h"
 
 void
 print_error( struct DSError *e )

diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c
index abcbf2c4d8912097b7392032dc050c86e60199ce..51d5791b465c31684d5cbcb74fb343f7c5cd7988 100644 (file)
--- a/servers/ldapd/main.c
+++ b/servers/ldapd/main.c
@@ -37,6 +37,7 @@
 #include <quipu/ds_error.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"  /* get struct sockbuf */
 #include "ldap.h"
 #include "common.h"
 

diff --git a/servers/ldapd/modify.c b/servers/ldapd/modify.c
index d2197c4039916b25c36e1baccbfa6bef9ea2c85f..6ce4474e7e488f3658bf270c4d6ec17dc2e6615d 100644 (file)
--- a/servers/ldapd/modify.c
+++ b/servers/ldapd/modify.c
@@ -16,6 +16,7 @@
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
+#include <ac/string.h>         /* get SAFEMEMCPY */
 
 #include <quipu/commonarg.h>
 #include <quipu/attrvalue.h>

diff --git a/servers/ldapd/request.c b/servers/ldapd/request.c
index 77d59eb2f527ae30aa79d6a2e25ba3bcc7d7c275..4e93a853c6e2f1698fc274c379d0da10fe5595ff 100644 (file)
--- a/servers/ldapd/request.c
+++ b/servers/ldapd/request.c
@@ -27,6 +27,7 @@
 #include <quipu/dua.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"  /* get struct berelement */
 #include "ldap.h"
 #include "common.h"
 
@@ -83,7 +84,7 @@ client_request(
         * and then the actual request choice.
         */
 
-       ber_init( &ber, 0 );
+       ber_init_w_nullc( &ber, 0 );
        if ( (tag = ber_get_next( clientsb, &len, &ber )) == LBER_DEFAULT ) {
                Debug( LDAP_DEBUG_ANY, "ber_get_next failed\n", 0, 0, 0 );
                log_and_exit( 1 );

diff --git a/servers/ldapd/result.c b/servers/ldapd/result.c
index 22eb9b933ca5c6e0f61c4f7b99f3ed4f62eefcae..beaef17cd4e9c5685af93f33d64e6e3c9e89aadf 100644 (file)
--- a/servers/ldapd/result.c
+++ b/servers/ldapd/result.c
@@ -23,6 +23,7 @@
 #include <quipu/dua.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"  /* get struct berelement */
 #include "ldap.h"
 #include "common.h"
 

diff --git a/servers/ldapd/search.c b/servers/ldapd/search.c
index c923ce4720e857ee1f9781c5d8fb53fc22bb3136..03d995c1c7c00d53fe61f81c434dbb8820390fa9 100644 (file)
--- a/servers/ldapd/search.c
+++ b/servers/ldapd/search.c
@@ -25,6 +25,7 @@
 #include <quipu/dua.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"  /* get struct berelement */
 #include "ldap.h"
 #include "common.h"
 

diff --git a/servers/ldapd/syntax.c b/servers/ldapd/syntax.c
index 5124e1400f2b63ab201e4674530024b136220ded..d324caf39d2513b164f2b0c6b92bf0e65af23e37 100644 (file)
--- a/servers/ldapd/syntax.c
+++ b/servers/ldapd/syntax.c
@@ -26,6 +26,7 @@
 #include <quipu/dua.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"  /* get struct berelement */
 #include "ldap.h"
 #include "common.h"