Index: build/main.dsw
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/build/main.dsw,v
retrieving revision 1.27
diff -u -r1.27 main.dsw
--- build/main.dsw	30 Aug 2002 05:05:12 -0000	1.27
+++ build/main.dsw	1 Mar 2004 00:21:38 -0000
@@ -251,9 +251,6 @@
     Begin Project Dependency
     Project_Dep_Name liblutil
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -294,9 +291,6 @@
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblber
     End Project Dependency
 }}}
@@ -360,9 +354,6 @@
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblber
     End Project Dependency
 }}}
@@ -390,21 +381,6 @@
 
 ###############################################################################
 
-Project: "libavl"=..\libraries\libavl\libavl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name setup
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "liblber"=..\libraries\liblber\liblber.dsp - Package Owner=<4>
 
 Package=<5>
@@ -450,36 +426,6 @@
 
 ###############################################################################
 
-Project: "libldbm"=..\libraries\libldbm\libldbm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name setup
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libldif"=..\libraries\libldif\libldif.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name setup
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "liblunicode"=..\libraries\liblunicode\liblunicode.dsp - Package Owner=<4>
 
 Package=<5>
@@ -609,21 +555,12 @@
     Project_Dep_Name backldbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libavl
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblber
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libldap_r
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldbm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
@@ -638,6 +575,9 @@
     Begin Project Dependency
     Project_Dep_Name backmon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name backldbm
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -651,21 +591,12 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libavl
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblber
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libldap_r
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldbm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
@@ -702,12 +633,6 @@
     Project_Dep_Name libldap_r
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libavl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
@@ -717,9 +642,6 @@
     Project_Dep_Name liblber
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldbm
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libslapd
     End Project Dependency
     Begin Project Dependency
@@ -731,6 +653,9 @@
     Begin Project Dependency
     Project_Dep_Name backmon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name backldbm
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -747,21 +672,12 @@
     Project_Dep_Name backldbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libavl
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblber
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libldap_r
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libldbm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libldif
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name liblutil
     End Project Dependency
     Begin Project Dependency
@@ -776,11 +692,14 @@
     Begin Project Dependency
     Project_Dep_Name backmon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name badldbm
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "testavl"=..\libraries\libavl\testavl.dsp - Package Owner=<4>
+Project: "testavl"=..\libraries\liblutil\testavl.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -789,10 +708,10 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libavl
+    Project_Dep_Name liblber
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name liblber
+    Project_Dep_Name liblutil
     End Project Dependency
 }}}
 
Index: include/portable.nt
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/include/portable.nt,v
retrieving revision 1.36
diff -u -r1.36 portable.nt
--- include/portable.nt	1 Jan 2004 18:15:24 -0000	1.36
+++ include/portable.nt	1 Mar 2004 00:21:40 -0000
@@ -1058,5 +1058,6 @@
 #include "ldap_features.h"
 
 #include "ac/assert.h"
+#include "ac/localize.h"
 
 #endif /* _LDAP_PORTABLE_H */
Index: libraries/liblber/debug.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/debug.c,v
retrieving revision 1.16
diff -u -r1.16 debug.c
--- libraries/liblber/debug.c	4 Feb 2004 21:53:17 -0000	1.16
+++ libraries/liblber/debug.c	1 Mar 2004 00:21:40 -0000
@@ -146,8 +146,6 @@
 	time_t now;
 	struct tm *today;
 #endif
-	size_t i;
-	char * tmp;
 
 #ifdef LDAP_SYSLOG
 	/* we're configured to use syslog */
Index: libraries/libldap/cyrus.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/cyrus.c,v
retrieving revision 1.100
diff -u -r1.100 cyrus.c
--- libraries/libldap/cyrus.c	24 Feb 2004 15:25:39 -0000	1.100
+++ libraries/libldap/cyrus.c	1 Mar 2004 00:21:41 -0000
@@ -632,6 +632,7 @@
 		LDAP_FREE( authid.bv_val );
 	}
 
