>From 7e641308bebe591fa400c027cf4c683b7c3cc3c2 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 4 Sep 2013 16:28:06 +0200 Subject: [PATCH 17/20] Fix formating of variables with type: uid_t --- src/db/sysdb_ops.c | 5 +++-- src/monitor/monitor.c | 3 ++- src/monitor/monitor_netlink.c | 5 +++-- src/providers/krb5/krb5_become_user.c | 5 +++-- src/providers/krb5/krb5_child.c | 3 ++- src/providers/krb5/krb5_utils.c | 12 ++++++------ src/providers/proxy/proxy_id.c | 11 +++++++---- src/responder/common/negcache.c | 4 ++-- src/tools/sss_seed.c | 5 +++-- src/tools/tools_util.c | 3 ++- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 439a0cd55d6ac847efd51e6f6d41a8847ef0e32a..5b1036ec3280faea9aadc72e6950bd877d0ff073 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1116,8 +1116,9 @@ int sysdb_add_user(struct sysdb_ctx *sysdb, if (domain->id_max != 0 && uid != 0 && (uid < domain->id_min || uid > domain->id_max)) { - DEBUG(2, ("Supplied uid [%d] is not in the allowed range [%d-%d].\n", - uid, domain->id_min, domain->id_max)); + DEBUG(SSSDBG_OP_FAILURE, + ("Supplied uid [%"PRIuid"] is not in the allowed range " + "[%d-%d].\n", uid, domain->id_min, domain->id_max)); return ERANGE; } diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 495f31e3487027884313c3eef87ea8d8a3f15028..b130cf3d999a4e6d6bdd7859a0c4fccdea3bd199 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -2695,7 +2695,8 @@ int main(int argc, const char *argv[]) uid = getuid(); if (uid != 0) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Running under %d, must be root\n", uid)); + DEBUG(SSSDBG_FATAL_FAILURE, + ("Running under %"PRIuid", must be root\n", uid)); sss_log(SSS_LOG_ALERT, "sssd must be run as root"); return 8; } diff --git a/src/monitor/monitor_netlink.c b/src/monitor/monitor_netlink.c index 932a6bf330a80e8c0f7cd506a0ae50a49e9ce38f..b485ac09afbe6addb59ea51b66279bf5f2ddc8fe 100644 --- a/src/monitor/monitor_netlink.c +++ b/src/monitor/monitor_netlink.c @@ -472,8 +472,9 @@ static int event_msg_recv(struct nl_msg *msg, void *arg) creds = nlmsg_get_creds(msg); if (!creds || creds->uid != 0) { - DEBUG(9, ("Ignoring netlink message from UID %d", - creds ? creds->uid : -1)); + DEBUG(SSSDBG_TRACE_ALL, + ("Ignoring netlink message from UID %"PRIuid, + creds ? creds->uid : (uid_t)-1)); return NL_SKIP; } diff --git a/src/providers/krb5/krb5_become_user.c b/src/providers/krb5/krb5_become_user.c index 70bc5630ece21505b58bd1a8795d7ab4b7864460..291d6521df98a7e89f4172fc9b2a315c5ecf84a9 100644 --- a/src/providers/krb5/krb5_become_user.c +++ b/src/providers/krb5/krb5_become_user.c @@ -30,12 +30,13 @@ errno_t become_user(uid_t uid, gid_t gid) uid_t cuid; int ret; - DEBUG(SSSDBG_FUNC_DATA, ("Trying to become user [%d][%d].\n", uid, gid)); + DEBUG(SSSDBG_FUNC_DATA, + ("Trying to become user [%"PRIuid"][%d].\n", uid, gid)); /* skip call if we already are the requested user */ cuid = geteuid(); if (uid == cuid) { - DEBUG(SSSDBG_FUNC_DATA, ("Already user [%d].\n", uid)); + DEBUG(SSSDBG_FUNC_DATA, ("Already user [%"PRIuid"].\n", uid)); return EOK; } diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index e69f5e35d517a00c101b3499dae8bee5e75c5bdb..8d916fda216db4ba62410a5a2567641117b81424 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -697,7 +697,8 @@ create_ccdir(const char *dirname, uid_t uid, gid_t gid) if (statbuf.st_uid != uid || statbuf.st_gid != gid) { DEBUG(SSSDBG_CRIT_FAILURE, - ("The directory %s is owned by %d/%d, expected %d/%d\n", + ("The directory %s is owned by %"PRIuid"/%d, " + "expected %"PRIuid"/%d\n", dirname, statbuf.st_uid, statbuf.st_gid, uid, gid)); return EACCES; } diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c index df7892153d2c16fd3e485ed5013454233d228936..03392dbac6562035031661afbf2f9b2a96c3100f 100644 --- a/src/providers/krb5/krb5_utils.c +++ b/src/providers/krb5/krb5_utils.c @@ -252,7 +252,7 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, "because uid is invalid.\n")); goto done; } - result = talloc_asprintf_append(result, "%s%d", p, + result = talloc_asprintf_append(result, "%s%"PRIuid, p, kr->uid); if (!file_mode) *private_path = true; break; @@ -401,7 +401,7 @@ static errno_t check_parent_stat(bool private_path, struct stat *parent_stat, if (!((parent_stat->st_uid == 0 && parent_stat->st_gid == 0) || parent_stat->st_uid == uid)) { DEBUG(1, ("Private directory can only be created below a " - "directory belonging to root or to [%d][%d].\n", + "directory belonging to root or to [%"PRIuid"][%d].\n", uid, gid)); return EINVAL; } @@ -920,8 +920,8 @@ cc_residual_is_used(uid_t uid, const char *ccname, if (stat_buf.st_uid != uid) { DEBUG(SSSDBG_OP_FAILURE, - ("Cache file [%s] exists, but is owned by [%d] instead of " - "[%d].\n", ccname, stat_buf.st_uid, uid)); + ("Cache file [%s] exists, but is owned by [%"PRIuid"] " + "instead of [%"PRIuid"].\n", ccname, stat_buf.st_uid, uid)); return EINVAL; } @@ -953,10 +953,10 @@ cc_residual_is_used(uid_t uid, const char *ccname, } if (!active) { - DEBUG(SSSDBG_TRACE_FUNC, ("User [%d] is not active\n", uid)); + DEBUG(SSSDBG_TRACE_FUNC, ("User [%"PRIuid"] is not active\n", uid)); } else { DEBUG(SSSDBG_TRACE_LIBS, - ("User [%d] is still active, reusing ccache [%s].\n", + ("User [%"PRIuid"] is still active, reusing ccache [%s].\n", uid, ccname)); *result = true; } diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index b5d63ecfd280c65e15714ccc98edcc639d7c852d..7fa456bb6fd23efcc6f020f3a950f2469e48cee9 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -22,6 +22,9 @@ along with this program. If not, see . */ +#include "config.h" + +#include "util/sss_format.h" #include "util/strtonum.h" #include "providers/proxy/proxy.h" @@ -166,7 +169,7 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_FUNC, ("User found: (%s, %d, %d)\n", + DEBUG(SSSDBG_TRACE_FUNC, ("User found: (%s, %"PRIuid", %d)\n", pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); /* uid=0 or gid=0 are invalid values */ @@ -314,7 +317,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx, bool del_user = false; int ret; - DEBUG(SSSDBG_TRACE_FUNC, ("Searching user by uid (%d)\n", uid)); + DEBUG(SSSDBG_TRACE_FUNC, ("Searching user by uid (%"PRIuid")\n", uid)); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -354,7 +357,7 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, - ("proxy -> getpwuid_r failed for '%d' <%d>: %s\n", + ("proxy -> getpwuid_r failed for '%"PRIuid"' <%d>: %s\n", uid, ret, strerror(ret))); } return ret; @@ -453,7 +456,7 @@ static int enum_users(TALLOC_CTX *mem_ctx, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_LIBS, ("User found (%s, %d, %d)\n", + DEBUG(SSSDBG_TRACE_LIBS, ("User found (%s, %"PRIuid", %d)\n", pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); /* uid=0 or gid=0 are invalid values */ diff --git a/src/responder/common/negcache.c b/src/responder/common/negcache.c index 769346370b8366a687b63a1a844dde8f083d0154..8a277f057a4db3fd1cf3cde47ec54c3957d4b703 100644 --- a/src/responder/common/negcache.c +++ b/src/responder/common/negcache.c @@ -379,7 +379,7 @@ int sss_ncache_check_uid(struct sss_nc_ctx *ctx, int ttl, uid_t uid) char *str; int ret; - str = talloc_asprintf(ctx, "%s/%u", NC_UID_PREFIX, uid); + str = talloc_asprintf(ctx, "%s/%"PRIuid, NC_UID_PREFIX, uid); if (!str) return ENOMEM; ret = sss_ncache_check_str(ctx, str, ttl); @@ -510,7 +510,7 @@ int sss_ncache_set_uid(struct sss_nc_ctx *ctx, bool permanent, uid_t uid) char *str; int ret; - str = talloc_asprintf(ctx, "%s/%u", NC_UID_PREFIX, uid); + str = talloc_asprintf(ctx, "%s/%"PRIuid, NC_UID_PREFIX, uid); if (!str) return ENOMEM; ret = sss_ncache_set_str(ctx, str, permanent); diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c index 75f7e8c520593a0eeb5133ce8749106f951a98cf..1a6814c3a419aab36091620270d54ccbd93a8dac 100644 --- a/src/tools/sss_seed.c +++ b/src/tools/sss_seed.c @@ -166,8 +166,9 @@ static int seed_id_input(const char *req, return ret; } if (*endptr != '\0') { - DEBUG(SSSDBG_MINOR_FAILURE, ("extra characters [%s] after " - "ID [%d]\n", endptr, *_id_input)); + DEBUG(SSSDBG_MINOR_FAILURE, + ("extra characters [%s] after ID [%"PRIuid"]\n", + endptr, *_id_input)); } } else { ret = EINVAL; diff --git a/src/tools/tools_util.c b/src/tools/tools_util.c index 6798b6589668b1335a7a5ada59b08cf92a2bbf1f..45c3c81ca4be8939026cafa065edd7cb6a960e05 100644 --- a/src/tools/tools_util.c +++ b/src/tools/tools_util.c @@ -360,7 +360,8 @@ static int remove_mail_spool(TALLOC_CTX *mem_ctx, case 0: break; case -1: - DEBUG(3, ("%s not owned by %d, not removing\n", + DEBUG(SSSDBG_MINOR_FAILURE, + ("%s not owned by %"PRIuid", not removing\n", spool_file, uid)); ret = EACCES; /* FALLTHROUGH */ -- 1.8.3.1