finalize -3

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

diff --git a/zephyr/lib/ZMkAuth.c b/zephyr/lib/ZMkAuth.c
index 1d1629686ab3ed20820adca4343da4f6f496061f..5a6749c2defdb8e12b8a95c2760f8c2a826c54f2 100644 (file)
--- a/zephyr/lib/ZMkAuth.c
+++ b/zephyr/lib/ZMkAuth.c
@@ -3,7 +3,7 @@
  *
  *     Created by:     Robert French
  *
- *     $Id: ZMkAuth.c,v 1.19 1999/01/22 23:19:16 ghudson Exp $
+ *     $Id$
  *
  *     Copyright (c) 1987 by the Massachusetts Institute of Technology.
  *     For copying and distribution information, see the file
@@ -13,79 +13,41 @@
 #include <internal.h>
 
 #ifndef lint
-static const char rcsid_ZMakeAuthentication_c[] = "$Id: ZMkAuth.c,v 1.19 1999/01/22 23:19:16 ghudson Exp $";
+static const char rcsid_ZMakeAuthentication_c[] = "$Id$";
 #endif
 
-Code_t ZResetAuthentication () {
 #ifdef HAVE_KRB4
-    int i;
-
-    for (i=0; i<__ngalaxies; i++)
-       __galaxy_list[i].last_authent_time = 0;
-
+#include <krb_err.h>
 #endif
+
+Code_t ZResetAuthentication () {
     return ZERR_NONE;
 }
 
-Code_t ZMakeAuthentication(notice, buffer, buffer_len, phdr_len)
+Code_t ZMakeAuthentication(notice, buffer, buffer_len, len)
     register ZNotice_t *notice;
     char *buffer;
     int buffer_len;
-    int *phdr_len;
+    int *len;
 {
 #ifdef HAVE_KRB4
-    int i;
-    int cksum_len;
     int result;
     time_t now;
     KTEXT_ST authent;
-    char *krealm, *cksum_start, *cstart, *cend;
+    char *cstart, *cend;
     ZChecksum_t checksum;
     CREDENTIALS cred;
+    extern unsigned long des_quad_cksum();
 
-    if (notice->z_dest_galaxy && *notice->z_dest_galaxy) {
-       for (i=0; i<__ngalaxies; i++) {
-           if (strcasecmp(notice->z_dest_galaxy,
-                          __galaxy_list[i].galaxy_config.galaxy) == 0)
-               break;
-       }
+    result = krb_mk_req(&authent, SERVER_SERVICE, 
+                       SERVER_INSTANCE, __Zephyr_realm, 0);
+    if (result != MK_AP_OK)
+       return (result+krb_err_base);
+    result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE,
+                         __Zephyr_realm, &cred);
+    if (result != KSUCCESS)
+       return (result+krb_err_base);
 
-       if (i == __ngalaxies)
-           return(ZERR_GALAXYUNKNOWN);
-    } else {
-       i = __default_galaxy;
-    }
-
-    krealm = __galaxy_list[i].krealm;
-
-    if (krealm[0] == '\0')
-#endif
-       {
-           notice->z_checksum = 0;
-           notice->z_auth = 1;
-           notice->z_authent_len = 0;
-           notice->z_ascii_authent = "";
-           return (Z_FormatRawHeader(notice, buffer, buffer_len, phdr_len,
-                                     NULL, NULL, NULL, NULL));
-       }
-
-#ifdef HAVE_KRB4
-    now = time(0);
-
-    if ((__galaxy_list[i].last_authent_time == 0) ||
-       (now - __galaxy_list[i].last_authent_time > 120)) {
-       result = krb_mk_req(&authent, SERVER_SERVICE, SERVER_INSTANCE,
-                           krealm, 0);
-       if (result != MK_AP_OK) {
-           __galaxy_list[i].last_authent_time = 0;
-           return (result+krb_err_base);
-        }
-       __galaxy_list[i].last_authent_time = now;
-       __galaxy_list[i].last_authent = authent;
-    }
-    else {
-       authent = __galaxy_list[i].last_authent;
-    }
     notice->z_auth = 1;
     notice->z_authent_len = authent.length;
     notice->z_ascii_authent = (char *)malloc((unsigned)authent.length*3);
@@ -99,27 +61,28 @@ Code_t ZMakeAuthentication(notice, buffer, buffer_len, phdr_len)
        free(notice->z_ascii_authent);
        return (result);
     }
-    result = Z_FormatRawHeader(notice, buffer, buffer_len, phdr_len,
-                              &cksum_start, &cksum_len, &cstart, &cend);
+    result = Z_FormatRawHeader(notice, buffer, buffer_len, len, &cstart,
+                              &cend);
     free(notice->z_ascii_authent);
     notice->z_authent_len = 0;
     if (result)
        return(result);
 
     /* Compute a checksum over the header and message. */
-
-    if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, 
-                              krealm, &cred)) != 0)
-       return result;
-    checksum = des_quad_cksum(cksum_start, NULL, cstart - cksum_start, 0,
-                             cred.session);
-    checksum ^= des_quad_cksum(cend, NULL, (cksum_start + cksum_len) - cend, 0,
+    checksum = des_quad_cksum(buffer, NULL, cstart - buffer, 0, cred.session);
+    checksum ^= des_quad_cksum(cend, NULL, buffer + *len - cend, 0,
                               cred.session);
     checksum ^= des_quad_cksum(notice->z_message, NULL, notice->z_message_len,
                               0, cred.session);
     notice->z_checksum = checksum;
-    ZMakeAscii32(cstart, (buffer + buffer_len) - cstart, checksum);
+    ZMakeAscii32(cstart, buffer + buffer_len - cstart, checksum);
 
     return (ZERR_NONE);
+#else
+    notice->z_checksum = 0;
+    notice->z_auth = 1;
+    notice->z_authent_len = 0;
+    notice->z_ascii_authent = "";
+    return (Z_FormatRawHeader(notice, buffer, buffer_len, len, NULL, NULL));
 #endif
 }