r246@bucket (orig r242): kcr | 2007-12-31 15:13:42 -0500

 get the sender from the ccache and _actually_return_it_.

git-svn-id: svn://svn.1ts.org/debian/trunk@315 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/lib/ZGetSender.c b/zephyr/lib/ZGetSender.c
index c63a278d461a1362bd0f207acf124f3aeed6bce3..f62619d8ce2137b19c15f9f35f993bd1e63b9697 100644 (file)
--- a/zephyr/lib/ZGetSender.c
+++ b/zephyr/lib/ZGetSender.c
@@ -44,17 +44,10 @@ char *ZGetSender()
     if (!result) {
       result = krb5_cc_get_principal(Z_krb5_ctx, ccache, &principal);
       if (!result) {
-#if 1
        krb5_unparse_name(Z_krb5_ctx, principal, &prname);
        sender = strdup(prname);
-#else
-       krb5_524_conv_principal(Z_krb5_ctx, principal, pname, pinst, prealm);
-        sender = malloc(ANAME_SZ+INST_SZ+REALM_SZ+3);
-       if (sender)
-         (void) sprintf(sender, "%s%s%s@%s", pname, (pinst[0]?".":""),
-                        pinst, prealm);
-#endif
        krb5_free_principal(Z_krb5_ctx, principal);
+       return sender;
       }
       krb5_cc_close(Z_krb5_ctx, ccache);
     }