aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-12-02 22:50:18 +0000
committerRoger Dingledine <arma@torproject.org>2008-12-02 22:50:18 +0000
commit78d86806723a5e3d133054f769ca1301a3636bdb (patch)
tree4bb5685c0806fb2b09d28022660006d54dc9cf4a
parentd973aea86c752eb0b122fa754a7f385275a1bde4 (diff)
downloadtor-78d86806723a5e3d133054f769ca1301a3636bdb.tar.gz
tor-78d86806723a5e3d133054f769ca1301a3636bdb.zip
backport r17392: Compile without warnings on solaris
svn:r17450
-rw-r--r--ChangeLog1
-rw-r--r--src/common/compat.c12
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c11206664..5cbe1f5d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Changes in version 0.2.0.33 - 200?-??-??
could make gcc generate non-functional binary search code. Bugfix
on 0.2.0.10-alpha.
- Build correctly on platforms without socklen_t.
+ - Compile without warnings on solaris.
- Avoid potential crash on internal error during signature collection.
Fixes bug 864. Patch from rovv.
diff --git a/src/common/compat.c b/src/common/compat.c
index cfc73ff395..f03e0a4943 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -895,7 +895,8 @@ log_credential_status(void)
return -1;
} else {
log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL,
- "UID is %u (real), %u (effective), %u (saved)", ruid, euid, suid);
+ "UID is %u (real), %u (effective), %u (saved)",
+ (unsigned)ruid, (unsigned)euid, (unsigned)suid);
}
#else
/* getresuid is not present on MacOS X, so we can't get the saved (E)UID */
@@ -904,7 +905,8 @@ log_credential_status(void)
(void)suid;
log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL,
- "UID is %u (real), %u (effective), unknown (saved)", ruid, euid);
+ "UID is %u (real), %u (effective), unknown (saved)",
+ (unsigned)ruid, (unsigned)euid);
#endif
/* log GIDs */
@@ -914,7 +916,8 @@ log_credential_status(void)
return -1;
} else {
log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL,
- "GID is %u (real), %u (effective), %u (saved)", rgid, egid, sgid);
+ "GID is %u (real), %u (effective), %u (saved)",
+ (unsigned)rgid, (unsigned)egid, (unsigned)sgid);
}
#else
/* getresgid is not present on MacOS X, so we can't get the saved (E)GID */
@@ -922,7 +925,8 @@ log_credential_status(void)
egid = getegid();
(void)sgid;
log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL,
- "GID is %u (real), %u (effective), unknown (saved)", rgid, egid);
+ "GID is %u (real), %u (effective), unknown (saved)",
+ (unsigned)rgid, (unsigned)egid);
#endif
/* log supplementary groups */