+#if !defined(_WIN32)
 	/* Check for local */
 	if ( ldap_pvt_url_scheme2proto( ld->ld_defconn->lconn_server->lud_scheme ) == LDAP_PROTO_IPC ) {
 		char authid[sizeof("uidNumber=4294967295+gidNumber=4294967295,"
@@ -641,6 +642,7 @@
 			(int) geteuid(), (int) getegid() );
 		(void) ldap_int_sasl_external( ld, ld->ld_defconn, authid, LDAP_PVT_SASL_LOCAL_SSF );
 	}
+#endif
 
 	/* (re)set security properties */
 	sasl_setprop( ctx, SASL_SEC_PROPS,
Index: libraries/libldap/os-ip.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/os-ip.c,v
retrieving revision 1.96
diff -u -r1.96 os-ip.c
--- libraries/libldap/os-ip.c	1 Jan 2004 18:15:26 -0000	1.96
+++ libraries/libldap/os-ip.c	1 Mar 2004 00:21:41 -0000
@@ -523,7 +523,6 @@
 	struct sockaddr sabuf;
 #endif
 	struct sockaddr	*sa = (struct sockaddr *) &sabuf;
-	int rc;
 	ber_socket_t	sd;
 
 	(void)memset( (char *)sa, '\0', sizeof sabuf );
Index: libraries/libldap/search.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/search.c,v
retrieving revision 1.62
diff -u -r1.62 search.c
--- libraries/libldap/search.c	1 Jan 2004 18:15:27 -0000	1.62
+++ libraries/libldap/search.c	1 Mar 2004 00:21:42 -0000
@@ -223,7 +223,7 @@
 	ber_int_t *idp)
 {
 	BerElement	*ber;
-	int		err, id;
+	int		err;
 
 	/*
 	 * Create the search request.  It looks like this:
Index: libraries/liblutil/liblutil.dsp
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/liblutil.dsp,v
retrieving revision 1.32
diff -u -r1.32 liblutil.dsp
--- libraries/liblutil/liblutil.dsp	7 Mar 2003 20:10:02 -0000	1.32
+++ libraries/liblutil/liblutil.dsp	1 Mar 2004 00:21:42 -0000
@@ -293,5 +293,25 @@
 
 SOURCE=.\uuid.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\avl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\avl.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldif.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fetch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ldif.h
+# End Source File
 # End Target
 # End Project
Index: libraries/liblutil/passwd.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/passwd.c,v
retrieving revision 1.86
diff -u -r1.86 passwd.c
--- libraries/liblutil/passwd.c	26 Feb 2004 02:10:53 -0000	1.86
+++ libraries/liblutil/passwd.c	1 Mar 2004 00:21:44 -0000
@@ -185,7 +185,6 @@
 
 void lutil_passwd_init()
 {
-	struct pw_slist *ptr;
 	struct pw_scheme *s;
 
 	for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
Index: servers/slapd/back-ldbm/backldbm.dsp
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-ldbm/backldbm.dsp,v
retrieving revision 1.18
diff -u -r1.18 backldbm.dsp
--- servers/slapd/back-ldbm/backldbm.dsp	20 Jan 2003 19:18:53 -0000	1.18
+++ servers/slapd/back-ldbm/backldbm.dsp	1 Mar 2004 00:21:45 -0000
@@ -140,10 +140,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\attribute.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\back-ldbm.h"
 # End Source File
 # Begin Source File
@@ -196,10 +192,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\group.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\id2children.c
 # End Source File
 # Begin Source File
@@ -240,10 +232,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\passwd.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\proto-back-ldbm.h"
 # End Source File
 # Begin Source File
@@ -257,6 +245,14 @@
 # Begin Source File
 
 SOURCE=.\tools.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldbm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldbm.h
 # End Source File
 # End Target
 # End Project