Pārlūkot izejas kodu

fix Windows build issues

Rich Megginson 21 gadi atpakaļ
vecāks
revīzija
537c8cb011

+ 2 - 0
ldap/admin/src/create_instance.c

@@ -3727,6 +3727,7 @@ char *ds_gen_confs(char *sroot, server_config_s *cf,
         }
     }
 
+#if !defined( XP_WIN32 )
 	/* PAM Pass Through Auth plugin - off by default */
 	fprintf(f, "dn: cn=PAM Pass Through Auth,cn=plugins,cn=config\n");
 	fprintf(f, "objectclass: top\n");
@@ -3750,6 +3751,7 @@ char *ds_gen_confs(char *sroot, server_config_s *cf,
 	fprintf(f, "pamSecure: TRUE\n");
 	fprintf(f, "pamService: ldapserver\n");
 	fprintf(f, "\n");
+#endif /* NO PAM FOR WINDOWS */
 
     fprintf(f, "dn: cn=ldbm database,cn=plugins,cn=config\n");
     fprintf(f, "objectclass: top\n");

+ 0 - 2
ldap/servers/plugins/replication/repl5_replica.c

@@ -2805,8 +2805,6 @@ _replica_get_purge_csn_nolock(const Replica *r)
 	CSN *purge_csn = NULL;
 	CSN **csns = NULL;
 	RUV *ruv;
-	time_t cutoff_time;
-	time_t max_time_in_csn_list;
 	int i;
 
 	if (r->repl_purge_delay > 0)

+ 1 - 1
ldap/servers/slapd/tools/Makefile

@@ -71,7 +71,7 @@ EXTRA_LIBS_DEP = $(LDAPSDK_DEP) \
 	$(LDAP_SLIBLCACHE_DEP) $(DB_LIB_DEP) $(LIBSLAPD_DEP) \
 	$(LDAP_COMMON_LIBS_DEP)
 
-EXTRA_LIBS = $(LDAPLINK) \
+EXTRA_LIBS += $(LDAPLINK) \
 	$(LDAP_SLIBLCACHE) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) $(LIBSLAPD) $(LDAP_LIBLITEKEY) \
 	$(ALIBS) \

+ 1 - 0
ldap/servers/slapd/tools/dbscan.c

@@ -19,6 +19,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <winsock.h>
 extern int getopt();
 extern char *optarg; 
 typedef unsigned char uint8_t;