7 files changed, 22 insertions, 11 deletions
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index a9e44e2e..c57ea1ec 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -121,8 +121,10 @@ endif # SOLARIS
 endif # IRIX
 endif # WINNT
 
+ifneq ($(ARCH), WINNT)
 TEMP_EXTRALDFLAGS:=$(EXTRALDFLAGS)
 EXTRALDFLAGS = -lpthread $(TEMP_EXTRALDFLAGS)
+endif
 
 ifeq ($(SECURITY),domestic)
 SECUS_BINS=
diff --git a/ldap/admin/src/ds_ldif2db.c b/ldap/admin/src/ds_ldif2db.c
index c0c91815..a82cad97 100644
--- a/ldap/admin/src/ds_ldif2db.c
+++ b/ldap/admin/src/ds_ldif2db.c
@@ -19,6 +19,9 @@
 #ifdef XP_UNIX
 #include <unistd.h>
 #endif
+#ifdef XP_WIN32
+#include <io.h>
+#endif
 
 int main(int argc, char *argv[])
 {
diff --git a/ldap/admin/src/ds_rmdb.c b/ldap/admin/src/ds_rmdb.c
index 70cc950b..90904e64 100644
--- a/ldap/admin/src/ds_rmdb.c
+++ b/ldap/admin/src/ds_rmdb.c
@@ -20,6 +20,9 @@
 #ifdef XP_UNIX
 #include <unistd.h>
 #endif
+#ifdef XP_WIN32
+#include <direct.h>
+#endif
 #include "nspr.h"
 
 #ifndef MAXPATHLEN
diff --git a/ldap/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index 04ef1998..f37ef2df 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.cpp
@@ -22,10 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef XP_WIN32
-#include "regparms.h"
-#endif
-
 char *ds_salted_sha1_pw_enc(char* pwd);
 
 
@@ -313,7 +309,7 @@ printInfo(int argc, char *argv[], char *envp[], FILE* fp)
 	fprintf(fp, "#####################################\n");
 }
 
-int main(int argc, char *argv[], char */*envp*/[])
+int main(int argc, char *argv[], char * /*envp*/ [])
 {
     char *rm = getenv("REQUEST_METHOD");
     int status = 0;
diff --git a/ldap/admin/src/latest_file.c b/ldap/admin/src/latest_file.c
index bb9af07d..41f27d9a 100644
--- a/ldap/admin/src/latest_file.c
+++ b/ldap/admin/src/latest_file.c
@@ -69,12 +69,14 @@ int main (int argc, char **argv)
 		return -1;
 	}
 
-	PR_snprintf( latest, sizeof(latest), "%s\\%s", dir, fileinfo.name );
+	_snprintf( latest, sizeof(latest), "%s\\%s", dir, fileinfo.name );
+	latest[sizeof(latest)-1] = (char)0;
 	latest_time = fileinfo.time_create;
 
 	while( _findnext( hFile, &fileinfo ) == 0 ) {
 		if ( fileinfo.time_create > latest_time ) {
-			PR_snprintf( latest, sizeof(latest)-1, "%s\\%s", dir, fileinfo.name );
+			_snprintf( latest, sizeof(latest), "%s\\%s", dir, fileinfo.name );
+			latest[sizeof(latest)-1] = (char)0;
 			latest_time = fileinfo.time_create;
 		}
 	}
diff --git a/ldap/admin/src/namegen.c b/ldap/admin/src/namegen.c
index bdb8c4e1..49af8886 100644
--- a/ldap/admin/src/namegen.c
+++ b/ldap/admin/src/namegen.c
@@ -46,7 +46,8 @@ int main (int argc, char **argv)
 	strftime(szDate, sizeof (szDateFile), "%Y_%m_%d_%H%M%S", 
              sCurTime);
 
-    PR_snprintf (szDateFile, sizeof(szDateFile), "%s.bat", szDate);
+    _snprintf (szDateFile, sizeof(szDateFile), "%s.bat", szDate);
+	szDateFile[sizeof(szDateFile)-1] = (char)0;
 
     /* create date batch file */
     fBatch = fopen (szDateFile, "w");
@@ -73,7 +74,8 @@ int main (int argc, char **argv)
         exit (1);
     }
 
-    PR_snprintf (szCmd, sizeof(szCmd), "call %s", szDate);
+    _snprintf (szCmd, sizeof(szCmd), "call %s", szDate);
+	szCmd[sizeof(szCmd)-1] = (char)0;
 
     rt = fwrite (szCmd, strlen (szCmd), 1, fBatch);
     if (rt != 1)
@@ -92,7 +94,8 @@ int main (int argc, char **argv)
         exit (1);
     }
 
-    PR_snprintf (szCmd, sizeof(szCmd), "del %s\ndel bstart.bat\nset DATESTR=", szDateFile);
+    _snprintf (szCmd, sizeof(szCmd), "del %s\ndel bstart.bat\nset DATESTR=", szDateFile);
+	szCmd[sizeof(szCmd)-1] = (char)0;
 
     rt = fwrite (szCmd, strlen(szCmd), 1, fBatch);
     if (rt != 1)
diff --git a/ldap/admin/src/script-gen.c b/ldap/admin/src/script-gen.c
index e3f5e33f..0f93406a 100644
--- a/ldap/admin/src/script-gen.c
+++ b/ldap/admin/src/script-gen.c
@@ -13,7 +13,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "portable.h"
-
+#if defined( XP_WIN32 )
+#include <io.h>
+#endif
 
 /* reads the file on inpath, and rewrites it on outpath.
  * 'table' is a list of string-pairs (terminated by a pair of NULLs) that