Command line printer manipulation client, and build goo.

[moira.git] / lib / mr_auth.c

diff --git a/lib/mr_auth.c b/lib/mr_auth.c
index d6db8ca0cbf146197b1074fb636fc984e01cf369..4e1d6b0ab9803476934264ce975a1470533c153c 100644 (file)
--- a/lib/mr_auth.c
+++ b/lib/mr_auth.c
@@ -1,80 +1,165 @@
-/*
- *     $Source$
- *     $Author$
- *     $Header$
+/* $Id$
  *
- *     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 moira server
  *
- *     Handles the client side of the sending of authenticators to
- * the mr server.      
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
-#ifndef lint
-static char *rcsid_sms_auth_c = "$Header$";
-#endif lint
-
 #include <mit-copyright.h>
+#include <moira.h>
 #include "mr_private.h"
+
 #include <ctype.h>
-#include <krb.h>
-#include <krb_et.h>
+#include <stdio.h>
 #include <string.h>
 
-/* Authenticate this client with the MR server.  prog is the name of the
+#ifdef HAVE_KRB4
+#include <krb.h>
+#endif
+#include <krb5.h>
+
+krb5_context context = NULL;
+krb5_auth_context auth_con = NULL;
+
+RCSID("$Header$");
+
+/* Authenticate this client with the Moira server.  prog is the name of the
  * client program, and will be recorded in the database.
  */
 
-int mr_auth(prog)
-char *prog;
+int mr_auth(char *prog)
 {
-    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. */
-       
-    memset(host, 0, sizeof(host));
-    if (status = mr_host(host, sizeof(host) - 1))
-       return status;
-
-    strcpy(realm, (char *)krb_realmofhost(host));
-    for (p = host; *p && *p != '.'; p++)
+#ifdef HAVE_KRB4
+  int status;
+  mr_params params, reply;
+  char *args[2];
+  int argl[2];
+  char realm[REALM_SZ], host[BUFSIZ], *p;
+  KTEXT_ST auth;
+
+  CHECK_CONNECTED;
+
+  if ((status = mr_host(host, sizeof(host) - 1)))
+    return status;
+
+  strcpy(realm, 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);
+    }
+  *p = '\0';
 
-    return status;
+  status = krb_mk_req(&auth, MOIRA_SNAME, host, realm, 0);
+  if (status != KSUCCESS)
+    {
+      status += ERROR_TABLE_BASE_krb;
+      return status;
+    }
+  params.u.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 ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
+
+  mr_destroy_reply(reply);
+
+  return status;
+#else
+  return MR_NO_KRB4;
+#endif
+}
+
+int mr_proxy(char *principal, char *orig_authtype)
+{
+  int status;
+  mr_params params, reply;
+  char *args[2];
+
+  CHECK_CONNECTED;
+
+  params.u.mr_procno = MR_PROXY;
+  params.mr_argc = 2;
+  params.mr_argv = args;
+  params.mr_argv[0] = principal;
+  params.mr_argv[1] = orig_authtype;
+  params.mr_argl = NULL;
+
+  if ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
+
+  mr_destroy_reply(reply);
+
+  return status;
+}
+
+int mr_krb5_auth(char *prog)
+{
+  mr_params params, reply;
+  char host[BUFSIZ], *p;
+  char *args[2];
+  int argl[2];
+  krb5_ccache ccache = NULL;
+  krb5_data auth;
+  krb5_error_code problem = 0;
+
+  CHECK_CONNECTED;
+
+  memset(&auth, 0, sizeof(auth));
+
+  if ((problem = mr_host(host, sizeof(host) - 1)))
+    return problem;
+
+  if (!context)
+    {
+      problem = krb5_init_context(&context);
+      if (problem)
+       goto out;
+    }
+
+  problem = krb5_auth_con_init(context, &auth_con);
+  if (problem)
+    goto out;
+
+  problem = krb5_cc_default(context, &ccache);
+  if (problem)
+    goto out;
+
+  problem = krb5_mk_req(context, &auth_con, 0, MOIRA_SNAME, host, NULL, 
+                      ccache, &auth);
+  if (problem)
+    goto out;
+
+  params.u.mr_procno = MR_KRB5_AUTH;
+  params.mr_argc = 2;
+  params.mr_argv = args;
+  params.mr_argl = argl;
+  params.mr_argv[0] = (char *)auth.data;
+  params.mr_argl[0] = auth.length;
+  params.mr_argv[1] = prog;
+  params.mr_argl[1] = strlen(prog) + 1;
+
+  if ((problem = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    problem = reply.u.mr_status;
+
+  mr_destroy_reply(reply);
+
+ out:
+  if (ccache)
+    krb5_cc_close(context, ccache);
+  krb5_free_data_contents(context, &auth);
+  if (auth_con)
+    krb5_auth_con_free(context, auth_con);
+  auth_con = NULL;
+
+  return problem;
 }
+