diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-02-24 16:22:43 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-02-24 16:22:43 +0000 |
| commit | 537c8cb011005a99df7b26a9490dedb33c7b42db (patch) | |
| tree | dbda4ae7957ae6513cfb58696453ae87fd92b8d9 | |
| parent | 21305115e547133a0122c44b7e9956ef78dc94be (diff) | |
| download | ds-537c8cb011005a99df7b26a9490dedb33c7b42db.tar.gz ds-537c8cb011005a99df7b26a9490dedb33c7b42db.tar.xz ds-537c8cb011005a99df7b26a9490dedb33c7b42db.zip | |
fix Windows build issues
| -rw-r--r-- | ldap/admin/src/create_instance.c | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/replication/repl5_replica.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/tools/Makefile | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/tools/dbscan.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c index 6d3d3111..d2f4f7c5 100644 --- a/ldap/admin/src/create_instance.c +++ b/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"); diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c index 007f3371..028bec2e 100644 --- a/ldap/servers/plugins/replication/repl5_replica.c +++ b/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) diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile index 1f827184..1dbce5e2 100644 --- a/ldap/servers/slapd/tools/Makefile +++ b/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) \ diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c index 19821f2c..9c257824 100644 --- a/ldap/servers/slapd/tools/dbscan.c +++ b/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; |