revert mitdir stuff since that didn't happen

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 7a4cf46251ec2d5cc232ca158a4cf8ce1fdd0218..520909b79a8a6fa3e7125f0103900c02f1f81ed0 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -582,7 +582,7 @@ Menu user_menu = {
   NULLFUNC,
   NULLFUNC,
   "User Menu",
-  12,
+  11,
   {
     {ShowUserByLogin, NULLMENU, 2, {
        {"login", "Show user information by login name"},
@@ -618,7 +618,6 @@ Menu user_menu = {
     } },
     SUBMENU("pobox", "Post Office Box Menu", &pobox_menu),
     SUBMENU("krbmap", "User Kerberos Mappings", &krbmap_menu),
-    SUBMENU("mitdir", "MIT On-line Directory Preferences", &mitdir_menu),
   }
 };
 

diff --git a/clients/moira/user.c b/clients/moira/user.c
index 374a2cd2385e2da9c070e45644e6994c800b410a..dc6719a2c751eb223635c71f662241ca17618f6e 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -1005,94 +1005,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;
-}