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.

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;

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
 

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
 	}
 

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 );