fix a cast to not generate a warning

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

diff --git a/clients/moira/user.c b/clients/moira/user.c
index 374a2cd2385e2da9c070e45644e6994c800b410a..e722b9c9a7f42c04beaa43ffb3bc37e17f2e5090 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -121,7 +121,8 @@ static void PrintUserInfo(char **info)
 #ifdef HAVE_GDSS
   sprintf(buf, "%s:%s", info[U_NAME], info[U_MITID]);
   si.rawsig = NULL;
-  status = GDSS_Verify(buf, strlen(buf), info[U_SIGNATURE], &si);
+  status = GDSS_Verify((unsigned char *)buf, strlen(buf),
+                      (unsigned char *)info[U_SIGNATURE], &si);
 #else /* GDSS */
   status = 0;
 #endif /* GDSS */
@@ -251,8 +252,24 @@ char **AskUserInfo(char **info, Bool name)
           SUB_ERROR)
     return NULL;
 
+  strcpy(temp_buf, info[U_UID]);
   if (GetValueFromUser("User's UID", &info[U_UID]) == SUB_ERROR)
     return NULL;
+  if (strcmp(info[U_UID], UNIQUE_UID) && strcmp(info[U_UID], temp_buf))
+    {
+      struct mqelem *elem = NULL;
+      if (do_mr_query("get_user_account_by_uid", 1, &info[U_UID],
+                     StoreInfo, &elem) == MR_SUCCESS)
+       {
+         Put_message("A user with that uid already exists in the database.");
+         Loop(QueueTop(elem), PrintUserInfo);
+         Loop(QueueTop(elem), FreeInfo);
+         FreeQueue(elem);
+         if (YesNoQuestion("Add new user anyway", TRUE) != TRUE)
+           return NULL;
+       }
+    }
+
   if (GetValueFromUser("User's shell", &info[U_SHELL]) == SUB_ERROR)
     return NULL;
   if (name)
@@ -291,7 +308,7 @@ char **AskUserInfo(char **info, Bool name)
   if (GetValueFromUser("Comments", &info[U_COMMENT]) == SUB_ERROR)
     return NULL;
 
-  if (!name)
+  if (!name || !atoi(info[U_STATE]))
     {
       if (YesNoQuestion("User needs secure Account Coupon to register",
                        atoi(info[U_SECURE]) ? TRUE : FALSE) == FALSE)
@@ -315,23 +332,25 @@ char **AskUserInfo(char **info, Bool name)
       else
        sprintf(temp_buf, "%s:%s", info[U_NAME], info[U_MITID]);
       si.rawsig = NULL;
-      i = GDSS_Verify(temp_buf, strlen(temp_buf), info[U_SIGNATURE], &si);
+      i = GDSS_Verify((unsigned char *)temp_buf, strlen(temp_buf),
+                     (unsigned char *)info[U_SIGNATURE], &si);
       /* If it's already signed OK, don't resign it. */
       if (i != GDSS_SUCCESS)
        {
          free(info[U_SIGNATURE]);
          info[U_SIGNATURE] = malloc(GDSS_Sig_Size() * 2);
        sign_again:
-         i = GDSS_Sign(temp_buf, strlen(temp_buf), info[U_SIGNATURE]);
+         i = GDSS_Sign((unsigned char *)temp_buf, strlen(temp_buf),
+                       (unsigned char *)info[U_SIGNATURE]);
          if (i != GDSS_SUCCESS)
            com_err(program_name, gdss2et(i), "Failed to create signature");
          else
            {
              unsigned char buf[256];
              si.rawsig = buf;
-             i = GDSS_Verify(temp_buf, strlen(temp_buf),
-                             info[U_SIGNATURE], &si);
-             if (strlen(buf) > 68)
+             i = GDSS_Verify((unsigned char *)temp_buf, strlen(temp_buf),
+                             (unsigned char *)info[U_SIGNATURE], &si);
+             if (strlen((char *)buf) > 68)
                goto sign_again;
            }
        }
@@ -1005,94 +1024,3 @@ int DeleteKrbmap(int argc, char **argv)
     com_err(program_name, stat, " in DeleteKrbMap.");
   return DM_NORMAL;
 }
-
-
-/*     Function Name: GetDirFlags
- *     Description: Shows MITdir listing preferences
- *     Arguments: argc, argv - argv[1] contains the user login name
- *     Returns: none.
- */
-
-int GetDirFlags(int argc, char **argv)
-{
-  int stat;
-  struct mqelem *elem = NULL;
-  char buf[BUFSIZ], **info;
-
-  if (!ValidName(argv[1]))
-    return DM_NORMAL;
-
-  if ((stat = do_mr_query("get_user_directory_flags", 1, &argv[1],
-                         StoreInfo, &elem)))
-    {
-      com_err(program_name, stat, " in GetDirFlags.");
-      return DM_NORMAL;
-    }
-
-  info = QueueTop(elem)->q_data;
-  FreeQueue(QueueTop(elem));
-
-  Put_message("");
-  sprintf(buf, "User: %s", argv[1]);
-  Put_message(buf);
-  if (atoi(info[0]) == 0)
-      Put_message("Does NOT appear in the on-line directory.");
-  else
-    {
-      Put_message("Does appear in the on-line directory.");
-      if (atoi(info[1]) == 0)
-       Put_message("Is listed with non-MIT.EDU email address (if any)");
-      else
-       Put_message("Is listed with MIT.EDU email address.");
-    }
-
-  return DM_NORMAL;
-}
-
-/*     Function Name: SetDirFlags
- *     Description: Update online directory preferences
- *     Arguments: argc, argv - the login name of the user in argv[1].
- *     Returns: DM_NORMAL.
- */
-
-int SetDirFlags(int argc, char **argv)
-{
-  int stat;
-  char **info, buf[BUFSIZ], *args[3];
-  struct mqelem *elem = NULL;
-
-  if (!ValidName(argv[1]))
-    return DM_NORMAL;
-
-  /* Fetch current prefs */
-  if ((stat = do_mr_query("get_user_directory_flags", 1, &argv[1],
-                         StoreInfo, &elem)))
-    {
-      com_err(program_name, stat, " in GetDirFlags.");
-      return DM_NORMAL;
-    }
-  info = QueueTop(elem)->q_data;
-  FreeQueue(QueueTop(elem));
-
-  sprintf(buf, "List %s in the on-line directory (y/n)", argv[1]);
-  if (YesNoQuestion(buf, !atoi(info[0])))
-    args[1] = "0";
-  else
-    args[1] = "1";
-
-  sprintf(buf, "List MIT.EDU email address even when mail is "
-         "forwarded elsewhere? (y/n)");
-  if (YesNoQuestion(buf, !atoi(info[1])))
-    args[2] = "0";
-  else
-    args[2] = "1";
-
-  args[0] = argv[1];
-  if ((stat = do_mr_query("update_user_directory_flags", 3,
-                         args, NULL, NULL)))
-    com_err(program_name, stat, " in SetDirFlags");
-  else
-    Put_message("Directory preferences set.");
-
-  return DM_NORMAL;
-}