Fix Debug printf format

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 0d312091483d6a302152836eff29a66337a5416c..359811e94a1c5eb21f60cda20ac568ab63092331 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -99,7 +99,7 @@ done:
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-               id, notfound ? "not " : "", 0 );
+              (long) id, notfound ? "not " : "", 0 );
 
        return LDAP_SUCCESS;
 }

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 2ebf99a013d9a68914836aa5f0b615c99e7c0b0d..c541da91e5521d2d9c8a911cd29c8fe52bec8702 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -696,8 +696,8 @@ at_schema_info( Entry *e )
                val.bv_val = ldap_attributetype2str( &at->sat_atype );
                if ( val.bv_val ) {
                        val.bv_len = strlen( val.bv_val );
-                       Debug( LDAP_DEBUG_TRACE, "Merging at [%d] %s\n",
-                              val.bv_len, val.bv_val, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
+                              (long) val.bv_len, val.bv_val, 0 );
                        attr_merge( e, "attributeTypes", vals );
                        ldap_memfree( val.bv_val );
                } else {

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index a2262c63b9fee0b09088669fe62c2aa19186d704..2d00436cdaf93406e1be25dcf452d1d941a2f8ce 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -205,7 +205,7 @@ ldbm_back_modrdn(
                }
 
                Debug( LDAP_DEBUG_TRACE,
-                      "ldbm_back_modrdn: wr to new parent OK np=%p, id=%d\n",
+                      "ldbm_back_modrdn: wr to new parent OK np=%p, id=%ld\n",
                       np, np->e_id, 0 );
            
                /* check newSuperior for "children" acl */

diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
index e1ea26387345223cae6e74f2fd97d6614d83a312..da497ab477ce8337a31530642b11170dbb1150f9 100644 (file)
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -45,8 +45,8 @@ shell_back_abandon(
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                if ( pid != -1 ) {
-                       Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n", pid,
-                           0, 0 );
+                       Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n",
+                              (int) pid, 0, 0 );
                        kill( pid, SIGTERM );
                } else {
                        Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n",

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index a4401bced5a7a47ebedebe1518a72ec7aa5daa8f..01f9d12f5f26fdd8cb95c58edc12023b91313149 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -96,7 +96,7 @@ slap_op_remove( Operation **olist, Operation *op )
 
        if ( *tmp == NULL ) {
                Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
-                   op->o_msgid, 0, 0 );
+                      (long) op->o_msgid, 0, 0 );
                return -1; 
        }
 

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 51002f91f4a61e57ab5fe94473a780e884a904d1..7ee54a2e641a518cc4990b43e5a2812364c9aa41 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1067,8 +1067,8 @@ syn_schema_info( Entry *e )
                val.bv_val = ldap_syntax2str( &syn->ssyn_syn );
                if ( val.bv_val ) {
                        val.bv_len = strlen( val.bv_val );
-                       Debug( LDAP_DEBUG_TRACE, "Merging syn [%d] %s\n",
-                              val.bv_len, val.bv_val, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
+                              (long) val.bv_len, val.bv_val, 0 );
                        attr_merge( e, "ldapSyntaxes", vals );
                        ldap_memfree( val.bv_val );
                } else {
@@ -1092,8 +1092,8 @@ mr_schema_info( Entry *e )
                val.bv_val = ldap_matchingrule2str( &mr->smr_mrule );
                if ( val.bv_val ) {
                        val.bv_len = strlen( val.bv_val );
-                       Debug( LDAP_DEBUG_TRACE, "Merging mr [%d] %s\n",
-                              val.bv_len, val.bv_val, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "Merging mr [%ld] %s\n",
+                              (long) val.bv_len, val.bv_val, 0 );
                        attr_merge( e, "matchingRules", vals );
                        ldap_memfree( val.bv_val );
                } else {
@@ -1117,8 +1117,8 @@ oc_schema_info( Entry *e )
                val.bv_val = ldap_objectclass2str( &oc->soc_oclass );
                if ( val.bv_val ) {
                        val.bv_len = strlen( val.bv_val );
-                       Debug( LDAP_DEBUG_TRACE, "Merging oc [%d] %s\n",
-                              val.bv_len, val.bv_val, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
+                              (long) val.bv_len, val.bv_val, 0 );
                        attr_merge( e, "objectClasses", vals );
                        ldap_memfree( val.bv_val );
                } else {

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 2613fbcfa42c8095cf77714973a2a3acd4d888d6..ce2b0050e96cdba56d46e756b2c959e9a76b7481 100644 (file)
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -120,13 +120,13 @@ slap_init_user( char *user, char *group )
     if ( got_gid ) {
        if ( setgid( gid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set real group id to %d\n",
-                  gid, 0, 0 );
+                      (int) gid, 0, 0 );
            exit( EXIT_FAILURE );
        }
 #ifdef HAVE_SETEGID
        if ( setegid( gid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set effective group id to %d\n",
-                  gid, 0, 0 );
+                      (int) gid, 0, 0 );
            exit( EXIT_FAILURE );
        }
 #endif
@@ -135,13 +135,13 @@ slap_init_user( char *user, char *group )
     if ( got_uid ) {
        if ( setuid( uid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
-                  uid, 0, 0 );
+                      (int) uid, 0, 0 );
            exit( EXIT_FAILURE );
        }
 #ifdef HAVE_SETEUID
        if ( seteuid( uid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
-                  uid, 0, 0 );
+                      (int) uid, 0, 0 );
            exit( EXIT_FAILURE );
        }
 #endif