from jon@symas.com - misc Windows cleanup

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 482834ed5c2c6d0f2db1862362fcf91117a9dbcd..eede1508d17b300d128e17730c2cda1a4181bbe4 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -143,7 +143,7 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
        }
 
        /* BER element should have enough data left */
-       if( *len > ber_pvt_ber_remaining( ber ) ) {
+       if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {
                return LBER_DEFAULT;
        }
 

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 0b90709ac4574620bacd04181286dbb95831025f..e4bb1b150446c254cb563a926f279ff21eb47417 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -2060,7 +2060,7 @@ end_of_value:;
 
        len = ( ( endPos ? endPos : p ) - startPos ) / 2;
        /* must be even! */
-       assert( 2 * len == ( endPos ? endPos : p ) - startPos );
+       assert( 2 * len == (ber_len_t) (( endPos ? endPos : p ) - startPos ));
 
        *val = LDAP_MALLOC( sizeof( struct berval ) );
        if ( *val == NULL ) {

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 8609ce2768cfc5da94cd068e64d464f4045bbf85..e4b4983177330d4206dc6de302fe1e1f0e19b6d2 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -18,6 +18,14 @@
 
 #include "../liblber/lber-int.h"
 
+/*
+ * Windows does not preprocess correctly unless
+ * this #include precedes queue.h
+ */
+#ifdef LDAP_R_COMPILE
+#include <ldap_pvt_thread.h>
+#endif
+
 #include <ac/queue.h>
 
 #ifdef HAVE_CYRUS_SASL
@@ -306,8 +314,6 @@ struct ldap {
 #define LDAP_VALID(ld) ( (ld)->ld_valid == LDAP_VALID_SESSION )
 
 #ifdef LDAP_R_COMPILE
-#include <ldap_pvt_thread.h>
-
 #ifdef HAVE_RES_QUERY
 LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_resolv_mutex;
 #endif

diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index 77aca1e03602d455d2acb9aa59b06404b67a7543..29cdf494096ac85b6abb5cdabc76189e98f01414 100644 (file)
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -237,7 +237,7 @@ bind_prompt( LDAP *ld,
        static char     dn[256], passwd[256];
        int     authmethod;
 
-       printf("rebind for request=%d msgid=%ld url=%s\n",
+       printf("rebind for request=%ld msgid=%ld url=%s\n",
                request, (long) msgid, url );
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND

diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index 14609130128b0436d23fd02f476a3facd3e37ff5..4a16c5dd1bd5c4340f54b5237aad8add2e52d5fd 100644 (file)
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -10,9 +10,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#ifdef HAVE_WINCRYPT_H
-#include <wincrypt.h>
-#endif
 #ifdef HAVE_PROCESS_H
 #include <process.h>
 #endif

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index cae60fbd1c54c8428c0489dc4858802fd4fec12d..739c833bc6db2fa7883084f7e1b2afa8415556b3 100644 (file)
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -373,6 +373,8 @@ struct berval * lutil_passwd_hash(
        return (sc->hash_fn)( sc, passwd );
 }
 
+/* pw_string is only called when SLAPD_LMHASH or SLAPD_CRYPT is defined */
+#if defined(SLAPD_LMHASH) || defined(SLAPD_CRYPT)
 static struct berval * pw_string(
        const struct pw_scheme *sc,
        const struct berval *passwd )
@@ -394,6 +396,7 @@ static struct berval * pw_string(
        pw->bv_val[pw->bv_len] = '\0';
        return pw;
 }
+#endif /* SLAPD_LMHASH || SLAPD_CRYPT */
 
 static struct berval * pw_string64(
        const struct pw_scheme *sc,

diff --git a/libraries/liblutil/uuid.c b/libraries/liblutil/uuid.c
index 0bb664a0dc01815032551defd2955ee137e402a4..afebf2cca921142d9e08a8eff2ec880ac07cc995 100644 (file)
--- a/libraries/liblutil/uuid.c
+++ b/libraries/liblutil/uuid.c
@@ -42,7 +42,8 @@
 
 #include <lutil.h>
 
-#ifndef HAVE_SYS_UUID_H
+/* not needed for Windows */
+#if !defined(HAVE_SYS_UUID_H) && !defined(_WIN32)
 static unsigned char *
 lutil_eaddr( void )
 {