import zephyr 3.0~rc2544

[1ts-debian.git] / zephyr / lib / ZMkAuth.c

diff --git a/zephyr/lib/ZMkAuth.c b/zephyr/lib/ZMkAuth.c
index f1fd9634c03670bcb261ab03b91fcad634e2c99f..42c8477a1980bd33e891e896b572e0c58d1f9e60 100644 (file)
--- a/zephyr/lib/ZMkAuth.c
+++ b/zephyr/lib/ZMkAuth.c
@@ -3,7 +3,7 @@
  *
  *     Created by:     Robert French
  *
- *     $Id: ZMkAuth.c 2385 2009-04-03 05:30:57Z kcr@ATHENA.MIT.EDU $
+ *     $Id: ZMkAuth.c 2502 2009-07-26 21:25:27Z kcr@ATHENA.MIT.EDU $
  *
  *     Copyright (c) 1987 by the Massachusetts Institute of Technology.
  *     For copying and distribution information, see the file
@@ -13,7 +13,7 @@
 #include <internal.h>
 
 #ifndef lint
-static const char rcsid_ZMakeAuthentication_c[] = "$Id: ZMkAuth.c 2385 2009-04-03 05:30:57Z kcr@ATHENA.MIT.EDU $";
+static const char rcsid_ZMakeAuthentication_c[] = "$Id: ZMkAuth.c 2502 2009-07-26 21:25:27Z kcr@ATHENA.MIT.EDU $";
 #endif
 
 #ifdef HAVE_KRB4
@@ -98,6 +98,7 @@ ZMakeAuthentication(register ZNotice_t *notice,
 #endif
 }
 
+/* only used by server? */
 Code_t
 ZMakeZcodeAuthentication(register ZNotice_t *notice,
                         char *buffer,
@@ -110,10 +111,10 @@ ZMakeZcodeAuthentication(register ZNotice_t *notice,
 
 Code_t
 ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
-                             char *buffer,
-                             int buffer_len,
-                             int *phdr_len,
-                             char *realm)
+                              char *buffer,
+                              int buffer_len,
+                              int *phdr_len,
+                              char *realm)
 {
 #ifdef HAVE_KRB5
     krb5_error_code result;
@@ -184,7 +185,7 @@ ZMakeZcodeRealmAuthentication(register ZNotice_t *notice,
     }
     result = Z_InsertZcodeChecksum(keyblock, notice, buffer, cksum_start,
                                    cksum_len, cstart, cend, buffer_len,
-                                   &phdr_adj);
+                                   &phdr_adj, 0);
     krb5_free_creds(Z_krb5_ctx, creds);
     if (result) {
          return result;
@@ -234,12 +235,6 @@ ZGetCredsRealm(krb5_creds **creds_out,
     return result;
   }
 
-#ifdef HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE
-  creds_in.keyblock.enctype = ENCTYPE_DES_CBC_CRC; /* XXX? */
-#else
-  creds_in.session.keytype = KEYTYPE_DES; /* XXX? */
-#endif
-
   result = krb5_get_credentials(Z_krb5_ctx, 0, ccache, &creds_in, creds_out);
   krb5_cc_close(Z_krb5_ctx, ccache);
   krb5_free_cred_contents(Z_krb5_ctx, &creds_in); /* I also hope this is ok */