diff options
author | Luke Howard <lukeh@padl.com> | 2011-04-04 23:53:25 +0000 |
---|---|---|
committer | Luke Howard <lukeh@padl.com> | 2011-04-04 23:53:25 +0000 |
commit | e138dce18ed1f1581575afbacb3d6e4eaf095f1a (patch) | |
tree | 5320b082bc94719e8497e48fa772706e61f26674 /src/appl/gss-sample/gss-server.c | |
parent | b8acd51a8e9f89a18d55fe4b2fedc085e204157d (diff) | |
download | krb5-e138dce18ed1f1581575afbacb3d6e4eaf095f1a.zip krb5-e138dce18ed1f1581575afbacb3d6e4eaf095f1a.tar.gz krb5-e138dce18ed1f1581575afbacb3d6e4eaf095f1a.tar.bz2 |
Merge branch 'master' into users/lhoward/moonshot-mechglue-fixes
Conflicts:
src/appl/gss-sample/gss-server.c
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/mechglue/g_acquire_cred.c
src/lib/gssapi/mechglue/g_initialize.c
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/moonshot-mechglue-fixes@24841 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/gss-sample/gss-server.c')
-rw-r--r-- | src/appl/gss-sample/gss-server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c index 30ae606..9b5cab2 100644 --- a/src/appl/gss-sample/gss-server.c +++ b/src/appl/gss-sample/gss-server.c @@ -887,11 +887,10 @@ showLocalIdentity(OM_uint32 *minor, gss_name_t name) uid_t uid; major = gss_pname_to_uid(minor, name, GSS_C_NO_OID, &uid); - if (major == GSS_S_COMPLETE) { - printf("UID: %d\n", uid); - } else if (major != GSS_S_UNAVAILABLE) { + if (major == GSS_S_COMPLETE) + printf("UID: %lu\n", (unsigned long)uid); + else if (major != GSS_S_UNAVAILABLE) display_status("gss_pname_to_uid", major, *minor); - } return major; } |