From c39d8720d96a124dd0a79032b6efd4433acc5532 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Wed, 4 Nov 1998 19:45:38 +0000 Subject: [PATCH] ldapd did not compile --- servers/ldapd/Makefile.in | 6 +++--- servers/ldapd/bind.c | 1 + servers/ldapd/common.h | 1 + servers/ldapd/delete.c | 6 ++++-- servers/ldapd/error.c | 1 + servers/ldapd/main.c | 1 + servers/ldapd/modify.c | 1 + servers/ldapd/request.c | 3 ++- servers/ldapd/result.c | 1 + servers/ldapd/search.c | 1 + servers/ldapd/syntax.c | 1 + 11 files changed, 17 insertions(+), 6 deletions(-) diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in index fc2db5a5cf..002f02eceb 100644 --- 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 defcb19e0a..20f97de576 100644 --- a/servers/ldapd/bind.c +++ b/servers/ldapd/bind.c @@ -15,6 +15,7 @@ #include #include +#include /* get SAFEMEMCPY */ #include #include diff --git a/servers/ldapd/common.h b/servers/ldapd/common.h index 82ef371fbc..3193b8b452 100644 --- 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 008f341ee3..7c7b6ebfe8 100644 --- a/servers/ldapd/delete.c +++ b/servers/ldapd/delete.c @@ -13,6 +13,10 @@ #include "portable.h" #include +/* 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 #include #include @@ -21,8 +25,6 @@ #include #include -#include - #include "lber.h" #include "ldap.h" #include "common.h" diff --git a/servers/ldapd/error.c b/servers/ldapd/error.c index 5974817988..2a92880065 100644 --- 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 abcbf2c4d8..51d5791b46 100644 --- a/servers/ldapd/main.c +++ b/servers/ldapd/main.c @@ -37,6 +37,7 @@ #include #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 d2197c4039..6ce4474e7e 100644 --- a/servers/ldapd/modify.c +++ b/servers/ldapd/modify.c @@ -16,6 +16,7 @@ #include #include +#include /* get SAFEMEMCPY */ #include #include diff --git a/servers/ldapd/request.c b/servers/ldapd/request.c index 77d59eb2f5..4e93a853c6 100644 --- a/servers/ldapd/request.c +++ b/servers/ldapd/request.c @@ -27,6 +27,7 @@ #include #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 22eb9b933c..beaef17cd4 100644 --- a/servers/ldapd/result.c +++ b/servers/ldapd/result.c @@ -23,6 +23,7 @@ #include #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 c923ce4720..03d995c1c7 100644 --- a/servers/ldapd/search.c +++ b/servers/ldapd/search.c @@ -25,6 +25,7 @@ #include #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 5124e1400f..d324caf39d 100644 --- a/servers/ldapd/syntax.c +++ b/servers/ldapd/syntax.c @@ -26,6 +26,7 @@ #include #include "lber.h" +#include "../../libraries/liblber/lber-int.h" /* get struct berelement */ #include "ldap.h" #include "common.h" -- 2.39.5