>From d57b4c1706026ed8a46ff4c256ba8da317f0dc69 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 4 Sep 2013 16:52:34 +0200 Subject: [PATCH 18/20] Fix formating of variables with type: gid_t --- src/db/sysdb_ops.c | 10 ++++++---- src/providers/krb5/krb5_become_user.c | 2 +- src/providers/krb5/krb5_child.c | 4 ++-- src/providers/krb5/krb5_utils.c | 4 ++-- src/providers/ldap/sdap_async_initgroups_ad.c | 3 +-- src/providers/proxy/proxy_id.c | 21 +++++++++++---------- src/providers/simple/simple_access_check.c | 8 ++++---- src/responder/common/negcache.c | 4 ++-- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 5b1036ec3280faea9aadc72e6950bd877d0ff073..f01580e10cdf7af8d4f938341a2f7bbbbdf724cf 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1124,8 +1124,9 @@ int sysdb_add_user(struct sysdb_ctx *sysdb, if (domain->id_max != 0 && gid != 0 && (gid < domain->id_min || gid > domain->id_max)) { - DEBUG(2, ("Supplied gid [%d] is not in the allowed range [%d-%d].\n", - gid, domain->id_min, domain->id_max)); + DEBUG(SSSDBG_OP_FAILURE, + ("Supplied gid [%"PRIgid"] is not in the allowed range " + "[%d-%d].\n", gid, domain->id_min, domain->id_max)); return ERANGE; } @@ -1309,8 +1310,9 @@ int sysdb_add_group(struct sysdb_ctx *sysdb, if (domain->id_max != 0 && gid != 0 && (gid < domain->id_min || gid > domain->id_max)) { - DEBUG(2, ("Supplied gid [%d] is not in the allowed range [%d-%d].\n", - gid, domain->id_min, domain->id_max)); + DEBUG(SSSDBG_OP_FAILURE, + ("Supplied gid [%"PRIgid"] is not in the allowed range " + "[%d-%d].\n", gid, domain->id_min, domain->id_max)); return ERANGE; } diff --git a/src/providers/krb5/krb5_become_user.c b/src/providers/krb5/krb5_become_user.c index 291d6521df98a7e89f4172fc9b2a315c5ecf84a9..5743556992074d35e4f647b1ee498596adb992cf 100644 --- a/src/providers/krb5/krb5_become_user.c +++ b/src/providers/krb5/krb5_become_user.c @@ -31,7 +31,7 @@ errno_t become_user(uid_t uid, gid_t gid) int ret; DEBUG(SSSDBG_FUNC_DATA, - ("Trying to become user [%"PRIuid"][%d].\n", uid, gid)); + ("Trying to become user [%"PRIuid"][%"PRIgid"].\n", uid, gid)); /* skip call if we already are the requested user */ cuid = geteuid(); diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index 8d916fda216db4ba62410a5a2567641117b81424..9a28ae9def6b50eb98f261eb8f3477cacfd41504 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -697,8 +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 %"PRIuid"/%d, " - "expected %"PRIuid"/%d\n", + ("The directory %s is owned by %"PRIuid"/%"PRIgid", " + "expected %"PRIuid"/%"PRIgid"\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 03392dbac6562035031661afbf2f9b2a96c3100f..80a2e86961b141f6273c33bab5233e957362df98 100644 --- a/src/providers/krb5/krb5_utils.c +++ b/src/providers/krb5/krb5_utils.c @@ -401,8 +401,8 @@ 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 [%"PRIuid"][%d].\n", - uid, gid)); + "directory belonging to root or to " + "[%"PRIuid"][%"PRIgid"].\n", uid, gid)); return EINVAL; } diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index 5f2465ca6d8aef7fc486a033e7d3759050c0dec8..9a2d23370e1f8a38b372ca31b3e86b79f9ca6701 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -472,8 +472,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_LIBS, - ("Processing membership GID [%u]\n", - gid)); + ("Processing membership GID [%"PRIgid"]\n", gid)); /* Check whether this GID already exists in the sysdb */ ret = sysdb_search_group_by_gid(tmp_ctx, state->sysdb, state->domain, diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 7fa456bb6fd23efcc6f020f3a950f2469e48cee9..93a6ea0b8a90fbf376d3bd60b7c33c7c8e8e9855 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -169,7 +169,7 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_FUNC, ("User found: (%s, %"PRIuid", %d)\n", + DEBUG(SSSDBG_TRACE_FUNC, ("User found: (%s, %"PRIuid", %"PRIgid")\n", pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); /* uid=0 or gid=0 are invalid values */ @@ -456,8 +456,9 @@ static int enum_users(TALLOC_CTX *mem_ctx, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_LIBS, ("User found (%s, %"PRIuid", %d)\n", - pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); + DEBUG(SSSDBG_TRACE_LIBS, + ("User found (%s, %"PRIuid", %"PRIgid")\n", + pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); /* uid=0 or gid=0 are invalid values */ /* also check that the id is in the valid range for this domain @@ -752,7 +753,7 @@ handle_getgr_result(enum nss_status status, struct group *grp, break; case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_FUNC_DATA, ("Group found: (%s, %d)\n", + DEBUG(SSSDBG_FUNC_DATA, ("Group found: (%s, %"PRIgid")\n", grp->gr_name, grp->gr_gid)); /* gid=0 is an invalid value */ @@ -922,7 +923,7 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, bool delete_group = false; int ret; - DEBUG(SSSDBG_TRACE_FUNC, ("Searching group by gid (%d)\n", gid)); + DEBUG(SSSDBG_TRACE_FUNC, ("Searching group by gid (%"PRIgid")\n", gid)); tmpctx = talloc_new(mem_ctx); if (!tmpctx) { @@ -957,8 +958,8 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, if (delete_group) { DEBUG(SSSDBG_TRACE_FUNC, - ("Group %d does not exist (or is invalid) on remote server," - " deleting!\n", gid)); + ("Group %"PRIgid" does not exist (or is invalid) on remote " + "server, deleting!\n", gid)); ret = sysdb_delete_group(sysdb, dom, NULL, gid); if (ret == ENOENT) { @@ -978,7 +979,7 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("proxy -> getgrgid_r failed for '%d' <%d>: %s\n", + ("proxy -> getgrgid_r failed for '%"PRIgid"' <%d>: %s\n", gid, ret, strerror(ret))); } return ret; @@ -1077,7 +1078,7 @@ static int enum_groups(TALLOC_CTX *mem_ctx, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_OP_FAILURE, ("Group found (%s, %d)\n", + DEBUG(SSSDBG_OP_FAILURE, ("Group found (%s, %"PRIgid")\n", grp->gr_name, grp->gr_gid)); /* gid=0 is an invalid value */ @@ -1334,7 +1335,7 @@ static int get_initgr_groups_process(TALLOC_CTX *memctx, case NSS_STATUS_NOTFOUND: DEBUG(SSSDBG_FUNC_DATA, ("The initgroups call returned 'NOTFOUND'. " "Assume the user is only member of its " - "primary group (%d)\n", pwd->pw_gid)); + "primary group (%"PRIgid")\n", pwd->pw_gid)); /* fall through */ case NSS_STATUS_SUCCESS: DEBUG(SSSDBG_CONF_SETTINGS, ("User [%s] appears to be member of %lu" diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c index 1509c9df40c197376b982d9e0041a7690a44a1ef..97dfe4bd2420a01d13e2a7f1d9e6524e91ea5f7e 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 [%u]: [%d][%s]\n", + ("Could not look up group by gid [%"PRIgid"]: [%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 %u\n", + ("Could not resolve name of group with GID %"PRIgid"\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 %u\n", gid)); + DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding GID %"PRIgid"\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 [%u]: [%d][%s]\n", + ("Could not look up primary group [%"PRIgid"]: [%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/responder/common/negcache.c b/src/responder/common/negcache.c index 8a277f057a4db3fd1cf3cde47ec54c3957d4b703..385d363f84353a60ad92cb8e2d8150886a2cec28 100644 --- a/src/responder/common/negcache.c +++ b/src/responder/common/negcache.c @@ -393,7 +393,7 @@ int sss_ncache_check_gid(struct sss_nc_ctx *ctx, int ttl, gid_t gid) char *str; int ret; - str = talloc_asprintf(ctx, "%s/%u", NC_GID_PREFIX, gid); + str = talloc_asprintf(ctx, "%s/%"PRIgid, NC_GID_PREFIX, gid); if (!str) return ENOMEM; ret = sss_ncache_check_str(ctx, str, ttl); @@ -524,7 +524,7 @@ int sss_ncache_set_gid(struct sss_nc_ctx *ctx, bool permanent, gid_t gid) char *str; int ret; - str = talloc_asprintf(ctx, "%s/%u", NC_GID_PREFIX, gid); + str = talloc_asprintf(ctx, "%s/%"PRIgid, NC_GID_PREFIX, gid); if (!str) return ENOMEM; ret = sss_ncache_set_str(ctx, str, permanent); -- 1.8.3.1