ldapd did not compile

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}|" \

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>

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

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"

servers/ldapd/error.c

@@ -24,6 +24,7 @@
 
 #include "lber.h"
 #include "ldap.h"
+#include "ldap_log.h"
 
 void
 print_error( struct DSError *e )

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"
 

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>

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 );

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"
 

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"
 

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"