[SSSD] [PATCHES] Enable printf format string checking
Lukas Slebodnik
lslebodn at redhat.com
Tue Jul 23 16:21:47 UTC 2013
ehlo,
It would be great to have enabled printf format string checking in RHEL7.
Therefore I decided to send pateches for ticket
https://fedorahosted.org/sssd/ticket/1945
Patch 0001 -- Even if this patch is first, it should be applied in upstream as
last.
Patch 0002 - 0006 -- trivial
Patch 0007 -- ssize_t is not defined in ANSI c99, IIRC it is defined in posix
as a signed type, therefore format should be used "zd"
Patch 0008 -- size_t is defined in ANSI c99 as unzigned type -> "zu"
Patch 0009 -- wrapper for inttypes.h and for future format macros.
Patch 0012 -- formating types defined in stdint.h uint_32_t ...
-- there are used macros defined in inttypes.h
Patches 0010 - 0015 fix formating for special variables (key_serial_t, rlim_t...)
and for some types I created macros in sss_format.h
Patch 0010 -- key_serial_t is typedef of int32_t, but it could be defined
differently in another (platforms/ implemantations of kerberos)
Patch 0011 -- it seems that rlim_t us the same as uint64_t, but it was defined
using conditional build an not a typedef of std types.
Patch 0013 -- time_t is defined as "long int" sizeof_i386(time_t) != sizeof_x86_64(time_t)
Patch 0014 -- ber_int and ber_tag are typedef for int and unsigned long
Patch 0015 -- gid_t and uid_t are typedef as unsigned
(I checked linux 32 bit, linu 64_bit and freebsd 64 bit)
Patch 0016 -- trivial
LS
-------------- next part --------------
>From 11e890d95557bf15e85959d4d0b315ad268dfa7d Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 23 May 2013 13:14:37 +0200
Subject: [PATCH 01/16] Enable printf format string checking
https://fedorahosted.org/sssd/ticket/1945
---
configure.ac | 18 ++++++++++++++++++
src/util/util.h | 14 ++++++++++----
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index b9b72e3d7cd3adf1bd127e6ae9546a460ee0055e..abde94774fb3d4e60302ff74ad4e9829550cfcc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,24 @@ if test x"$sss_client_cv_attribute_destructor" = xyes ; then
[whether compiler supports __attribute__((destructor))])
fi
+AC_CACHE_CHECK([whether compiler supports __attribute__((format))],
+ sss_client_cv_attribute_format,
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [void debug_fn(const char *format, ...) __attribute__ ((format (printf, 1, 2)));]
+ )],
+ [sss_client_cv_attribute_format=yes],
+ [
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([compiler does NOT support __attribute__((format))])
+ ])
+ ])
+
+if test x"$sss_client_cv_attribute_format" = xyes ; then
+ AC_DEFINE(HAVE_FUNCTION_ATTRIBUTE_FORMAT, 1,
+ [whether compiler supports __attribute__((format))])
+fi
+
PKG_CHECK_MODULES([CHECK], [check >= 0.9.5], [have_check=1], [have_check=])
if test x$have_check = x; then
AC_MSG_WARN([Without the 'CHECK' libraries, you will be unable to run all tests in the 'make check' suite])
diff --git a/src/util/util.h b/src/util/util.h
index 5acc67bec7ee94b85963d04f5bfcca017cf87abd..c328f7e9fb6d4bbd8667d171ccd0e593d1f0e70f 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -54,13 +54,19 @@
#define CLEAR_MC_FLAG "clear_mc_flag"
+#ifdef HAVE_FUNCTION_ATTRIBUTE_FORMAT
+#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, a2)))
+#else
+#define SSS_ATTRIBUTE_PRINTF(a1, a2)
+#endif
+
extern const char *debug_prg_name;
extern int debug_level;
extern int debug_timestamps;
extern int debug_microseconds;
extern int debug_to_file;
extern const char *debug_log_file;
-void debug_fn(const char *format, ...);
+void debug_fn(const char *format, ...) SSS_ATTRIBUTE_PRINTF(1, 2);
int debug_get_level(int old_level);
int debug_convert_old_level(int old_level);
errno_t set_debug_file_from_fd(const int fd);
@@ -128,7 +134,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 +175,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); \
@@ -292,7 +298,7 @@ void talloc_log_fn(const char *msg);
#define SSS_LOG_INFO 6 /* informational */
#define SSS_LOG_DEBUG 7 /* debug-level messages */
-void sss_log(int priority, const char *format, ...);
+void sss_log(int priority, const char *format, ...) SSS_ATTRIBUTE_PRINTF(2, 3);
/* from server.c */
struct main_context {
--
1.8.3.1
-------------- next part --------------
>From 804d0845270d42bd228fdbed0a3ba5387fb667fb Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 13 Jul 2013 15:25:47 +0200
Subject: [PATCH 02/16] Fix formating of variables with type: long
---
src/krb5_plugin/sssd_krb5_locator_plugin.c | 2 +-
src/providers/krb5/krb5_child.c | 2 +-
src/providers/krb5/krb5_common.c | 2 +-
src/providers/ldap/ldap_auth.c | 2 +-
src/providers/ldap/ldap_common.c | 2 +-
src/providers/ldap/sdap_access.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
index 402fd03e7e45644c65581c7c6f14fe8d7bf2e894..725687ddcf559e251ee54d1005f862bd6d0af4f8 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 47c8fb29f947e04875cd4da63c557a695012e56b..7314dc46eec36ca9b7c194c3e4db0112c1669458 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 0e1c10becf177051282a99685dadbf37e0b61e7b..d2afbef9f96e8f7eac2970ef00febc28103e5cf7 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -556,7 +556,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 ea28ba66b09d6ef8bafb65c51af67e4b3d384908..bf14c2b87f7d5555f6f1818134f7591a1178fa40 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -115,7 +115,7 @@ 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] "
+ DEBUG(9, ("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));
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index 9aa98173c865d0b032f02bd6a0ec80b93682af6d..086e910f0a76e106587159e79dbc378873478ed6 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -1597,7 +1597,7 @@ 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",
+ DEBUG(1, ("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 53df7b0eeb3bb2bdbede6c126fb004658dea2656..7a571e3c493d7dfd023409b78d161af2fe34a38d 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -433,7 +433,7 @@ 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] "
+ DEBUG(9, ("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));
--
1.8.3.1
-------------- next part --------------
>From 9acbf903820f8044955c46a2fdcdda920d840bc7 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 13 Jul 2013 15:40:29 +0200
Subject: [PATCH 03/16] Fix formating of variables with type: unsigned long
---
src/providers/proxy/proxy_auth.c | 2 +-
src/responder/common/responder_dp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c
index 99b1a76c705975da91594eabd70e6a1a94eb6c18..1a8dd41620533449ee9624828cb710d675f9bb3d 100644
--- a/src/providers/proxy/proxy_auth.c
+++ b/src/providers/proxy/proxy_auth.c
@@ -167,7 +167,7 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx,
value.type = HASH_VALUE_PTR;
value.ptr = req;
- DEBUG(8, ("Queueing request [%d]\n", key.ul));
+ DEBUG(8, ("Queueing request [%lu]\n", key.ul));
hret = hash_enter(auth_ctx->request_table,
&key, &value);
if (hret != HASH_SUCCESS) {
diff --git a/src/responder/common/responder_dp.c b/src/responder/common/responder_dp.c
index c5e8fc8baecc02a789eba53937d3760c6cb8dde7..e73e1e6b6233ac234bbcb991519fc6842634dde4 100644
--- a/src/responder/common/responder_dp.c
+++ b/src/responder/common/responder_dp.c
@@ -116,7 +116,7 @@ static int sss_dp_req_destructor(void *ptr)
if (hret != HASH_SUCCESS) {
/* This should never happen */
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("BUG: Could not clear [%d:%d:%s] from request queue: [%s]\n",
+ ("BUG: Could not clear [%d:%lu:%s] from request queue: [%s]\n",
sdp_req->key->type, sdp_req->key->ul, sdp_req->key->str,
hash_error_string(hret)));
return -1;
--
1.8.3.1
-------------- next part --------------
>From 1878dd7be6d8fea85d483eb29aa3aa2ac572927a Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 13 Jul 2013 15:46:09 +0200
Subject: [PATCH 04/16] Fix formating of variables with type: int
---
src/providers/ldap/sdap_async_connection.c | 2 +-
src/providers/ldap/sdap_fd_events.c | 2 +-
src/util/sss_ldap.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index e97bcf15e1f43432520ca85fa18d26c630893c0d..cc3e13d097d33dc7c44e1f1fecccd152ceb6cf67 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -294,7 +294,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq)
&ber_sasl_minssf);
if (lret != LDAP_OPT_SUCCESS) {
DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to set LDAP MIN SSF option "
- "to %lu\n", sasl_minssf));
+ "to %d\n", sasl_minssf));
goto fail;
}
}
diff --git a/src/providers/ldap/sdap_fd_events.c b/src/providers/ldap/sdap_fd_events.c
index 190019471c45c30b88425c606d212616e5681779..c9090ad42ffc036d8546e6de15e3b5e32d976b51 100644
--- a/src/providers/ldap/sdap_fd_events.c
+++ b/src/providers/ldap/sdap_fd_events.c
@@ -301,7 +301,7 @@ errno_t sdap_call_conn_cb(const char *uri,int fd, struct sdap_handle *sh)
ret = ldap_url_parse(uri, &lud);
if (ret != 0) {
ber_sockbuf_free(sb);
- DEBUG(1, ("ldap_url_parse failed to validate [%s] on fd [%ld].\n",
+ DEBUG(1, ("ldap_url_parse failed to validate [%s] on fd [%d].\n",
uri, fd));
return EFAULT;
}
diff --git a/src/util/sss_ldap.c b/src/util/sss_ldap.c
index dea38eaa98e073a6d70918b8b32cd08b4a7eee05..86e2e2436c7333953661c1ee15a0972f1ab6f54b 100644
--- a/src/util/sss_ldap.c
+++ b/src/util/sss_ldap.c
@@ -420,7 +420,7 @@ static void sss_ldap_init_sys_connect_done(struct tevent_req *subreq)
lret = ldap_init_fd(state->sd, LDAP_PROTO_TCP, state->uri, &state->ldap);
if (lret != LDAP_SUCCESS) {
- DEBUG(1, ("ldap_init_fd failed: %s. [%ld][%s]\n",
+ DEBUG(1, ("ldap_init_fd failed: %s. [%d][%s]\n",
sss_ldap_err2string(lret), state->sd, state->uri));
ret = lret == LDAP_SERVER_DOWN ? ETIMEDOUT : EIO;
goto fail;
--
1.8.3.1
-------------- next part --------------
>From af7dfd3776cc8ef322dab51405d434d28623f6fe Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 13 Jul 2013 16:29:59 +0200
Subject: [PATCH 05/16] Fix pointer formatting
---
src/sbus/sssd_dbus_connection.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sbus/sssd_dbus_connection.c b/src/sbus/sssd_dbus_connection.c
index 9077b81c13b826326c616402e9ecfe0f924012de..95f32b3ec7e42af955d922aeb070092988b50dc5 100644
--- a/src/sbus/sssd_dbus_connection.c
+++ b/src/sbus/sssd_dbus_connection.c
@@ -54,7 +54,7 @@ static void sbus_dispatch(struct tevent_context *ev,
conn = talloc_get_type(data, struct sbus_connection);
dbus_conn = conn->dbus.conn;
- DEBUG(9, ("dbus conn: %lX\n", dbus_conn));
+ DEBUG(9, ("dbus conn: %p\n", dbus_conn));
if (conn->retries > 0) {
DEBUG(6, ("SBUS is reconnecting. Deferring.\n"));
@@ -162,7 +162,7 @@ int sbus_init_connection(TALLOC_CTX *ctx,
struct sbus_connection *conn;
int ret;
- DEBUG(5,("Adding connection %lX\n", dbus_conn));
+ DEBUG(5,("Adding connection %p\n", dbus_conn));
conn = talloc_zero(ctx, struct sbus_connection);
conn->ev = ev;
@@ -296,7 +296,7 @@ int sbus_default_connection_destructor(void *ctx)
struct sbus_connection *conn;
conn = talloc_get_type(ctx, struct sbus_connection);
- DEBUG(5, ("Invoking default destructor on connection %lX\n",
+ DEBUG(5, ("Invoking default destructor on connection %p\n",
conn->dbus.conn));
if (conn->connection_type == SBUS_CONN_TYPE_PRIVATE) {
/* Private connections must be closed explicitly */
@@ -334,7 +334,7 @@ void sbus_disconnect (struct sbus_connection *conn)
return;
}
- DEBUG(5,("Disconnecting %lX\n", conn->dbus.conn));
+ DEBUG(5,("Disconnecting %p\n", conn->dbus.conn));
/*******************************
* Referencing conn->dbus.conn */
@@ -374,7 +374,7 @@ void sbus_disconnect (struct sbus_connection *conn)
/* Unreferenced conn->dbus_conn *
******************************/
- DEBUG(5,("Disconnected %lX\n", conn->dbus.conn));
+ DEBUG(5,("Disconnected %p\n", conn->dbus.conn));
}
static int sbus_reply_internal_error(DBusMessage *message,
--
1.8.3.1
-------------- next part --------------
>From 31d892d494d81eda08ed96b399b00e3cbdd35dcf Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 13 Jul 2013 15:34:00 +0200
Subject: [PATCH 06/16] Use the same variable type like in struct
ldb_message_element
struct ldb_message_element.num_values is unsigned
---
src/providers/ldap/sdap_async_groups.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index c3b5914a68713f052792be4f6ddad23e18a820a3..423d9de405c8da2005059001d7f2609c37c5e219 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -1066,7 +1066,7 @@ done:
static int
sdap_process_missing_member_2307bis(struct tevent_req *req,
char *user_dn,
- int num_users)
+ unsigned num_users)
{
struct sdap_process_group_state *grp_state =
tevent_req_data(req, struct sdap_process_group_state);
--
1.8.3.1
-------------- next part --------------
>From ed29eed2293702ec03c064b5ee0393c821bbecad Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 13:00:49 +0200
Subject: [PATCH 07/16] Fix formating of variables with type: ssize_t
---
src/providers/ipa/ipa_selinux.c | 4 ++--
src/providers/krb5/krb5_child_handler.c | 2 +-
src/providers/krb5/krb5_common.c | 4 ++--
src/tools/files.c | 2 +-
src/util/backup_file.c | 2 +-
src/util/child_common.c | 3 ++-
src/util/server.c | 4 ++--
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
index 39bebebfd8f4880c4093dfd922f2dfaa79c38a2e..5f734338b8fb43d6d99ba9adcb25c655f8cb1951 100644
--- a/src/providers/ipa/ipa_selinux.c
+++ b/src/providers/ipa/ipa_selinux.c
@@ -672,7 +672,7 @@ static errno_t write_selinux_login_file(const char *username, char *string)
char *path = NULL;
char *tmp_path = NULL;
ssize_t written;
- int len;
+ size_t len;
int fd = -1;
mode_t oldmask;
TALLOC_CTX *tmp_ctx;
@@ -743,7 +743,7 @@ static errno_t write_selinux_login_file(const char *username, char *string)
}
if (written != len) {
- DEBUG(SSSDBG_OP_FAILURE, ("Expected to write %d bytes, wrote %d",
+ DEBUG(SSSDBG_OP_FAILURE, ("Expected to write %zd bytes, wrote %zu",
written, len));
ret = EIO;
goto done;
diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c
index 8117d1e5db01cfe0684ee4d7f3e4acf8ff1e4768..20b83d1372fdf0026b36a4b9877673d3dce25ddd 100644
--- a/src/providers/krb5/krb5_child_handler.c
+++ b/src/providers/krb5/krb5_child_handler.c
@@ -538,7 +538,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len,
msg_status, msg_type, msg_len));
if ((p + msg_len) > len) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%d].\n",
+ DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%zd].\n",
p+msg_len, len));
return EINVAL;
}
diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c
index d2afbef9f96e8f7eac2970ef00febc28103e5cf7..55908f9703e1cd961882823da97c292aa46e964d 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -313,7 +313,7 @@ errno_t write_krb5info_file(const char *realm, const char *server,
char *krb5info_name = NULL;
TALLOC_CTX *tmp_ctx = NULL;
const char *name_tmpl = NULL;
- int server_len;
+ size_t server_len;
ssize_t written;
mode_t old_umask;
@@ -374,7 +374,7 @@ errno_t write_krb5info_file(const char *realm, const char *server,
if (written != server_len) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Write error, wrote [%d] bytes, expected [%d]\n",
+ ("Write error, wrote [%zd] bytes, expected [%zu]\n",
written, server_len));
ret = EIO;
goto done;
diff --git a/src/tools/files.c b/src/tools/files.c
index ff04d09f8ba14802098b8177dc7c905fa75f4e80..7fc8422817f0cb4365da6404b7eb15c6e3bfb253 100644
--- a/src/tools/files.c
+++ b/src/tools/files.c
@@ -408,7 +408,7 @@ copy_file(int ifd,
if (written != cnt) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Wrote %d bytes, expected %d\n", written, cnt));
+ ("Wrote %zd bytes, expected %zd\n", written, cnt));
goto done;
}
}
diff --git a/src/util/backup_file.c b/src/util/backup_file.c
index edbf868cb8f68ca534c257a6dfc761dc9fd025f2..316c1cfe8023c90b3ceb4d6a514754999f87c45b 100644
--- a/src/util/backup_file.c
+++ b/src/util/backup_file.c
@@ -103,7 +103,7 @@ int backup_file(const char *src_file, int dbglvl)
}
if (written != numread) {
- DEBUG(dbglvl, ("Wrote %d bytes expected %d bytes\n",
+ DEBUG(dbglvl, ("Wrote %zd bytes expected %zd bytes\n",
written, numread));
ret = EIO;
goto done;
diff --git a/src/util/child_common.c b/src/util/child_common.c
index ec2baf0192cf46cda72b596a4def0ceb77880005..d1b2bee3ed3f958f950c1bbbca35af8515c5c7f2 100644
--- a/src/util/child_common.c
+++ b/src/util/child_common.c
@@ -484,7 +484,8 @@ static void read_pipe_handler(struct tevent_context *ev,
return;
} else {
- DEBUG(1, ("unexpected return value of read [%d].\n", size));
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ ("unexpected return value of read [%zd].\n", size));
tevent_req_error(req, EINVAL);
return;
}
diff --git a/src/util/server.c b/src/util/server.c
index 9d3c9cb04dcac2f823982c31cac832fb473b720c..a33207b3da8a713d90dbd840475ecdb75f1fff0c 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -147,7 +147,7 @@ int pidfile(const char *path, const char *name)
int fd;
int ret, err;
ssize_t len;
- ssize_t size;
+ size_t size;
ssize_t written;
ssize_t pidlen = sizeof(pid_str) - 1;
@@ -227,7 +227,7 @@ int pidfile(const char *path, const char *name)
if (written != size) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Wrote %d bytes expected %d\n", written, size));
+ ("Wrote %zd bytes expected %zu\n", written, size));
close(fd);
return EIO;
}
--
1.8.3.1
-------------- next part --------------
>From d188654f1da847cea64afd63b4c952a6ae160f87 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 12:41:33 +0200
Subject: [PATCH 08/16] Fix formating of variables with type: size_t
---
src/db/sysdb_autofs.c | 2 +-
src/db/sysdb_ops.c | 2 +-
src/db/sysdb_search.c | 2 +-
src/providers/ad/ad_srv.c | 4 ++--
src/providers/fail_over_srv.c | 2 +-
src/providers/ipa/ipa_config.c | 2 +-
src/providers/ipa/ipa_idmap.c | 2 +-
src/providers/ipa/ipa_netgroups.c | 6 ++++--
src/providers/ipa/ipa_selinux.c | 4 ++--
src/providers/ipa/ipa_selinux_maps.c | 4 ++--
src/providers/ipa/ipa_srv.c | 2 +-
src/providers/krb5/krb5_child.c | 6 +++---
src/providers/krb5/krb5_child_handler.c | 2 +-
src/providers/krb5/krb5_renew_tgt.c | 3 ++-
src/providers/ldap/ldap_child.c | 6 +++---
src/providers/ldap/ldap_id_cleanup.c | 4 ++--
src/providers/ldap/sdap_access.c | 6 +++---
src/providers/ldap/sdap_async_autofs.c | 8 ++++----
src/providers/ldap/sdap_async_groups.c | 16 +++++++++-------
src/providers/ldap/sdap_async_groups_ad.c | 2 +-
src/providers/ldap/sdap_async_initgroups.c | 17 ++++++++++-------
src/providers/ldap/sdap_async_initgroups_ad.c | 2 +-
src/providers/ldap/sdap_async_nested_groups.c | 2 +-
src/providers/ldap/sdap_async_netgroups.c | 10 ++++++----
src/providers/ldap/sdap_async_services.c | 8 ++++----
src/providers/ldap/sdap_async_sudo.c | 2 +-
src/providers/ldap/sdap_async_users.c | 5 +++--
src/providers/ldap/sdap_child_helpers.c | 2 +-
src/providers/simple/simple_access_check.c | 4 ++--
src/responder/nss/nsssrv_mmap_cache.c | 2 +-
src/responder/pam/pamsrv_cmd.c | 2 +-
src/util/child_common.c | 2 +-
32 files changed, 77 insertions(+), 66 deletions(-)
diff --git a/src/db/sysdb_autofs.c b/src/db/sysdb_autofs.c
index cc44c350b744fc01f3a081c4a3de57b879a2693a..cb9685623c34ca4330b6e0278a3e7a4300f6b26d 100644
--- a/src/db/sysdb_autofs.c
+++ b/src/db/sysdb_autofs.c
@@ -407,7 +407,7 @@ sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx,
*_count = count;
*_entries = talloc_steal(mem_ctx, msgs);
ret = EOK;
- DEBUG(SSSDBG_TRACE_INTERNAL, ("found %d entries for map %s\n",
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("found %zu entries for map %s\n",
count, mapname));
done:
talloc_free(tmp_ctx);
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index ff8fb0085d356e5e4ca0062885284a998dfcdb0b..0cb63b38e055141d48fc88bb0309bcf8b8cbd1d1 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -175,7 +175,7 @@ int sysdb_delete_recursive(struct sysdb_ctx *sysdb,
goto done;
}
- DEBUG(9, ("Found [%d] items to delete.\n", msgs_count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Found [%zu] items to delete.\n", msgs_count));
qsort(msgs, msgs_count,
sizeof(struct ldb_message *), compare_ldb_dn_comp_num);
diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c
index d70d0cc3eee6fe5fa55bee6a36d4e8382d69c3ab..8dfaf1f2ada22db5e70ebe18bee1ee299e4767dd 100644
--- a/src/db/sysdb_search.c
+++ b/src/db/sysdb_search.c
@@ -972,7 +972,7 @@ errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx,
}
direct_parents[pi] = NULL;
- DEBUG(7, ("%s is a member of %d sysdb groups\n",
+ DEBUG(SSSDBG_TRACE_LIBS, ("%s is a member of %zu sysdb groups\n",
name, direct_sysdb_count));
*_direct_parents = talloc_steal(mem_ctx, direct_parents);
ret = EOK;
diff --git a/src/providers/ad/ad_srv.c b/src/providers/ad/ad_srv.c
index 861ae3dbd3dba9ea00449b6d1dd1a02baa094917..bd0213e667d3355f5b0b77599eb9c78f5bdbc6ab 100644
--- a/src/providers/ad/ad_srv.c
+++ b/src/providers/ad/ad_srv.c
@@ -113,7 +113,7 @@ static void ad_get_dc_servers_done(struct tevent_req *subreq)
goto done;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Found %lu domain controllers in domain %s\n",
+ DEBUG(SSSDBG_TRACE_FUNC, ("Found %zu domain controllers in domain %s\n",
state->num_servers, domain));
done:
@@ -759,7 +759,7 @@ static void ad_srv_plugin_servers_done(struct tevent_req *subreq)
return;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu primary and %lu backup servers\n",
+ DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu primary and %zu backup servers\n",
state->num_primary_servers, state->num_backup_servers));
tevent_req_done(req);
diff --git a/src/providers/fail_over_srv.c b/src/providers/fail_over_srv.c
index 78cd6cc4593fbdec89062d1f109ccbcb38d7314a..d04fcbffa8483ef7ed23ce6cc81c005a850e9369 100644
--- a/src/providers/fail_over_srv.c
+++ b/src/providers/fail_over_srv.c
@@ -110,7 +110,7 @@ static void fo_discover_srv_done(struct tevent_req *subreq)
state->num_servers++;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu servers\n", state->num_servers));
+ DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu servers\n", state->num_servers));
state->servers = talloc_array(state, struct fo_server_info,
state->num_servers);
diff --git a/src/providers/ipa/ipa_config.c b/src/providers/ipa/ipa_config.c
index 05231cc763c28c2867688530a6d4c17d2fd30933..0b392f5129ce895af2c0ca88286981a79cc5f4bc 100644
--- a/src/providers/ipa/ipa_config.c
+++ b/src/providers/ipa/ipa_config.c
@@ -125,7 +125,7 @@ static void ipa_get_config_done(struct tevent_req *subreq)
if (reply_count != 1) {
DEBUG(SSSDBG_OP_FAILURE, ("Unexpected number of results, expected 1, "
- "got %d.\n", reply_count));
+ "got %zu.\n", reply_count));
ret = EINVAL;
goto done;
}
diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c
index c108ca75b84005c3d5957cd45ca89209d59f59ff..69ab55c92fcd274836b36d68ec08ac3b67b53685 100644
--- a/src/providers/ipa/ipa_idmap.c
+++ b/src/providers/ipa/ipa_idmap.c
@@ -194,7 +194,7 @@ errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx,
}
DEBUG(SSSDBG_CONF_SETTINGS,
- ("Initializing [%d] domains for ID-mapping\n", range_count));
+ ("Initializing [%zu] domains for ID-mapping\n", range_count));
for (c = 0; c < range_count; c++) {
diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c
index 0f36fc9f542f7b58ebb45664edc0e964ad2f92ff..0deb3944ef93ae1c1175f9e1c5526274cc849986 100644
--- a/src/providers/ipa/ipa_netgroups.c
+++ b/src/providers/ipa/ipa_netgroups.c
@@ -315,7 +315,8 @@ static void ipa_get_netgroups_process(struct tevent_req *subreq)
goto done;
}
- DEBUG(6, ("Search for netgroups, returned %d results.\n", netgroups_count));
+ DEBUG(SSSDBG_TRACE_FUNC, ("Search for netgroups, returned %zu results.\n",
+ netgroups_count));
if (netgroups_count == 0) {
/* No netgroups found in this search */
@@ -575,7 +576,8 @@ static void ipa_netgr_members_process(struct tevent_req *subreq)
goto fail;
}
- DEBUG(SSSDBG_TRACE_INTERNAL, ("Found %u members in current search base\n", count));
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("Found %zu members in current search base\n",
+ count));
next_call = NULL;
/* While processing a batch of entities from one search base,
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
index 5f734338b8fb43d6d99ba9adcb25c655f8cb1951..c227db937a84228c0f3945dbe11ba904c7ad9744 100644
--- a/src/providers/ipa/ipa_selinux.c
+++ b/src/providers/ipa/ipa_selinux.c
@@ -1163,7 +1163,7 @@ static void ipa_get_selinux_maps_done(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_FUNC,
- ("Found %d SELinux user maps\n", state->nmaps));
+ ("Found %zu SELinux user maps\n", state->nmaps));
check_hbac = false;
for (i = 0; i < state->nmaps; i++) {
@@ -1222,7 +1222,7 @@ static void ipa_get_selinux_hbac_done(struct tevent_req *subreq)
ret = ipa_hbac_rule_info_recv(subreq, state, &state->hbac_rule_count,
&state->hbac_rules);
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("Received %d HBAC rules\n", state->hbac_rule_count));
+ ("Received %zu HBAC rules\n", state->hbac_rule_count));
talloc_free(subreq);
if (ret != EOK) {
diff --git a/src/providers/ipa/ipa_selinux_maps.c b/src/providers/ipa/ipa_selinux_maps.c
index b0a2c8f727be2af0a4eb878f4b5b56a7b0ef11bd..1a210689b17b674158420c48ead7e9011cc35764 100644
--- a/src/providers/ipa/ipa_selinux_maps.c
+++ b/src/providers/ipa/ipa_selinux_maps.c
@@ -165,8 +165,8 @@ static void ipa_selinux_get_maps_done(struct tevent_req *subreq)
}
if (count > 0) {
- DEBUG(SSSDBG_TRACE_FUNC, ("Found %d user maps in current search base\n",
- count));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Found %zu user maps in current search base\n", count));
total_count = count + state->map_count;
state->maps = talloc_realloc(state, state->maps, struct sysdb_attrs *, total_count);
diff --git a/src/providers/ipa/ipa_srv.c b/src/providers/ipa/ipa_srv.c
index 9b1c39945aac422360467a8291d6d138f0b64062..12c7cbcbbd35499ba2a25c8f97dda554f9f74764 100644
--- a/src/providers/ipa/ipa_srv.c
+++ b/src/providers/ipa/ipa_srv.c
@@ -173,7 +173,7 @@ static void ipa_srv_plugin_done(struct tevent_req *subreq)
return;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu primary and %lu backup servers\n",
+ DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu primary and %zu backup servers\n",
state->num_primary_servers, state->num_backup_servers));
tevent_req_done(req);
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 7314dc46eec36ca9b7c194c3e4db0112c1669458..8684ab6dc0963b2bf65016b76dfa10f88d7c60b9 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -844,7 +844,7 @@ static errno_t pack_response_packet(TALLOC_CTX *mem_ctx, errno_t error,
safealign_memcpy(&buf[p], pdr->data, pdr->len, &p);
}
- DEBUG(SSSDBG_TRACE_INTERNAL, ("response packet size: [%d]\n", p));
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("response packet size: [%zu]\n", p));
*_buf = buf;
*_len = p;
@@ -898,7 +898,7 @@ static errno_t k5c_send_data(struct krb5_req *kr, int fd, errno_t error)
if (written != len) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Write error, wrote [%d] bytes, expected [%d]\n",
+ ("Write error, wrote [%zu] bytes, expected [%zu]\n",
written, len));
return EOK;
}
@@ -1645,7 +1645,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size,
struct pam_data *pd;
errno_t ret;
- DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: [%d]\n", size));
+ DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: [%zu]\n", size));
if (!offline || !kr) return EINVAL;
diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c
index 20b83d1372fdf0026b36a4b9877673d3dce25ddd..9aa5c346acde17e1ea74d7a2ab231a6a9eebdb94 100644
--- a/src/providers/krb5/krb5_child_handler.c
+++ b/src/providers/krb5/krb5_child_handler.c
@@ -538,7 +538,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len,
msg_status, msg_type, msg_len));
if ((p + msg_len) > len) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%zd].\n",
+ DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%zu] > [%zd].\n",
p+msg_len, len));
return EINVAL;
}
diff --git a/src/providers/krb5/krb5_renew_tgt.c b/src/providers/krb5/krb5_renew_tgt.c
index d6cdff8f8c0efc98445363c0a12a7ec19d12477f..9102f8ca37668abbcef99b78e8c042ebab32025f 100644
--- a/src/providers/krb5/krb5_renew_tgt.c
+++ b/src/providers/krb5/krb5_renew_tgt.c
@@ -412,7 +412,8 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx)
ret = EOK;
goto done;
}
- DEBUG(9, ("Found [%d] entries with ccache file in cache.\n", msgs_count));
+ DEBUG(SSSDBG_TRACE_ALL,
+ ("Found [%zu] entries with ccache file in cache.\n", msgs_count));
for (c = 0; c < msgs_count; c++) {
user_name = ldb_msg_find_attr_as_string(msgs[c], SYSDB_NAME, NULL);
diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c
index 9d82e7cf7c7a556c0e9f124c60a90170e21135b3..19c838dacc10bfa0428d96e2d8497d4b25b07079 100644
--- a/src/providers/ldap/ldap_child.c
+++ b/src/providers/ldap/ldap_child.c
@@ -57,7 +57,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size,
size_t p = 0;
uint32_t len;
- DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: %d\n", size));
+ DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: %zu\n", size));
/* realm_str size and length */
SAFEALIGN_COPY_UINT32_CHECK(&len, buf + p, size, &p);
@@ -112,7 +112,7 @@ static int pack_buffer(struct response *r, int result, krb5_error_code krberr,
r->size = 2 * sizeof(uint32_t) + sizeof(krb5_error_code) +
len + sizeof(time_t);
- DEBUG(SSSDBG_TRACE_INTERNAL, ("response size: %d\n",r->size));
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("response size: %zu\n",r->size));
r->buf = talloc_array(r, uint8_t, r->size);
if(!r->buf) {
@@ -540,7 +540,7 @@ int main(int argc, const char *argv[])
}
if (written != resp->size) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("Expected to write %d bytes, wrote %d\n",
+ DEBUG(SSSDBG_CRIT_FAILURE, ("Expected to write %zu bytes, wrote %zu\n",
resp->size, written));
goto fail;
}
diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c
index 534e2ee015d157a26798c5b14fdd3e8d9a156b63..241940b45b9bfda062c4d6b95010e425c3baaf0e 100644
--- a/src/providers/ldap/ldap_id_cleanup.c
+++ b/src/providers/ldap/ldap_id_cleanup.c
@@ -301,7 +301,7 @@ static int cleanup_users(TALLOC_CTX *memctx, struct sdap_id_ctx *ctx)
goto done;
}
- DEBUG(4, ("Found %d expired user entries!\n", count));
+ DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired user entries!\n", count));
if (count == 0) {
ret = EOK;
@@ -423,7 +423,7 @@ static int cleanup_groups(TALLOC_CTX *memctx,
goto done;
}
- DEBUG(4, ("Found %d expired group entries!\n", count));
+ DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired group entries!\n", count));
if (count == 0) {
ret = EOK;
diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 7a571e3c493d7dfd023409b78d161af2fe34a38d..25c28bfa13cd3b246c967341e986b1bac7b1d87a 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -464,7 +464,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map)
if (time_map->length != 42) {
DEBUG(4, ("Allowed time map has the wrong size, "
- "got [%d], expected 42.\n", time_map->length));
+ "got [%zu], expected 42.\n", time_map->length));
return true;
}
@@ -476,7 +476,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map)
if (map_index > 335) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Unexpected index value [%d] for time map.\n", map_index));
+ ("Unexpected index value [%zu] for time map.\n", map_index));
return true;
}
@@ -484,7 +484,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map)
if (q.quot > 41 || q.quot < 0 || q.rem > 7 || q.rem < 0) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Unexpected result of div(), [%d][%d][%d].\n",
+ ("Unexpected result of div(), [%zu][%d][%d].\n",
map_index, q.quot, q.rem));
return true;
}
diff --git a/src/providers/ldap/sdap_async_autofs.c b/src/providers/ldap/sdap_async_autofs.c
index ae70e703564acebaa1ca9adfb2395ca1c06fd802..4886150f92ec08ee82f9736a7b0cfd52bea7ff91 100644
--- a/src/providers/ldap/sdap_async_autofs.c
+++ b/src/providers/ldap/sdap_async_autofs.c
@@ -394,7 +394,7 @@ automntmaps_process_members_done(struct tevent_req *subreq)
DEBUG(SSSDBG_TRACE_INTERNAL, ("No more search bases to try\n"));
DEBUG(SSSDBG_TRACE_FUNC,
- ("Search for autofs entries, returned %d results.\n",
+ ("Search for autofs entries, returned %zu results.\n",
state->entries_count));
tevent_req_done(req);
@@ -549,7 +549,7 @@ sdap_get_automntmap_process(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_FUNC,
- ("Search for autofs maps, returned %d results.\n", state->count));
+ ("Search for autofs maps, returned %zu results.\n", state->count));
if (state->count == 0) {
/* No maps found in this search */
@@ -801,7 +801,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
if (!tmp_ctx) return ENOMEM;
DEBUG(SSSDBG_TRACE_LIBS,
- ("Got %d map entries from LDAP\n", state->entries_count));
+ ("Got %zu map entries from LDAP\n", state->entries_count));
if (state->entries_count == 0) {
/* No entries for this map in LDAP.
* We need to ensure that there are no entries
@@ -866,7 +866,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
goto done;
}
- DEBUG(SSSDBG_TRACE_LIBS, ("Got %d map entries from sysdb\n", count));
+ DEBUG(SSSDBG_TRACE_LIBS, ("Got %zu map entries from sysdb\n", count));
if (count == 0) {
/* No map members for this map in sysdb currently */
sysdb_entrylist = NULL;
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index 423d9de405c8da2005059001d7f2609c37c5e219..a8e7a6c5618a8876e8e375e6748c4845de4f676e 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -377,7 +377,7 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs,
ghostel->num_values = gh->num_values;
cnt = ghostel->num_values + memberel->num_values;
- DEBUG(SSSDBG_TRACE_FUNC, ("Group has %d members\n", cnt));
+ DEBUG(SSSDBG_TRACE_FUNC, ("Group has %zu members\n", cnt));
/* Now process RFC2307bis ghost hash table */
if (ghosts && cnt > 0) {
@@ -1082,7 +1082,7 @@ sdap_process_missing_member_2307bis(struct tevent_req *req,
if (grp_state->check_count > GROUPMEMBER_REQ_PARALLEL) {
DEBUG(7, (" queueing search for: %s\n", user_dn));
if (!grp_state->queued_members) {
- DEBUG(7, ("Allocating queue for %d members\n",
+ DEBUG(7, ("Allocating queue for %zu members\n",
num_users - grp_state->check_count));
grp_state->queued_members = talloc_array(grp_state, char *,
@@ -1359,7 +1359,7 @@ static void sdap_process_group_members(struct tevent_req *subreq)
uint8_t* name_string;
state->check_count--;
- DEBUG(9, ("Members remaining: %d\n", state->check_count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Members remaining: %zu\n", state->check_count));
ret = sdap_get_generic_recv(subreq, state, &count, &usr_attrs);
talloc_zfree(subreq);
@@ -1368,7 +1368,8 @@ static void sdap_process_group_members(struct tevent_req *subreq)
}
if (count != 1) {
ret = EINVAL;
- DEBUG(7, ("Expected one user entry and got %d\n", count));
+ DEBUG(SSSDBG_TRACE_LIBS,
+ ("Expected one user entry and got %zu\n", count));
goto next;
}
ret = sysdb_attrs_get_el(usr_attrs[0],
@@ -1594,7 +1595,8 @@ static void sdap_get_groups_process(struct tevent_req *subreq)
return;
}
- DEBUG(6, ("Search for groups, returned %d results.\n", count));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Search for groups, returned %zu results.\n", count));
if (!state->enumeration && count > 1) {
DEBUG(SSSDBG_MINOR_FAILURE,
@@ -1757,7 +1759,7 @@ static void sdap_get_groups_done(struct tevent_req *subreq)
}
state->check_count--;
- DEBUG(9, ("Groups remaining: %d\n", state->check_count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Groups remaining: %zu\n", state->check_count));
if (state->check_count == 0) {
@@ -1775,7 +1777,7 @@ static void sdap_get_groups_done(struct tevent_req *subreq)
tevent_req_error(req, ret);
return;
}
- DEBUG(9, ("Saving %d Groups - Done\n", state->count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Groups - Done\n", state->count));
sysret = sysdb_transaction_commit(state->sysdb);
if (sysret != EOK) {
DEBUG(0, ("Couldn't commit transaction\n"));
diff --git a/src/providers/ldap/sdap_async_groups_ad.c b/src/providers/ldap/sdap_async_groups_ad.c
index 1268f7e7de30849d1948265e50a327501982749d..9b61c697d5789c3ec3467ec52a7171f6a640ce9e 100644
--- a/src/providers/ldap/sdap_async_groups_ad.c
+++ b/src/providers/ldap/sdap_async_groups_ad.c
@@ -189,7 +189,7 @@ sdap_get_ad_match_rule_members_step(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Search for users returned %d results\n", count));
+ ("Search for users returned %zu results\n", count));
/* Add this batch of users to the list */
if (count > 0) {
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index 4c379fdfd0d9decb7ed61356160183d56640e7b4..941960b90ed65148e392da390ac4598c50e0b1ee 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -934,8 +934,9 @@ static void sdap_initgr_nested_search(struct tevent_req *subreq)
groups[0]);
state->groups_cur++;
} else {
- DEBUG(2, ("Search for group %s, returned %d results. Skipping\n",
- state->group_dns[state->cur], count));
+ DEBUG(SSSDBG_OP_FAILURE,
+ ("Search for group %s, returned %zu results. Skipping\n",
+ state->group_dns[state->cur], count));
}
state->cur++;
@@ -1601,7 +1602,7 @@ static void sdap_initgr_rfc2307bis_process(struct tevent_req *subreq)
return;
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Found %d parent groups for user [%s]\n", count, state->name));
+ ("Found %zu parent groups for user [%s]\n", count, state->name));
/* Add this batch of groups to the list */
if (count > 0) {
@@ -2094,7 +2095,8 @@ struct tevent_req *rfc2307bis_nested_groups_send(
struct sdap_rfc2307bis_nested_ctx *state;
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("About to process %d groups in nesting level %d\n", num_groups, nesting));
+ ("About to process %zu groups in nesting level %zu\n",
+ num_groups, nesting));
req = tevent_req_create(mem_ctx, &state,
struct sdap_rfc2307bis_nested_ctx);
@@ -2344,7 +2346,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Found %d parent groups of [%s]\n", count, state->orig_dn));
+ ("Found %zu parent groups of [%s]\n", count, state->orig_dn));
ngr = state->processed_groups[state->group_iter];
/* Add this batch of groups to the list */
@@ -2373,7 +2375,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq)
ngr->ldap_parents[ngr->parents_count] = NULL;
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("Total of %d direct parents after this iteration\n",
+ ("Total of %zu direct parents after this iteration\n",
ngr->parents_count));
}
@@ -2695,7 +2697,8 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
return;
}
} else if (count != 1) {
- DEBUG(2, ("Expected one user entry and got %d\n", count));
+ DEBUG(SSSDBG_OP_FAILURE,
+ ("Expected one user entry and got %zu\n", count));
tevent_req_error(req, EINVAL);
return;
}
diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c
index 89789204a0273d0fd34565104cee38d89bf6436b..daf581298b167cc879d8115523828a0695dc8f7a 100644
--- a/src/providers/ldap/sdap_async_initgroups_ad.c
+++ b/src/providers/ldap/sdap_async_initgroups_ad.c
@@ -212,7 +212,7 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Search for users returned %d results\n", count));
+ ("Search for users returned %zu results\n", count));
/* Add this batch of groups to the list */
if (count > 0) {
diff --git a/src/providers/ldap/sdap_async_nested_groups.c b/src/providers/ldap/sdap_async_nested_groups.c
index 613e44ff5a505ebf025e5c5189ff238ea1243626..d136d1def44caef6efc39fb756f27adb1155307a 100644
--- a/src/providers/ldap/sdap_async_nested_groups.c
+++ b/src/providers/ldap/sdap_async_nested_groups.c
@@ -2036,7 +2036,7 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq)
goto done;
}
- DEBUG(SSSDBG_TRACE_INTERNAL, ("Received %d dereference results, "
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("Received %zu dereference results, "
"about to process them\n", num_entries));
/*
diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c
index 265fcf0ea8d3ac3a743433ce234a5faf8a673c61..46ea980677234c682bd48c371b62b90a2666ab87 100644
--- a/src/providers/ldap/sdap_async_netgroups.c
+++ b/src/providers/ldap/sdap_async_netgroups.c
@@ -490,8 +490,9 @@ static void netgr_translate_members_ldap_done(struct tevent_req *subreq)
}
break;
default:
- DEBUG(1, ("Unexpected number of results [%d] for base search.\n",
- count));
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ ("Unexpected number of results [%zu] for base search.\n",
+ count));
}
if (state->dn_item->cn == NULL) {
@@ -659,7 +660,8 @@ static void sdap_get_netgroups_process(struct tevent_req *subreq)
return;
}
- DEBUG(6, ("Search for netgroups, returned %d results.\n", state->count));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Search for netgroups, returned %zu results.\n", state->count));
if (state->count == 0) {
/* No netgroups found in this search */
@@ -723,7 +725,7 @@ static void netgr_translate_members_done(struct tevent_req *subreq)
}
}
- DEBUG(9, ("Saving %d Netgroups - Done\n", state->count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Netgroups - Done\n", state->count));
tevent_req_done(req);
}
diff --git a/src/providers/ldap/sdap_async_services.c b/src/providers/ldap/sdap_async_services.c
index d637d22e59a68a0957ce01f92ddb99ee8d111f5f..c4245f0574200bca5d3c5770eeefb5b03445393c 100644
--- a/src/providers/ldap/sdap_async_services.c
+++ b/src/providers/ldap/sdap_async_services.c
@@ -177,7 +177,7 @@ sdap_get_services_process(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_FUNC,
- ("Search for services, returned %d results.\n",
+ ("Search for services, returned %zu results.\n",
count));
if (state->enumeration || count == 0) {
@@ -240,7 +240,7 @@ sdap_get_services_process(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("Saving %d services - Done\n", state->count));
+ ("Saving %zu services - Done\n", state->count));
tevent_req_done(req);
}
@@ -292,10 +292,10 @@ sdap_save_services(TALLOC_CTX *mem_ctx,
* Just report the failure to save and go on */
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
- ("Failed to store service %d. Ignoring.\n", i));
+ ("Failed to store service %zu. Ignoring.\n", i));
} else {
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("Service [%lu/%lu] processed!\n", i, num_services));
+ ("Service [%zu/%zu] processed!\n", i, num_services));
}
if (usn_value) {
diff --git a/src/providers/ldap/sdap_async_sudo.c b/src/providers/ldap/sdap_async_sudo.c
index ed4cf75ad5e38df3b955f5fe061a8b188fe89927..0d4882bd119dd4d4d217163f97cad275921adf8d 100644
--- a/src/providers/ldap/sdap_async_sudo.c
+++ b/src/providers/ldap/sdap_async_sudo.c
@@ -477,7 +477,7 @@ static void sdap_sudo_refresh_load_done(struct tevent_req *subreq)
goto done;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Received %d rules\n", rules_count));
+ DEBUG(SSSDBG_TRACE_FUNC, ("Received %zu rules\n", rules_count));
/* start transaction */
ret = sysdb_transaction_start(state->sysdb);
diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index b3a5c3de813fb395aa0ee9e3899b3c7b7f1b08e8..4b82d8f1539ab9986f61622ee896e0340fd707fe 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -689,7 +689,8 @@ static void sdap_get_users_process(struct tevent_req *subreq)
return;
}
- DEBUG(6, ("Search for users, returned %d results.\n", count));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Search for users, returned %zu results.\n", count));
if (state->enumeration || count == 0) {
/* No users found in this search or enumerating */
@@ -750,7 +751,7 @@ static void sdap_get_users_process(struct tevent_req *subreq)
return;
}
- DEBUG(9, ("Saving %d Users - Done\n", state->count));
+ DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Users - Done\n", state->count));
tevent_req_done(req);
}
diff --git a/src/providers/ldap/sdap_child_helpers.c b/src/providers/ldap/sdap_child_helpers.c
index e57313442fec1723e3cbcc186d9720b7e9a6ce89..9aaff785b789139dee033ecf73d1f74917d9a94c 100644
--- a/src/providers/ldap/sdap_child_helpers.c
+++ b/src/providers/ldap/sdap_child_helpers.c
@@ -160,7 +160,7 @@ static errno_t create_tgt_req_send_buffer(TALLOC_CTX *mem_ctx,
buf->size += strlen(keytab_name);
}
- DEBUG(7, ("buffer size: %d\n", buf->size));
+ DEBUG(SSSDBG_TRACE_FUNC, ("buffer size: %zu\n", buf->size));
buf->data = talloc_size(buf, buf->size);
if (buf->data == NULL) {
diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c
index dc5f3676484c3748186cbe69fd4260ee329568a6..7335135ea5dedecdb5ba2be60a57d18eb897a960 100644
--- a/src/providers/simple/simple_access_check.c
+++ b/src/providers/simple/simple_access_check.c
@@ -389,7 +389,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx,
}
DEBUG(SSSDBG_TRACE_FUNC,
- ("User %s is a member of %d supplemental groups\n",
+ ("User %s is a member of %zu supplemental groups\n",
username, group_count));
/* One extra space for terminator, one extra space for private group */
@@ -435,7 +435,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx,
goto done;
}
- DEBUG(SSSDBG_TRACE_FUNC, ("Need to resolve %d groups\n", state->num_gids));
+ DEBUG(SSSDBG_TRACE_FUNC, ("Need to resolve %zu groups\n", state->num_gids));
state->giter = 0;
subreq = simple_resolve_group_send(req, state->ev, state->ctx,
state->lookup_gids[state->giter]);
diff --git a/src/responder/nss/nsssrv_mmap_cache.c b/src/responder/nss/nsssrv_mmap_cache.c
index 49878fcfb91c195fb864c83e1da0163a23dbe5a7..79ab9ce685b754caa4b13e711c9c7dd4cc82e382 100644
--- a/src/responder/nss/nsssrv_mmap_cache.c
+++ b/src/responder/nss/nsssrv_mmap_cache.c
@@ -1016,7 +1016,7 @@ errno_t sss_mmap_cache_init(TALLOC_CTX *mem_ctx, const char *name,
MAP_SHARED, mc_ctx->fd, 0);
if (mc_ctx->mmap_base == MAP_FAILED) {
ret = errno;
- DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to mmap file %s(%ld): %d(%s)\n",
+ DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to mmap file %s(%zu): %d(%s)\n",
mc_ctx->file, mc_ctx->mmap_size,
ret, strerror(ret)));
goto done;
diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c
index bf9a686230e0deb39f7387ed3f51c08f97575007..42a95d442c769c0a82dcbd8f47d2692764ff49dd 100644
--- a/src/responder/pam/pamsrv_cmd.c
+++ b/src/responder/pam/pamsrv_cmd.c
@@ -610,7 +610,7 @@ static void pam_reply(struct pam_auth_req *preq)
}
sss_packet_get_body(cctx->creq->out, &body, &blen);
- DEBUG(4, ("blen: %d\n", blen));
+ DEBUG(SSSDBG_FUNC_DATA, ("blen: %zu\n", blen));
p = 0;
memcpy(&body[p], &pd->pam_status, sizeof(int32_t));
diff --git a/src/util/child_common.c b/src/util/child_common.c
index d1b2bee3ed3f958f950c1bbbca35af8515c5c7f2..c45608d637aa6141b70a6f831392b351c3d09eb7 100644
--- a/src/util/child_common.c
+++ b/src/util/child_common.c
@@ -382,7 +382,7 @@ static void write_pipe_handler(struct tevent_context *ev,
}
if (state->len != state->written) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("Wrote %d bytes, expected %d\n",
+ DEBUG(SSSDBG_CRIT_FAILURE, ("Wrote %zu bytes, expected %zu\n",
state->written, state->len));
tevent_req_error(req, EIO);
return;
--
1.8.3.1
-------------- next part --------------
>From 5d2238061b7fb670046c88936c446b1b2c4b5efc Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 18 Jul 2013 08:52:15 +0200
Subject: [PATCH 09/16] Adding new header for printf formating macros
---
Makefile.am | 1 +
src/util/sss_format.h | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 src/util/sss_format.h
diff --git a/Makefile.am b/Makefile.am
index c846c6d1dc8db41067fd6b31b9a9a64cca2cc440..53b0d25cda6a205c3a069ed89183aa5dab57124b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -393,6 +393,7 @@ dist_noinst_HEADERS = \
src/util/sss_utf8.h \
src/util/sss_ssh.h \
src/util/sss_ini.h \
+ src/util/sss_format.h \
src/util/refcount.h \
src/util/find_uid.h \
src/util/user_info_msg.h \
diff --git a/src/util/sss_format.h b/src/util/sss_format.h
new file mode 100644
index 0000000000000000000000000000000000000000..db1a5051ff99171f84f53f10a1e9bc4726dde843
--- /dev/null
+++ b/src/util/sss_format.h
@@ -0,0 +1,32 @@
+/*
+ SSSD
+
+ sss_format.h
+
+ Authors:
+ Lukas Slebodnik <lslebodn at redhat.com>
+
+ Copyright (C) 2013 Red Hat
+
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __SSS_FORMAT_H__
+#define __SSS_FORMAT_H__
+
+#include <inttypes.h>
+
+#endif /* __SSS_FORMAT_H__ */
--
1.8.3.1
-------------- next part --------------
>From 5b915bc052b6261050782d1bdebc874c5844657d Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 16:40:26 +0200
Subject: [PATCH 10/16] Fix formating of variables with type: key_serial_t
---
src/providers/krb5/krb5_delayed_online_authentication.c | 4 +++-
src/util/sss_format.h | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/providers/krb5/krb5_delayed_online_authentication.c b/src/providers/krb5/krb5_delayed_online_authentication.c
index 87e0f3c631def0d437aa4268e8a3cfcb439be7e0..d7f3dcd59b64e8e959b73d40a95cf4ba1a392514 100644
--- a/src/providers/krb5/krb5_delayed_online_authentication.c
+++ b/src/providers/krb5/krb5_delayed_online_authentication.c
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <keyutils.h>
#endif
+#include "util/sss_format.h"
#include "providers/krb5/krb5_auth.h"
#include "dhash.h"
@@ -279,7 +280,8 @@ errno_t add_user_to_delayed_online_authentication(struct krb5_ctx *krb5_ctx,
talloc_free(new_pd);
return ret;
}
- DEBUG(9, ("Saved authtok of user [%s] with serial [%ld].\n",
+ DEBUG(SSSDBG_TRACE_ALL,
+ ("Saved authtok of user [%s] with serial [%"PRIkey_ser"].\n",
new_pd->user, new_pd->key_serial));
sss_authtok_set_empty(new_pd->authtok);
#endif
diff --git a/src/util/sss_format.h b/src/util/sss_format.h
index db1a5051ff99171f84f53f10a1e9bc4726dde843..c9837a6e9d2f950d6d1f12d7727d43ca4b18f62e 100644
--- a/src/util/sss_format.h
+++ b/src/util/sss_format.h
@@ -29,4 +29,7 @@
#include <inttypes.h>
+/* key_serial_t is defined in keyutils.h as typedef int32_t */
+#define PRIkey_ser PRId32
+
#endif /* __SSS_FORMAT_H__ */
--
1.8.3.1
-------------- next part --------------
>From 4d2fafa40252962eb63a3d49ea111a050d2fa2ec Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 16:18:04 +0200
Subject: [PATCH 11/16] Fix formating of variables with type: rlim_t
---
src/responder/common/responder_common.c | 11 ++++++-----
src/util/sss_format.h | 7 +++++++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 58a92f973114c83a44049fc91f11702bc4e45435..f0524f29c8a11eb492fdb88ff6b834e92c4f8d16 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -43,6 +43,7 @@
#include "providers/data_provider.h"
#include "monitor/monitor_interfaces.h"
#include "sbus/sbus_client.h"
+#include "util/sss_format.h"
static errno_t set_nonblocking(int fd)
{
@@ -999,7 +1000,7 @@ void responder_set_fd_limit(rlim_t fd_limit)
limret = setrlimit(RLIMIT_NOFILE, &new_limit);
if (limret == 0) {
DEBUG(SSSDBG_CONF_SETTINGS,
- ("Maximum file descriptors set to [%d]\n",
+ ("Maximum file descriptors set to [%"PRIrlim"]\n",
new_limit.rlim_cur));
return;
}
@@ -1012,7 +1013,7 @@ void responder_set_fd_limit(rlim_t fd_limit)
limret = getrlimit(RLIMIT_NOFILE, ¤t_limit);
if (limret == 0) {
DEBUG(SSSDBG_TRACE_INTERNAL,
- ("Current fd limit: [%d]\n",
+ ("Current fd limit: [%"PRIrlim"]\n",
current_limit.rlim_cur));
/* Choose the lesser of the requested and the hard limit */
if (current_limit.rlim_max < fd_limit) {
@@ -1025,12 +1026,12 @@ void responder_set_fd_limit(rlim_t fd_limit)
limret = setrlimit(RLIMIT_NOFILE, &new_limit);
if (limret == 0) {
DEBUG(SSSDBG_CONF_SETTINGS,
- ("Maximum file descriptors set to [%d]\n",
+ ("Maximum file descriptors set to [%"PRIrlim"]\n",
new_limit.rlim_cur));
} else {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("Could not set new fd limits. Proceeding with [%d]\n",
- current_limit.rlim_cur));
+ ("Could not set new fd limits. Proceeding with "
+ "[%"PRIrlim"]\n", current_limit.rlim_cur));
}
} else {
DEBUG(SSSDBG_CRIT_FAILURE,
diff --git a/src/util/sss_format.h b/src/util/sss_format.h
index c9837a6e9d2f950d6d1f12d7727d43ca4b18f62e..67194393be0d4401f3bd2cf1476fedff23b5f727 100644
--- a/src/util/sss_format.h
+++ b/src/util/sss_format.h
@@ -32,4 +32,11 @@
/* key_serial_t is defined in keyutils.h as typedef int32_t */
#define PRIkey_ser PRId32
+/* rlim_t is defined with conditional build as unsigned type.
+ * It seems that sizeof(rlim_t) is 8. It may be platform dependent, therefore
+ * the same format will be used like with uint64_t.
+ */
+
+#define PRIrlim PRIu64
+
#endif /* __SSS_FORMAT_H__ */
--
1.8.3.1
-------------- next part --------------
>From 8d2175c28d66d5712e7632db4bc7461c9808f8af Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 14:03:41 +0200
Subject: [PATCH 12/16] Fix formating of variables with type defined in
stdint.h
---
src/providers/ldap/sdap_access.c | 6 ++++--
src/providers/ldap/sdap_reinit.c | 6 ++++--
src/providers/proxy/proxy_child.c | 5 +++--
src/providers/proxy/proxy_init.c | 3 ++-
src/responder/nss/nsssrv_services.c | 14 ++++++++------
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 25c28bfa13cd3b246c967341e986b1bac7b1d87a..0be1179f79a950018a0dd8682b1488a93dea479a 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -32,6 +32,7 @@
#include <errno.h>
#include "util/util.h"
+#include "util/sss_format.h"
#include "db/sysdb.h"
#include "providers/ldap/ldap_common.h"
#include "providers/ldap/sdap.h"
@@ -338,8 +339,9 @@ static errno_t sdap_account_expired_ad(struct pam_data *pd,
expiration_time = ldb_msg_find_attr_as_uint64(user_entry,
SYSDB_AD_ACCOUNT_EXPIRES, 0);
- DEBUG(9, ("Expiration time for user [%s] is [%lld].\n",
- pd->user, expiration_time));
+ DEBUG(SSSDBG_TRACE_ALL,
+ ("Expiration time for user [%s] is [%"PRIu64"].\n",
+ pd->user, expiration_time));
if (uac & UAC_ACCOUNTDISABLE) {
diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c
index b273c1a66cca5e78ab3c281c684feab93f476471..2f4aa0c651a3261b173a60b16dcb7a795967cc3c 100644
--- a/src/providers/ldap/sdap_reinit.c
+++ b/src/providers/ldap/sdap_reinit.c
@@ -24,6 +24,7 @@
#include <ldb.h>
#include "util/util.h"
+#include "util/sss_format.h"
#include "providers/ldap/ldap_common.h"
#include "db/sysdb.h"
#include "db/sysdb_services.h"
@@ -208,8 +209,9 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq)
if (tevent_req_is_error(subreq, &tstate, &err)) {
ret = err;
- DEBUG(SSSDBG_CRIT_FAILURE, ("Domain enumeration failed [%d]: %s\n",
- err, strerror(err)));
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ ("Domain enumeration failed [%"PRIu64"d]: %s\n",
+ err, strerror(err)));
goto fail;
}
diff --git a/src/providers/proxy/proxy_child.c b/src/providers/proxy/proxy_child.c
index efdf9120a8ec529283aa3f2c6cacd98d659a6ef7..5d34fc0800ca017f685e66931b89b5e895ac97b5 100644
--- a/src/providers/proxy/proxy_child.c
+++ b/src/providers/proxy/proxy_child.c
@@ -40,6 +40,7 @@
#include "popt.h"
#include "util/util.h"
+#include "util/sss_format.h"
#include "confdb/confdb.h"
#include "dbus/dbus.h"
#include "sbus/sssd_dbus.h"
@@ -410,8 +411,8 @@ int proxy_child_send_id(struct sbus_connection *conn,
return ENOMEM;
}
- DEBUG(4, ("Sending ID to Proxy Backend: (%d,%ld)\n",
- version, id));
+ DEBUG(SSSDBG_FUNC_DATA, ("Sending ID to Proxy Backend: (%d,%"PRIu32")\n",
+ version, id));
ret = dbus_message_append_args(msg,
DBUS_TYPE_UINT16, &version,
diff --git a/src/providers/proxy/proxy_init.c b/src/providers/proxy/proxy_init.c
index 2b154a0703c686c0c2e5074f20bf1690bc5242cb..ec2b193569baefd4cb2f617ed8e15bdcf547f736 100644
--- a/src/providers/proxy/proxy_init.c
+++ b/src/providers/proxy/proxy_init.c
@@ -22,6 +22,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "util/sss_format.h"
#include "providers/proxy/proxy.h"
static int client_registration(DBusMessage *message,
@@ -415,7 +416,7 @@ static int client_registration(DBusMessage *message,
return EIO;
}
- DEBUG(4, ("Proxy client [%ld] connected\n", cli_id));
+ DEBUG(SSSDBG_FUNC_DATA, ("Proxy client [%"PRIu32"] connected\n", cli_id));
/* Check the hash table */
key.type = HASH_KEY_ULONG;
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c
index dccc2f40789ead31b8d76bf9a6c1f0e53334cfbb..27125ff92c99a6f5817e1e8e2c1b4deca2b3dc58 100644
--- a/src/responder/nss/nsssrv_services.c
+++ b/src/responder/nss/nsssrv_services.c
@@ -23,6 +23,7 @@
#include <arpa/inet.h>
#include "util/util.h"
+#include "util/sss_format.h"
#include "responder/nss/nsssrv.h"
#include "responder/nss/nsssrv_private.h"
#include "responder/nss/nsssrv_services.h"
@@ -225,7 +226,7 @@ getserv_send(TALLOC_CTX *mem_ctx,
/* If negatively cached, return we didn't find it */
if (ret == EEXIST) {
DEBUG(SSSDBG_TRACE_FUNC,
- ("Service [%lu:%s] does not exist in [%s]! "
+ ("Service [%"PRIu16":%s] does not exist in [%s]! "
"(negative cache)\n",
port,
SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
@@ -248,7 +249,7 @@ getserv_send(TALLOC_CTX *mem_ctx,
/* Check the cache */
DEBUG(SSSDBG_TRACE_FUNC,
- ("Checking cache for [%lu:%s@%s]\n",
+ ("Checking cache for [%"PRIu16":%s@%s]\n",
port,
SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
dom->name));
@@ -291,7 +292,8 @@ getserv_send(TALLOC_CTX *mem_ctx,
* We'll log an error and continue.
*/
DEBUG(SSSDBG_MINOR_FAILURE,
- ("Could not set negative cache for [%lu][%s]\n",
+ ("Could not set negative cache for "
+ "[%"PRIu16"][%s]\n",
state->port, SVC_PROTO_CASED));
}
}
@@ -502,7 +504,7 @@ static void lookup_service_done(struct tevent_req *subreq)
&state->res);
} else {
DEBUG(SSSDBG_TRACE_FUNC,
- ("Re-checking cache for [%lu:%s@%s]\n",
+ ("Re-checking cache for [%"PRIu16":%s@%s]\n",
state->port,
SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
dom->name));
@@ -540,7 +542,7 @@ static void lookup_service_done(struct tevent_req *subreq)
* We'll log an error and continue.
*/
DEBUG(SSSDBG_MINOR_FAILURE,
- ("Could not set negative cache for [%lu][%s]\n",
+ ("Could not set negative cache for [%"PRIu16"][%s]\n",
state->port, SVC_PROTO_CASED));
}
}
@@ -1146,7 +1148,7 @@ int nss_cmd_getservbyport(struct cli_ctx *cctx)
dctx->protocol = service_protocol;
DEBUG(SSSDBG_TRACE_FUNC,
- ("Requesting info for service on port [%lu/%s]\n",
+ ("Requesting info for service on port [%"PRIu16"/%s]\n",
port, service_protocol ? service_protocol : "<ANY>"));
/* All port lookups are multidomain searches */
--
1.8.3.1
-------------- next part --------------
>From 48ddf36f3f0a0de64952fb2dede60b051e35259c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 15:27:20 +0200
Subject: [PATCH 13/16] Fix formating of variables with type: time_t
---
src/providers/fail_over.c | 5 +++--
src/providers/krb5/krb5_child_handler.c | 2 +-
src/providers/ldap/ldap_auth.c | 2 +-
src/providers/ldap/sdap_access.c | 2 +-
src/providers/ldap/sdap_async_connection.c | 2 +-
src/providers/ldap/sdap_async_sudo_timer.c | 2 +-
src/providers/ldap/sdap_sudo.c | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c
index 537a9aa95a13a5d35895d7a310aab6ae758ebc39..98c20065989bad86acff2b9984726a9176089c44 100644
--- a/src/providers/fail_over.c
+++ b/src/providers/fail_over.c
@@ -154,8 +154,9 @@ fo_context_init(TALLOC_CTX *mem_ctx, struct fo_options *opts)
ctx->opts->family_order = opts->family_order;
ctx->opts->service_resolv_timeout = opts->service_resolv_timeout;
- DEBUG(SSSDBG_TRACE_FUNC, ("Created new fail over context, retry timeout is %d\n",
- ctx->opts->retry_timeout));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Created new fail over context, retry timeout is %ld\n",
+ ctx->opts->retry_timeout));
return ctx;
}
diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c
index 9aa5c346acde17e1ea74d7a2ab231a6a9eebdb94..aa72c07ce28ef09fa7363d1512742b5c981f435d 100644
--- a/src/providers/krb5/krb5_child_handler.c
+++ b/src/providers/krb5/krb5_child_handler.c
@@ -564,7 +564,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len,
tgtt.endtime = int64_to_time_t(time_data);
SAFEALIGN_COPY_INT64(&time_data, buf+p+3*sizeof(int64_t), NULL);
tgtt.renew_till = int64_to_time_t(time_data);
- DEBUG(SSSDBG_TRACE_LIBS, ("TGT times are [%d][%d][%d][%d].\n",
+ DEBUG(SSSDBG_TRACE_LIBS, ("TGT times are [%ld][%ld][%ld][%ld].\n",
tgtt.authtime, tgtt.starttime, tgtt.endtime, tgtt.renew_till));
}
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index bf14c2b87f7d5555f6f1818134f7591a1178fa40..ad682a7857ab5493b67ce76917ac9a04aa64c6bc 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -116,7 +116,7 @@ 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 [%ld] "
- "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
+ "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],
tzname[1], timezone, daylight, now, expire_time));
if (difftime(now, expire_time) > 0.0) {
diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 0be1179f79a950018a0dd8682b1488a93dea479a..e9659a2999e65e94b4a5bbd1eb0dbf1c12bf0de7 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -436,7 +436,7 @@ static bool nds_check_expired(const char *exp_time_str)
expire_time -= timezone;
now = time(NULL);
DEBUG(9, ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "
- "daylight [%d] now [%d] expire_time [%d].\n", tzname[0],
+ "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],
tzname[1], timezone, daylight, now, expire_time));
if (difftime(now, expire_time) > 0.0) {
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index cc3e13d097d33dc7c44e1f1fecccd152ceb6cf67..17d03c3206b61fa442616c57fbc735f87fa6452f 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -1773,7 +1773,7 @@ static void sdap_cli_auth_step(struct tevent_req *req)
|| (state->sh->expire_time > (now + expire_timeout))) {
state->sh->expire_time = now + expire_timeout;
DEBUG(SSSDBG_TRACE_LIBS,
- ("the connection will expire at %d\n", state->sh->expire_time));
+ ("the connection will expire at %ld\n", state->sh->expire_time));
}
if (!state->do_auth ||
diff --git a/src/providers/ldap/sdap_async_sudo_timer.c b/src/providers/ldap/sdap_async_sudo_timer.c
index ed32cd901bc145b10f3613366b24f29e9100bc11..27dd41f06e0a20c8a672a466535debc45e9f8ea2 100644
--- a/src/providers/ldap/sdap_async_sudo_timer.c
+++ b/src/providers/ldap/sdap_async_sudo_timer.c
@@ -170,7 +170,7 @@ static void sdap_sudo_timer_timeout(struct tevent_context *ev,
state = tevent_req_data(req, struct sdap_sudo_timer_state);
DEBUG(SSSDBG_CRIT_FAILURE, ("Request timed out. Is timeout too small?"
- " (%ds)!\n", state->timeout));
+ " (%lds)!\n", state->timeout));
talloc_zfree(state->subreq);
diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c
index 315f254a3a0c00d48c36d439e0da23e76f2ffce0..cc3e697f017cae7018dba5c356cd25f3f21397da 100644
--- a/src/providers/ldap/sdap_sudo.c
+++ b/src/providers/ldap/sdap_sudo.c
@@ -228,7 +228,7 @@ static int sdap_sudo_setup_periodical_refresh(struct sdap_sudo_ctx *sudo_ctx)
smart_default = id_ctx->opts->basic[SDAP_SUDO_SMART_REFRESH_INTERVAL].def_val.number;
DEBUG(SSSDBG_MINOR_FAILURE, ("At least one periodical update has to be "
- "enabled. Setting smart refresh interval to default value (%d).\n",
+ "enabled. Setting smart refresh interval to default value (%ld).\n",
smart_default));
ret = dp_opt_set_int(id_ctx->opts->basic,
@@ -1073,7 +1073,7 @@ schedule:
}
DEBUG(SSSDBG_TRACE_FUNC, ("Data provider is offline. "
- "Scheduling another full refresh in %lld minutes.\n", delay));
+ "Scheduling another full refresh in %ld minutes.\n", delay));
ret = sdap_sudo_schedule_refresh(sudo_ctx, sudo_ctx,
SDAP_SUDO_REFRESH_FULL,
--
1.8.3.1
-------------- next part --------------
>From e70b164ad6f32cafd25e12dbaad1394dac99c7a4 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 16:27:43 +0200
Subject: [PATCH 14/16] Fix formating of variables with ber_ type
---
src/providers/ldap/sdap_async.c | 2 +-
src/providers/ldap/sdap_async_connection.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index bdd3c3c8b2ed4cc7246c008ddbfe531b82d880bc..09275dd65fe87b792df592cad28ae440435475f8 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -1424,7 +1424,7 @@ static void sdap_get_generic_ext_done(struct sdap_op *op,
tevent_req_error(req, EIO);
return;
}
- DEBUG(7, ("Total count [%lu]\n", total_count));
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("Total count [%d]\n", total_count));
if (cookie.bv_val != NULL && cookie.bv_len > 0) {
/* Cookie contains data, which means there are more requests
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 17d03c3206b61fa442616c57fbc735f87fa6452f..0a7746088906346ea60884484e38457d39e7d933 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -1987,8 +1987,9 @@ static int synchronous_tls_setup(LDAP *ldap)
lret = ldap_result(ldap, msgid, 1, NULL, &result);
if (lret != LDAP_RES_EXTENDED) {
- DEBUG(2, ("Unexpected ldap_result, expected [%d] got [%d].\n",
- LDAP_RES_EXTENDED, lret));
+ DEBUG(SSSDBG_OP_FAILURE,
+ ("Unexpected ldap_result, expected [%lu] got [%d].\n",
+ LDAP_RES_EXTENDED, lret));
lret = LDAP_PARAM_ERROR;
goto done;
}
--
1.8.3.1
-------------- next part --------------
>From eb921aa6844c7e71c716bf9fa5a50b3849743268 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 16:10:51 +0200
Subject: [PATCH 15/16] Fix formating of variables with type: [gu]?id_t
---
src/providers/ldap/sdap_async_initgroups_ad.c | 2 +-
src/providers/ldap/sdap_idmap.c | 2 +-
src/providers/simple/simple_access_check.c | 8 ++++----
src/tests/krb5_child-test.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c
index daf581298b167cc879d8115523828a0695dc8f7a..fc83a03f4da3fef1c5d6a8718616219256fa23ae 100644
--- a/src/providers/ldap/sdap_async_initgroups_ad.c
+++ b/src/providers/ldap/sdap_async_initgroups_ad.c
@@ -472,7 +472,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq)
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Processing membership GID [%lu]\n",
+ ("Processing membership GID [%u]\n",
gid));
/* Check whether this GID already exists in the sysdb */
diff --git a/src/providers/ldap/sdap_idmap.c b/src/providers/ldap/sdap_idmap.c
index 0939c31e45a081a8494f4efa82ac1608314b82a3..f3bfcd1e3d91aa84d475c50d1aaa0955ad732319 100644
--- a/src/providers/ldap/sdap_idmap.c
+++ b/src/providers/ldap/sdap_idmap.c
@@ -333,7 +333,7 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx,
goto done;
}
DEBUG(SSSDBG_TRACE_LIBS,
- ("Adding domain [%s] as slice [%llu]\n", dom_sid, slice));
+ ("Adding domain [%s] as slice [%u]\n", dom_sid, slice));
if (range.max > idmap_upper) {
/* This should never happen */
diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c
index 7335135ea5dedecdb5ba2be60a57d18eb897a960..1509c9df40c197376b982d9e0041a7690a44a1ef 100644
--- a/src/providers/simple/simple_access_check.c
+++ b/src/providers/simple/simple_access_check.c
@@ -245,7 +245,7 @@ simple_resolve_group_check(struct simple_resolve_group_state *state)
group_attrs, &group);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
- ("Could not look up group by gid [%lu]: [%d][%s]\n",
+ ("Could not look up group by gid [%u]: [%d][%s]\n",
state->gid, ret, sss_strerror(ret)));
return ret;
}
@@ -470,7 +470,7 @@ static void simple_check_get_groups_next(struct tevent_req *subreq)
talloc_zfree(subreq);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
- ("Could not resolve name of group with GID %llu\n",
+ ("Could not resolve name of group with GID %u\n",
state->lookup_gids[state->giter]));
tevent_req_error(req, ret);
return;
@@ -545,7 +545,7 @@ simple_check_process_group(struct simple_check_groups_state *state,
/* Non-posix group with a GID. Needs resolving */
state->lookup_gids[state->num_gids] = gid;
- DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding GID %llu\n", gid));
+ DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding GID %u\n", gid));
state->num_gids++;
return EOK;
}
@@ -564,7 +564,7 @@ simple_check_get_groups_primary(struct simple_check_groups_state *state,
gid, group_attrs, &msg);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
- ("Could not look up primary group [%lu]: [%d][%s]\n",
+ ("Could not look up primary group [%u]: [%d][%s]\n",
gid, ret, sss_strerror(ret)));
/* We have to treat this as non-fatal, because the primary
* group may be local to the machine and not available in
diff --git a/src/tests/krb5_child-test.c b/src/tests/krb5_child-test.c
index 423f8bb8427df8e8c1be25113f1406cff8def2c4..299f60a9e358a34b5afa578ae6bf303740febe9c 100644
--- a/src/tests/krb5_child-test.c
+++ b/src/tests/krb5_child-test.c
@@ -284,7 +284,7 @@ create_dummy_req(TALLOC_CTX *mem_ctx, const char *user,
kr->krb5_ctx->cc_be = &file_cc;
break;
}
- DEBUG(SSSDBG_FUNC_DATA, ("ccname [%s] uid [%llu] gid [%llu]\n",
+ DEBUG(SSSDBG_FUNC_DATA, ("ccname [%s] uid [%u] gid [%u]\n",
kr->ccname, kr->uid, kr->gid));
ret = kr->krb5_ctx->cc_be->create(kr->ccname,
--
1.8.3.1
-------------- next part --------------
>From 00162d31faab4cdc09fb40f1f69bfd3bf7b6045f Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 17 Jul 2013 17:15:58 +0200
Subject: [PATCH 16/16] Fix warning: data argument not used by format string
---
src/providers/ldap/sdap_async_groups.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index a8e7a6c5618a8876e8e375e6748c4845de4f676e..fc9b677101897ed6c37674b1752706388609a4a5 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -1391,7 +1391,9 @@ static void sdap_process_group_members(struct tevent_req *subreq)
next:
if (ret) {
- DEBUG(7, ("Error reading group member. Skipping\n", ret));
+ DEBUG(SSSDBG_TRACE_FUNC,
+ ("Error reading group member[%d]: %s. Skipping\n",
+ ret, strerror(ret)));
state->count--;
}
/* Are there more searches for uncached users to submit ? */
@@ -2073,7 +2075,8 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx,
ret = sss_filter_sanitize(tmp_ctx, original_dn,
&clean_orig_dn);
if (ret != EOK) {
- DEBUG(1, ("Cannot sanitize originalDN\n", i));
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ ("Cannot sanitize originalDN [%s]\n", original_dn));
goto done;
}
--
1.8.3.1
More information about the sssd-devel
mailing list