add cleandir/distclean target

[moira.git] / clients / addusr / addusr.c

diff --git a/clients/addusr/addusr.c b/clients/addusr/addusr.c
index 92da44afc28cb0a1ae12a71972580e7fb2d99e2a..96f18f3fd3c230116421ce15c70d234647437185 100644 (file)
--- a/clients/addusr/addusr.c
+++ b/clients/addusr/addusr.c
@@ -12,6 +12,7 @@
 #include <mit-copyright.h>
 #include <moira.h>
 #include <moira_site.h>
+#include <mrclient.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -36,21 +37,15 @@ int reg_only, reg, verbose, nodupcheck, securereg;
 char *whoami;
 int duplicate, errors;
 
-extern int ureg_init(void);
-extern int grab_login(char *first, char *last, char *idnumber,
-                     char *hashidnumber, char *login);
-extern int set_password(char *first, char *last, char *idnumber,
-                       char *hashidnumber, char *password);
-
-
 void usage(char **argv);
 int usercheck(int argc, char **argv, void *qargv);
+int get_uid(int argc, char **argv, void *qargv);
 
 int main(int argc, char **argv)
 {
   int status, lineno;
   char **arg = argv, *qargv[U_END];
-  char *motd, *p, *first, *middle, *last, *id, *login, *passwd, *server;
+  char *p, *first, *middle, *last, *id, *login, *server;
   char buf[BUFSIZ], idbuf[32];
   FILE *input;
 
@@ -159,41 +154,9 @@ int main(int argc, char **argv)
        }
     }
 
-  if (!reg_only)
-    {
-      /* fire up Moira */
-      if ((status = mr_connect(server)))
-       {
-         com_err(whoami, status, "unable to connect to the Moira server");
-         exit(2);
-       }
-      if ((status = mr_motd(&motd)))
-       {
-         com_err(whoami, status, "unable to check server status");
-         exit(2);
-       }
-      if (motd)
-       {
-         fprintf(stderr, "The Moira server is currently unavailable:\n%s\n",
-                 motd);
-         mr_disconnect();
-         exit(2);
-       }
-
-      if ((status = mr_auth("addusr")))
-       {
-         if (status == MR_USER_AUTH)
-           com_err(whoami, status, "");
-         else
-           {
-             com_err(whoami, status, "unable to authenticate to Moira");
-             exit(2);
-           }
-       }
-    }
-
-  if (reg || reg_only)
-    ureg_init();
+  /* fire up Moira */
+  if (mrcl_connect(server, "addusr", 1) != MRCL_SUCCESS)
+    exit(2);
 
   qargv[U_NAME] = UNIQUE_LOGIN;
   qargv[U_UID] = UNIQUE_UID;
@@ -228,19 +191,6 @@ int main(int argc, char **argv)
        p++;
       if (reg_only || reg)
        {
-         while (!isspace(*p))
-           p--;
-         if (p <= first)
-           {
-             com_err(whoami, 0, "Missing password on line %d", lineno);
-             errors++;
-             continue;
-           }
-         passwd = strtrim(&p[1]);
-         *p-- = '\0';
-         /* previous field is login name */
-         while (isspace(*p))
-           p--;
          while (!isspace(*p))
            p--;
          if (p <= first)
@@ -340,9 +290,26 @@ int main(int argc, char **argv)
        }
       if (reg || reg_only)
        {
-         EncryptID(idbuf, qargv[U_MITID], qargv[U_FIRST], qargv[U_LAST]);
-         status = grab_login(qargv[U_FIRST], qargv[U_LAST],
-                             qargv[U_MITID], idbuf, login);
+         char *gargv[2], *rargv[3], uid[10];
+
+         uid[0] = '\0';
+         gargv[0] = qargv[U_FIRST];
+         gargv[1] = qargv[U_LAST];
+         status = mr_query("get_user_account_by_name", 2, gargv,
+                           get_uid, &uid);
+         if (status)
+           {
+             com_err(whoami, status, "while looking up uid for %s %s",
+                     qargv[U_FIRST], qargv[U_LAST]);
+             errors++;
+             continue;
+           }
+
+         rargv[0] = uid;
+         rargv[1] = login;
+         rargv[2] = "0";
+
+         status = mr_query("register_user", 3, rargv, NULL, NULL);
          if (status)
            {
              com_err(whoami, status, "while registering (login) %s %s",
@@ -355,16 +322,6 @@ int main(int argc, char **argv)
              printf("Registered user %s %s as %s\n", qargv[U_FIRST],
                     qargv[U_LAST], login);
            }
-         status = set_password(qargv[U_FIRST], qargv[U_LAST],
-                               qargv[U_MITID], idbuf, passwd);
-         if (status)
-           {
-             com_err(whoami, status, "While registering (passwd) %s %s",
-                     qargv[U_FIRST], qargv[U_LAST]);
-             errors++;
-             continue;
-           } else if (verbose)
-             printf("Set password for user %s\n", login);
        }
     }
 
@@ -401,3 +358,19 @@ int usercheck(int argc, char **argv, void *qargv)
 
   return MR_CONT;
 }
+
+/* query callback to get uid of a just-added account */
+int get_uid(int argc, char **argv, void *uidv)
+{
+  char *uid = uidv;
+
+  if (uid[0] == '\0')
+    strcpy(uid, argv[U_UID]);
+  else
+    {
+      if (!strcmp(argv[U_MODWITH], "addusr"))
+       strcpy(uid, argv[U_UID]);
+    }
+
+  return MR_CONT;
+}