Diane Delgado's changes for a fixed table-locking order

[moira.git] / lib / mr_auth.c

diff --git a/lib/mr_auth.c b/lib/mr_auth.c
index 1fbaeeeb678f3bee673f9bd8554de4b4cb548e29..d6db8ca0cbf146197b1074fb636fc984e01cf369 100644 (file)
--- a/lib/mr_auth.c
+++ b/lib/mr_auth.c
@@ -3,70 +3,78 @@
  *     $Author$
  *     $Header$
  *
- *     Copyright (C) 1987 by the Massachusetts Institute of Technology
- *
- *     $Log$
- *     Revision 1.2  1987-05-31 22:03:23  wesommer
- *     It's working better.
- *
- * Revision 1.1  87/05/20  03:11:18  wesommer
- * Initial revision
- * 
+ *     Copyright (C) 1987, 1990 by the Massachusetts Institute of Technology
+ *     For copying and distribution information, please see the file
+ *     <mit-copyright.h>.
  *
  *     Handles the client side of the sending of authenticators to
- * the sms server.     
+ * the mr server.      
  */
 
 #ifndef lint
 static char *rcsid_sms_auth_c = "$Header$";
 #endif lint
 
-#include "sms_private.h"
+#include <mit-copyright.h>
+#include "mr_private.h"
+#include <ctype.h>
 #include <krb.h>
+#include <krb_et.h>
+#include <string.h>
 
-extern int krb_err_base;
+/* Authenticate this client with the MR server.  prog is the name of the
+ * client program, and will be recorded in the database.
+ */
 
-int sms_auth()
+int mr_auth(prog)
+char *prog;
 {
-       int status;
-       sms_params *params = NULL, *reply = NULL;
-       KTEXT_ST auth;
-       
-       if (!_sms_conn) {
-               return SMS_NOT_CONNECTED;
-       }
+    register int status;
+    mr_params params_st;
+    char *args[2];
+    int argl[2];
+    char realm[REALM_SZ], host[BUFSIZ], *p;
+
+    register mr_params *params = &params_st;
+    mr_params *reply = NULL;
+    KTEXT_ST auth;
+
+    CHECK_CONNECTED;
        
-       /*
-        * Build a Kerberos authenticator.
-        */
+    /* Build a Kerberos authenticator. */
        
-       status = mk_ap_req(&auth, "sms", "sms", "ATHENA.MIT.EDU", 0);
-       if (status != KSUCCESS) {
-               status += krb_err_base;
-               goto punt;
-       }
-       params = (struct sms_params *) malloc(sizeof(*params));
-       params->sms_procno = SMS_AUTH;
-       params->sms_argc = 1;
+    memset(host, 0, sizeof(host));
+    if (status = mr_host(host, sizeof(host) - 1))
+       return status;
 
-       params->sms_argv = (char **)malloc(sizeof(char *) * 2);
-       params->sms_argl = (int *)malloc(sizeof(int) * 2);
-       params->sms_argv[0] = (char *)auth.dat;
-       params->sms_argl[0] = auth.length;
-       params->sms_argv[1] = NULL;
-       params->sms_argl[1] = 0;
-       
-       if ((status = sms_do_call(params, &reply)) || (status = reply->sms_status))
-               goto punt;
-punt:
-       sms_destroy_reply(reply);
-ok:
-       if(params) {
-               if(params->sms_argv)
-                       free(params->sms_argv);
-               if(params->sms_argl)
-                       free(params->sms_argl);
-               free(params);
-       }
+    strcpy(realm, (char *)krb_realmofhost(host));
+    for (p = host; *p && *p != '.'; p++)
+      if (isupper(*p))
+       *p = tolower(*p);
+    *p = 0;
+
+    status = krb_mk_req(&auth, MOIRA_SNAME, host, realm, 0);
+    if (status != KSUCCESS) {
+       status += ERROR_TABLE_BASE_krb;
        return status;
+    } 
+    params->mr_version_no = sending_version_no;
+    params->mr_procno = MR_AUTH;
+    params->mr_argc = 2;
+    params->mr_argv = args;
+    params->mr_argl = argl;
+    params->mr_argv[0] = (char *)auth.dat;
+    params->mr_argl[0] = auth.length;
+    params->mr_argv[1] = prog;
+    params->mr_argl[1] = strlen(prog) + 1;
+       
+    if (sending_version_no == MR_VERSION_1)
+       params->mr_argc = 1;
+
+    if ((status = mr_do_call(params, &reply)) == 0)
+       status = reply->mr_status;
+
+    mr_destroy_reply(reply);
+
+    return status;
 }