DBMS=ORACLE

[moira.git] / server / mr_sauth.c

diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index e4ec3d3407679ba8dafd9299ec5a22375c690e02..0abc038a869254d361d9f33b1306f3b38f19812a 100644 (file)
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -14,19 +14,20 @@ static char *rcsid_sms_sauth_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
-#include <strings.h>
-#include "sms_server.h"
+#include <string.h>
+#include "mr_server.h"
 #include <ctype.h>
 #include <krb_et.h>
+#include <moira.h>
 
 extern char buf1[];
 extern char *whoami;
-extern char *malloc();
 
-char *kname_unparse();
+/* from libmoira */
+char *kname_unparse(char *, char *, char *);
 
 /*
- * Handle a SMS_AUTH RPC request.
+ * Handle a MOIRA_AUTH RPC request.
  *
  * argv[0] is a kerberos authenticator.  Decompose it, and if
  * successful, store the name the user authenticated to in 
@@ -40,10 +41,11 @@ do_auth(cl)
        KTEXT_ST auth;
        AUTH_DAT ad;
        int status, ok;
-       char buf[REALM_SZ+INST_SZ+ANAME_SZ], hostbuf[BUFSIZ], *host, *p;
+       char hostbuf[BUFSIZ], *host, *p;
+       extern int errno;
 
-       auth.length = cl->args->sms_argl[0];
-       bcopy(cl->args->sms_argv[0], (char *)auth.dat, auth.length);
+       auth.length = cl->args->mr_argl[0];
+       memcpy((char *)auth.dat, cl->args->mr_argv[0], auth.length);
        auth.mbz = 0;
        if (gethostname(hostbuf, sizeof(hostbuf)) < 0)
          com_err(whoami, errno, "Unable to get local hostname");
@@ -53,19 +55,19 @@ do_auth(cl)
            *p = tolower(*p);
        *p = 0;
 
-       if ((status = krb_rd_req (&auth, MOIRA_SNAME, host, cl->haddr.sin_addr,
-                                &ad, "")) != 0) {
+       if ((status = krb_rd_req (&auth, MOIRA_SNAME, host,
+                                 cl->haddr.sin_addr.s_addr, &ad, "")) != 0) {
                status += ERROR_TABLE_BASE_krb;
-               cl->reply.sms_status = status;
+               cl->reply.mr_status = status;
                if (log_flags & LOG_RES)
                        com_err(whoami, status, "(authentication failed)");
                return;
        }
        free(host);
 
-       bcopy(ad.pname, cl->kname.name, ANAME_SZ);
-       bcopy(ad.pinst, cl->kname.inst, INST_SZ);
-       bcopy(ad.prealm, cl->kname.realm, REALM_SZ);
+       memcpy(cl->kname.name, ad.pname, ANAME_SZ);
+       memcpy(cl->kname.inst, ad.pinst, INST_SZ);
+       memcpy(cl->kname.realm, ad.prealm, REALM_SZ);
        strcpy(cl->clname, kname_unparse(ad.pname, ad.pinst, ad.prealm));
 
        if (ad.pinst[0] == 0 && !strcmp(ad.prealm, krb_realm))
@@ -73,102 +75,22 @@ do_auth(cl)
        else
          ok = 0;
        /* this is in a separate function because it accesses the database */
-       set_krb_mapping(cl->clname, ad.pname, ok,
-                       &cl->client_id, &cl->users_id);
+       status = set_krb_mapping(cl->clname, ad.pname, ok,
+                                &cl->client_id, &cl->users_id);
 
-       if (cl->args->sms_version_no == SMS_VERSION_2) {
-           bcopy(cl->args->sms_argv[1], cl->entity, 8);
+       if (cl->args->mr_version_no == MR_VERSION_2) {
+           strncpy(cl->entity, cl->args->mr_argv[1], 8);
            cl->entity[8] = 0;
        } else {
            strcpy(cl->entity, "???");
        }
-       bzero(&ad, sizeof(ad)); /* Clean up session key, etc. */
+       memset(&ad, 0, sizeof(ad));     /* Clean up session key, etc. */
 
        if (log_flags & LOG_RES)
            com_err(whoami, 0, "Auth to %s using %s, uid %d cid %d",
                    cl->clname, cl->entity, cl->users_id, cl->client_id);
-       if (cl->users_id == 0)
-         cl->reply.sms_status = SMS_USER_AUTH;
-}
-
-
-/* Turn a principal, instance, realm triple into a single non-ambiguous 
- * string.  This is the inverse of kname_parse().  It returns a pointer
- * to a static buffer, or NULL on error.
- */
-
-char *kname_unparse(p, i, r)
-char *p;
-char *i;
-char *r;
-{
-    static char name[MAX_K_NAME_SZ];
-    char *s;
-
-    s = name;
-    if (!p || strlen(p) > ANAME_SZ)
-      return(NULL);
-    while (*p) {
-       switch (*p) {
-       case '@':
-           *s++ = '\\';
-           *s++ = '@';
-           break;
-       case '.':
-           *s++ = '\\';
-           *s++ = '.';
-           break;
-       case '\\':
-           *s++ = '\\';
-           *s++ = '\\';
-           break;
-       default:
-           *s++ = *p;
-       }
-       p++;
-    }
-    if (i && *i) {
-       if (strlen(i) > INST_SZ)
-         return(NULL);
-       *s++ = '.';
-       while (*i) {
-           switch (*i) {
-           case '@':
-               *s++ = '\\';
-               *s++ = '@';
-               break;
-           case '.':
-               *s++ = '\\';
-               *s++ = '.';
-               break;
-           case '\\':
-               *s++ = '\\';
-               *s++ = '\\';
-               break;
-           default:
-               *s++ = *i;
-           }
-           i++;
-       }
-    }
-    *s++ = '@';
-    if (!r || strlen(r) > REALM_SZ)
-      return(NULL);
-    while (*r) {
-       switch (*r) {
-       case '@':
-           *s++ = '\\';
-           *s++ = '@';
-           break;
-       case '\\':
-           *s++ = '\\';
-           *s++ = '\\';
-           break;
-       default:
-           *s++ = *r;
-       }
-       r++;
-    }
-    *s = '\0';
-    return(&name[0]);
+       if (status != MR_SUCCESS)
+         cl->reply.mr_status = status;
+       else if (cl->users_id == 0)
+         cl->reply.mr_status = MR_USER_AUTH;
 }