Fix formating of variables with type: long

7 files changed, 16 insertions, 13 deletions

diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
index 402fd03e..725687dd 100644
--- a/src/krb5_plugin/sssd_krb5_locator_plugin.c
+++ b/src/krb5_plugin/sssd_krb5_locator_plugin.c
@@ -171,7 +171,7 @@ static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
             }
 
             if (port < 0 || port > 65535) {
-                PLUGIN_DEBUG(("Illegal port number [%d], assuming default.\n",
+                PLUGIN_DEBUG(("Illegal port number [%ld], assuming default.\n",
                             port));
                 port = 0;
             }
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 4f56736d..8738be16 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -127,7 +127,7 @@ static void sss_krb5_expire_callback_func(krb5_context context, void *data,
         DEBUG(1, ("Time to expire out of range.\n"));
         return;
     }
-    DEBUG(SSSDBG_TRACE_INTERNAL, ("exp_time: [%d]\n", exp_time));
+    DEBUG(SSSDBG_TRACE_INTERNAL, ("exp_time: [%ld]\n", exp_time));
 
     blob = talloc_array(kr->pd, uint32_t, 2);
     if (blob == NULL) {
diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c
index dedb734f..80eaeb56 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -653,7 +653,7 @@ static errno_t _krb5_servers_init(struct be_ctx *ctx,
                 }
 
                 if (port < 1 || port > 65535) {
-                    DEBUG(SSSDBG_CRIT_FAILURE, ("Illegal port number [%d].\n", port));
+                    DEBUG(SSSDBG_CRIT_FAILURE, ("Illegal port number [%ld].\n", port));
                     ret = EINVAL;
                     goto done;
                 }
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index e5b63658..dcaea75c 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -115,9 +115,10 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now,
 
     tzset();
     expire_time -= timezone;
-    DEBUG(9, ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%d] "
-              "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
-              tzname[1], timezone, daylight, now, expire_time));
+    DEBUG(SSSDBG_TRACE_ALL,
+          ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "
+           "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
+           tzname[1], timezone, daylight, now, expire_time));
 
     if (difftime(now, expire_time) > 0.0) {
         DEBUG(4, ("Kerberos password expired.\n"));
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index f7ad7118..0df5afe8 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -1578,8 +1578,9 @@ errno_t string_to_shadowpw_days(const char *s, long *d)
     }
 
     if (l < -1) {
-        DEBUG(1, ("Input string contains not allowed negative value [%d].\n",
-                  l));
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              ("Input string contains not allowed negative value [%ld].\n",
+               l));
         return EINVAL;
     }
 
diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 53df7b0e..b381fc40 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -433,9 +433,10 @@ static bool nds_check_expired(const char *exp_time_str)
     tzset();
     expire_time -= timezone;
     now = time(NULL);
-    DEBUG(9, ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%d] "
-              "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
-              tzname[1], timezone, daylight, now, expire_time));
+    DEBUG(SSSDBG_TRACE_ALL,
+          ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "
+           "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
+           tzname[1], timezone, daylight, now, expire_time));
 
     if (difftime(now, expire_time) > 0.0) {
         DEBUG(4, ("NDS account expired.\n"));
diff --git a/src/util/util.h b/src/util/util.h
index c2c31f5d..67f60a58 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -128,7 +128,7 @@ errno_t set_debug_file_from_fd(const int fd);
             memcpy(__debug_macro_datetime, ctime(&__debug_macro_tv.tv_sec), 19); \
             __debug_macro_datetime[19] = '\0'; \
             if (debug_microseconds) { \
-                debug_fn("(%s:%.6d %d) [%s] [%s] (%#.4x): ", \
+                debug_fn("(%s:%.6ld %d) [%s] [%s] (%#.4x): ", \
                          __debug_macro_datetime, __debug_macro_tv.tv_usec, \
                          __debug_macro_year, debug_prg_name, \
                          __FUNCTION__, __debug_macro_newlevel); \
@@ -169,7 +169,7 @@ errno_t set_debug_file_from_fd(const int fd);
             memcpy(__debug_macro_datetime, ctime(&__debug_macro_tv.tv_sec), 19); \
             __debug_macro_datetime[19] = '\0'; \
             if (debug_microseconds) { \
-                debug_fn("(%s:%.6d %d) [%s] [%s] (%#.4x): %s\n", \
+                debug_fn("(%s:%.6ld %d) [%s] [%s] (%#.4x): %s\n", \
                          __debug_macro_datetime, __debug_macro_tv.tv_usec, \
                          __debug_macro_year, debug_prg_name, \
                          function, __debug_macro_newlevel, message); \