X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fpasswd-kerberos.c;h=bb8d99265eb6379debf527f852cd73ba4067eb10;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hp=26b2cb869d2c08032dfad7888af726a8db940903;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver diff --git a/driver/passwd-kerberos.c b/driver/passwd-kerberos.c index 26b2cb86..bb8d9926 100644 --- a/driver/passwd-kerberos.c +++ b/driver/passwd-kerberos.c @@ -1,7 +1,6 @@ /* kpasswd.c --- verify kerberos passwords. * written by Nat Lanza (magus@cs.cmu.edu) for - * xscreensaver, Copyright (c) 1993-1997, 1998, 2000, 2003 - * Jamie Zawinski + * xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -76,7 +75,7 @@ static char realm[REALM_SZ]; static char name[ANAME_SZ]; static char inst[INST_SZ]; - static char *tk_file; + static const char *tk_file; #endif /* !HAVE_DARWIN */ @@ -203,14 +202,14 @@ kerberos_passwd_valid_p (const char *typed_passwd, Bool verbose_p) sprintf(newtkfile, "/tmp/xscrn-%i.XXXXXX", getpid()); - if( (fh = mkstemp(newtktfile)) < 0) + if( (fh = mkstemp(newtkfile)) < 0) { - free(newtktfile); + free(newtkfile); return(False); } if( fchmod(fh, 0600) < 0) { - free(newtktfile); + free(newtkfile); return(False); } @@ -223,7 +222,7 @@ kerberos_passwd_valid_p (const char *typed_passwd, Bool verbose_p) des_string_to_key(typed_passwd, mitkey); if (krb_get_in_tkt(name, inst, realm, "krbtgt", realm, DEFAULT_TKT_LIFE, - key_to_key, NULL, mitkey) != 0) { + key_to_key, NULL, (char *) mitkey) != 0) { success = False; } else { success = True;