X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fpasswd-kerberos.c;h=202e0eb10982395a2f1c1186545c55e7ec4da38e;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hp=26b2cb869d2c08032dfad7888af726a8db940903;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver

diff --git a/driver/passwd-kerberos.c b/driver/passwd-kerberos.c
index 26b2cb86..202e0eb1 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 <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -76,9 +75,13 @@
  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 */
 
+/* warning suppression: duplicated in passwd.c */
+extern Bool kerberos_lock_init (int argc, char **argv, Bool verbose_p);
+extern Bool kerberos_passwd_valid_p (const char *typed_passwd, Bool verbose_p);
+
 
 /* Called at startup to grab user, instance, and realm information
    from the user's ticketfile (remember, name.inst@realm). Since we're
@@ -203,14 +206,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 +226,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;