summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-07-10 15:16:16 +0200
committerStephen Gallagher <sgallagh@redhat.com>2012-07-10 09:30:57 -0400
commit2bdb99e3578fa8ff606632d9e7242bc753737752 (patch)
tree26041c490cf82842e1f1b5a0343c65f0570a8c49
parent951a2082ba1bfe2fec59b06b1f3fdf424d9d75c2 (diff)
downloadsssd-2bdb99e3578fa8ff606632d9e7242bc753737752.tar.gz
sssd-2bdb99e3578fa8ff606632d9e7242bc753737752.tar.xz
sssd-2bdb99e3578fa8ff606632d9e7242bc753737752.zip
Cast uid_t to unsigned long long in DEBUG messages
-rw-r--r--src/db/sysdb_ops.c4
-rw-r--r--src/providers/krb5/krb5_child.c6
-rw-r--r--src/tests/krb5_child-test.c3
-rw-r--r--src/tests/sysdb-tests.c8
4 files changed, 11 insertions, 10 deletions
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 528b84f1a..6c1fc49b4 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -1559,7 +1559,7 @@ int sysdb_store_user(struct sysdb_ctx *sysdb,
}
DEBUG(SSSDBG_MINOR_FAILURE,
("A user with the same UID [%llu] was removed from the "
- "cache\n", uid));
+ "cache\n", (unsigned long long) uid));
ret = sysdb_add_user(sysdb, name, uid, gid, gecos,
homedir, shell, attrs, cache_timeout, now);
}
@@ -1706,7 +1706,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb,
}
DEBUG(SSSDBG_MINOR_FAILURE,
("A group with the same GID [%llu] was removed from the "
- "cache\n", gid));
+ "cache\n", (unsigned long long) gid));
ret = sysdb_add_group(sysdb, name, gid, attrs, cache_timeout, now);
}
goto done;
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 8cf625558..817a3d01e 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -1345,9 +1345,9 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, struct pam_data *pd,
DEBUG(SSSDBG_CONF_SETTINGS,
("cmd [%d] uid [%llu] gid [%llu] validate [%s] offline [%s] "
- "UPN [%s]\n", pd->cmd, kr->uid, kr->gid,
- kr->validate ? "true" : "false", *offline ? "true" : "false",
- kr->upn ? kr->upn : "none"));
+ "UPN [%s]\n", pd->cmd, (unsigned long long) kr->uid,
+ (unsigned long long) kr->gid, kr->validate ? "true" : "false",
+ *offline ? "true" : "false", kr->upn ? kr->upn : "none"));
if (pd->cmd == SSS_PAM_AUTHENTICATE ||
pd->cmd == SSS_CMD_RENEW ||
diff --git a/src/tests/krb5_child-test.c b/src/tests/krb5_child-test.c
index 5314b1277..ff3e95a72 100644
--- a/src/tests/krb5_child-test.c
+++ b/src/tests/krb5_child-test.c
@@ -249,7 +249,8 @@ create_dummy_req(TALLOC_CTX *mem_ctx, const char *user,
if (!kr->ccname) goto fail;
DEBUG(SSSDBG_FUNC_DATA, ("ccname [%s] uid [%llu] gid [%llu]\n",
- kr->ccname, kr->uid, kr->gid));
+ kr->ccname, (unsigned long long) kr->uid,
+ (unsigned long long) kr->gid));
} else {
kr->ccname = talloc_strdup(kr, ccname);
}
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 16b7234a1..24e619f92 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -2197,7 +2197,7 @@ START_TEST(test_group_rename)
gid = ldb_msg_find_attr_as_uint(res->msgs[0], SYSDB_GIDNUM, 0);
fail_unless(gid == grgid,
"Did not find the expected GID (found %llu expected %llu)",
- gid, grgid);
+ (unsigned long long) gid, (unsigned long long) grgid);
name = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_NAME, NULL);
fail_unless(strcmp(fromname, name) == 0,
"Did not find the expected name (found %s expected %s)",
@@ -2220,7 +2220,7 @@ START_TEST(test_group_rename)
gid = ldb_msg_find_attr_as_uint(res->msgs[0], SYSDB_GIDNUM, 0);
fail_unless(gid == grgid,
"Did not find the expected GID (found %llu expected %llu)",
- gid, grgid);
+ (unsigned long long) gid, (unsigned long long) grgid);
name = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_NAME, NULL);
fail_unless(strcmp(toname, name) == 0,
"Did not find the expected GID (found %s expected %s)",
@@ -2266,7 +2266,7 @@ START_TEST(test_user_rename)
uid = ldb_msg_find_attr_as_uint(res->msgs[0], SYSDB_UIDNUM, 0);
fail_unless(uid == userid,
"Did not find the expected UID (found %llu expected %llu)",
- uid, userid);
+ (unsigned long long) uid, (unsigned long long) userid);
name = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_NAME, NULL);
fail_unless(strcmp(fromname, name) == 0,
"Did not find the expected name (found %s expected %s)",
@@ -2291,7 +2291,7 @@ START_TEST(test_user_rename)
uid = ldb_msg_find_attr_as_uint(res->msgs[0], SYSDB_UIDNUM, 0);
fail_unless(uid == userid,
"Did not find the expected UID (found %llu expected %llu)",
- uid, userid);
+ (unsigned long long) uid, (unsigned long long) userid);
name = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_NAME, NULL);
fail_unless(strcmp(toname, name) == 0,
"Did not find the expected name (found %s expected %s)",