src/protocols/zephyr/ZGetSender.c

Mon, 31 Oct 2005 20:02:33 +0000

author
Evan Schoenberg <evands@pidgin.im>
date
Mon, 31 Oct 2005 20:02:33 +0000
changeset 11932
fc75e88bd843
parent 11105
842fa517e08c
child 11933
a2f230f0c2d0
permissions
-rw-r--r--

[gaim-migrate @ 14223]
SF Patch #1343764 from Evan Schoenberg

"Whomever modified zephyr in HEAD last (the problem doesn't exist
in oldstatus) must not have compiled with kerberos enabled. A stray
snippet of code -- which duplicates the fall through code below it --
uses an undefined variable, username. This patches fixes
ZGetSender.c up to compile properly with kerberos enabled."

committer: Richard Laager <rlaager@pidgin.im>

/* This file is part of the Project Athena Zephyr Notification System.
 * It contains source for the ZGetSender.c function.
 *
 *	Created by:	Robert French
 *
 *	Copyright (c) 1987, 1991 by the Massachusetts Institute of Technology.
 *	For copying and distribution information, see the file
 *	"mit-copyright.h". 
 */

#include "internal.h"

#ifndef WIN32
#include <pwd.h>
#endif

char *ZGetSender()
{
    struct passwd *pw;
#ifdef ZEPHYR_USES_KERBEROS
    char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ];
    static char sender[ANAME_SZ+INST_SZ+REALM_SZ+3] = "";
	long int kerror;
#else
    static char sender[128] = "";
#endif

#ifdef WIN32
	unsigned long sender_size = 127;
#endif

    /* Return it if already cached */

    /*    if (*sender)
	return (sender);
    */

#ifdef ZEPHYR_USES_KERBEROS
	if ((kerror = krb_get_tf_fullname((char *)TKT_FILE, pname, pinst, prealm)) == KSUCCESS)
    {
	(void) sprintf(sender, "%s%s%s@%s", pname, (pinst[0]?".":""),
		       pinst, prealm);
	return (sender);
    }
#endif

    /* XXX a uid_t is a u_short (now),  but getpwuid
     * wants an int. AARGH! */
#ifdef WIN32
    GetUserName(sender, &sender_size);
#else
    pw = getpwuid((int) getuid());
    if (!pw)
	return ("unknown");
    (void) sprintf(sender, "%s@%s", pw->pw_name, __Zephyr_realm);
#endif
    return (sender);
}

mercurial