diff options
Diffstat (limited to 'lib/ZGetSender.c')
| -rw-r--r-- | lib/ZGetSender.c | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/lib/ZGetSender.c b/lib/ZGetSender.c index df5f3e2..c495cec 100644 --- a/lib/ZGetSender.c +++ b/lib/ZGetSender.c @@ -22,31 +22,62 @@ static const char rcsid_ZGetSender_c[] = char *ZGetSender() { struct passwd *pw; + static char *sender = NULL; +#ifdef HAVE_KRB5 + krb5_ccache ccache; + krb5_principal principal; + char *prname; + int result; + char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ]; /*XXX*/ +#else #ifdef HAVE_KRB4 char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ]; - static char sender[ANAME_SZ+INST_SZ+REALM_SZ+3] = ""; -#else - static char sender[128] = ""; +#endif #endif /* Return it if already cached */ - if (*sender) + if (sender) return (sender); +#ifdef HAVE_KRB5 + result = krb5_cc_default(Z_krb5_ctx, &ccache); + if (!result) { + result = krb5_cc_get_principal(Z_krb5_ctx, ccache, &principal); + if (!result) { +#if 0 + 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); + } + krb5_cc_close(Z_krb5_ctx, ccache); + } +#else #ifdef HAVE_KRB4 if (krb_get_tf_fullname((char *)TKT_FILE, pname, pinst, prealm) == KSUCCESS) { - (void) sprintf(sender, "%s%s%s@%s", pname, (pinst[0]?".":""), - 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); return (sender); } #endif +#endif /* XXX a uid_t is a u_short (now), but getpwuid * wants an int. AARGH! */ pw = getpwuid((int) getuid()); if (!pw) return ("unknown"); - (void) sprintf(sender, "%s@%s", pw->pw_name, __Zephyr_realm); + sender = malloc(strlen(pw->pw_name) + strlen(__Zephyr_realm) + 2); + if (sender) + (void) sprintf(sender, "%s@%s", pw->pw_name, __Zephyr_realm); return (sender); } |