fixed header again - tom

[moira.git] / server / mr_sauth.c

diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index 45b34a181537a6180dcffc9b7a5ce62032aace01..dcb45b23efa123a203c8010f8ab97eae9e5ffc34 100644 (file)
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -21,7 +21,6 @@ static char *rcsid_sms_sauth_c = "$Header$";
 
 extern char buf1[];
 extern char *whoami;
-extern char *malloc();
 
 char *kname_unparse();
 
@@ -77,11 +76,11 @@ 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->mr_version_no == MR_VERSION_2) {
-           bcopy(cl->args->mr_argv[1], cl->entity, 8);
+           strncpy(cl->entity, cl->args->mr_argv[1], 8);
            cl->entity[8] = 0;
        } else {
            strcpy(cl->entity, "???");
@@ -91,7 +90,9 @@ do_auth(cl)
        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)
+       if (status != MR_SUCCESS)
+         cl->reply.mr_status = status;
+       else if (cl->users_id == 0)
          cl->reply.mr_status = MR_USER_AUTH;
 }