Patch: More format bugs (ITS#1702)

			================
Written by Hallvard B. Furuseth and placed into the public domain.
This software is not subject to any license of the University of Oslo.

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index bbe8949dcb34c9a33c7a5fd5519379760117bfdd..5db2b70ede9c4cbb1c3924b79486e15f6ba17015 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -183,7 +183,7 @@ ldap_pvt_tls_init_def_ctx( void )
                                ERR_peek_error() ));
 #else
                        Debug( LDAP_DEBUG_ANY,
-                      "TLS: could not allocate default ctx (%d).\n",
+                      "TLS: could not allocate default ctx (%lu).\n",
                                ERR_peek_error(),0,0);
 #endif
                        goto error_exit;

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index 908c63a0d112a2edd24b2661762766f5910c99aa..c05cfc393390b46624cc01f5b3531c55d89ef096 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -182,10 +182,10 @@ bdb_attr_index_config(
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "attr_index_config: index %s 0x%04x\n",
+                       "attr_index_config: index %s 0x%04lx\n",
                        ad->ad_cname.bv_val, mask ));
 #else
-               Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
+               Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
                        ad->ad_cname.bv_val, mask, 0 ); 
 #endif
 

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 4d973ce67d4addaf83a93893af43a29a5f366213..bd8adc0bdc8c2deb688b4adf0a0c59f0ee3757c5 100644 (file)
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -165,8 +165,8 @@ bdb_filter_candidates(
 #ifdef NEW_LOGGING
                LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n"));
 #else
-               Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %d\n",
-                       f->f_choice, 0, 0 );
+               Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
+                       (unsigned long) f->f_choice, 0, 0 );
 #endif
        }
 

diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
index d3538177faf9d850981586507b2f10a510363e61..ec193efeece06c9cc48c22d26d2b7e4364785819 100644 (file)
--- a/servers/slapd/back-bdb/idl.c
+++ b/servers/slapd/back-bdb/idl.c
@@ -299,7 +299,7 @@ bdb_idl_fetch_key(
                                        LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "=> bdb_idl_fetch_key: range size mismatch: expected %ld, got %ld\n", BDB_IDL_RANGE_SIZE, ids[0] ));
 #else
                                        Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
-                                               "range size mismatch: expected %ld, got %ld\n",
+                                               "range size mismatch: expected %d, got %ld\n",
                                                BDB_IDL_RANGE_SIZE, ids[0], 0 );
 #endif
                                        cursor->c_close( cursor );