rename struct qelem to struct mqelem to avoid conflicts with the REAL

struct qelem

diff --git a/clients/moira/attach.c b/clients/moira/attach.c
index 12d1ba68710ffe93dd6fe437498b0d652827e83c..e8398a5f79a2bcc0b5e07d13a5d90a5ff9492327 100644 (file)
--- a/clients/moira/attach.c
+++ b/clients/moira/attach.c
@@ -35,7 +35,7 @@ RCSID("$Header$");
 char *canonicalize_cell(char *c);
 int GetAliasValue(int argc, char **argv, void *retval);
 void RealDeleteFS(char **info, Bool one_item);
-char *SortAfter(struct qelem *elem, int count);
+char *SortAfter(struct mqelem *elem, int count);
 void RealDeleteFSAlias(char **info, Bool one_item);
 
 #define FS_ALIAS_TYPE "FILESYS"
@@ -91,10 +91,10 @@ static char **SetDefaults(char **info, char *name)
  *     Returns: a pointer to the first element in the queue.
  */
 
-static struct qelem *GetFSInfo(int type, char *name)
+static struct mqelem *GetFSInfo(int type, char *name)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *args[5];
 
   switch (type)
@@ -180,7 +180,7 @@ static char *PrintFSInfo(char **info)
   if (!strcmp(info[FS_TYPE], "FSGROUP") || !strcmp(info[FS_TYPE], "MUL"))
     {
       int stat;
-      struct qelem *elem = NULL;
+      struct mqelem *elem = NULL;
 
       if (!strcmp(info[FS_TYPE], "MUL"))
        sprintf(print_buf, "%20s Multiple Filesystem: %s", " ", info[FS_NAME]);
@@ -453,7 +453,7 @@ static char **AskFSInfo(char **info, Bool name)
 
 int GetFS(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetFSInfo(LABEL, argv[1]); /* get info. */
   Loop(top, (void (*)(char **))PrintFSInfo);
@@ -469,7 +469,7 @@ int GetFS(int argc, char **argv)
 
 int GetFSM(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   argv[1] = canonicalize_hostname(strdup(argv[1]));
   top = GetFSInfo(MACHINE, argv[1]); /* get info. */
@@ -517,7 +517,7 @@ void RealDeleteFS(char **info, Bool one_item)
 
 int DeleteFS(int argc, char **argv)
 {
-  struct qelem *elem = GetFSInfo(LABEL, argv[1]);
+  struct mqelem *elem = GetFSInfo(LABEL, argv[1]);
   QueryLoop(elem, PrintFSInfo, RealDeleteFS, "Delete the Filesystem");
 
   FreeQueue(elem);
@@ -576,7 +576,7 @@ static void RealChangeFS(char **info, Bool junk)
 
 int ChangeFS(int argc, char **argv)
 {
-  struct qelem *elem = GetFSInfo(LABEL, argv[1]);
+  struct mqelem *elem = GetFSInfo(LABEL, argv[1]);
   QueryLoop(elem, NullPrint, RealChangeFS, "Update the Filesystem");
 
   FreeQueue(elem);
@@ -645,7 +645,7 @@ int AddFS(int argc, char **argv)
       static char *val[] = {"def_quota", NULL};
       static char *def_quota = NULL;
       char *argv[Q_QUOTA + 1];
-      struct qelem *top = NULL;
+      struct mqelem *top = NULL;
 
       if (!def_quota)
        {
@@ -699,7 +699,7 @@ int AddFS(int argc, char **argv)
  *     Returns: sort key to use.
  */
 
-char *SortAfter(struct qelem *elem, int count)
+char *SortAfter(struct mqelem *elem, int count)
 {
   char *prev, *next, prevnext, *key, keybuf[9];
 
@@ -751,7 +751,7 @@ char *SortAfter(struct qelem *elem, int count)
 int AddFSToGroup(int argc, char **argv)
 {
   int stat, count;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char buf[BUFSIZ], *args[5], *bufp;
 
   if ((stat = do_mr_query("get_fsgroup_members", 1, argv + 1, StoreInfo,
@@ -827,7 +827,7 @@ int RemoveFSFromGroup(int argc, char **argv)
 int ChangeFSGroupOrder(int argc, char **argv)
 {
   int stat, src, dst, i;
-  struct qelem *elem = NULL, *top, *tmpelem;
+  struct mqelem *elem = NULL, *top, *tmpelem;
   char buf[BUFSIZ], *bufp, *args[3];
 
   if ((stat = do_mr_query("get_fsgroup_members", 1, argv + 1, StoreInfo,
@@ -930,7 +930,7 @@ int ChangeFSGroupOrder(int argc, char **argv)
 
 int GetFSAlias(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetFSInfo(ALIAS, argv[1]);
   Put_message(" ");            /* blank line. */
@@ -950,7 +950,7 @@ int GetFSAlias(int argc, char **argv)
 int CreateFSAlias(int argc, char **argv)
 {
   int stat;
-  struct qelem *elem, *top;
+  struct mqelem *elem, *top;
   char *args[MAX_ARGS_SIZE], buf[BUFSIZ], **info;
 
   elem = NULL;
@@ -1042,7 +1042,7 @@ void RealDeleteFSAlias(char **info, Bool one_item)
 
 int DeleteFSAlias(int argc, char **argv)
 {
-  struct qelem *elem = GetFSInfo(ALIAS, argv[1]);
+  struct mqelem *elem = GetFSInfo(ALIAS, argv[1]);
   QueryLoop(elem, PrintFSAlias, RealDeleteFSAlias,
            "Delete the Filesystem Alias");
   FreeQueue(elem);

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index 5138fcd67322f3b7ef03e3fb5754165a18d0abd4..04509926d621b76a9ad4d169eb04f478ae25cb10 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -22,6 +22,7 @@
 #include "f_defs.h"
 #include "globals.h"
 
+#include <sys/types.h>
 #include <sys/utsname.h>
 
 #include <netinet/in.h>
@@ -34,7 +35,7 @@
 #include <string.h>
 
 void PrintAliases(char **info);
-struct qelem *GetMCInfo(int type, char *name1, char *name2);
+struct mqelem *GetMCInfo(int type, char *name1, char *name2);
 char **AskMCDInfo(char **info, int type, Bool name);
 int CheckAndRemoveFromCluster(char *name, Bool ask_user);
 int CheckAndRemoveMachines(char *name, Bool ask_first);
@@ -179,7 +180,7 @@ static char *PrintMachInfo(char **info)
 {
   char buf[BUFSIZ], tbuf[256];
   char *args[3];
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   int stat;
 
   Put_message("");
@@ -348,10 +349,10 @@ static char *PrintSubnetInfo(char **info)
  *     Returns: the top element of a queue containing the data or NULL.
  */
 
-struct qelem *GetMCInfo(int type, char *name1, char *name2)
+struct mqelem *GetMCInfo(int type, char *name1, char *name2)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *args[5];
 
   switch (type)
@@ -667,7 +668,7 @@ char **AskMCDInfo(char **info, int type, Bool name)
 
 int ShowMachineInfo(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   char *tmpname;
 
   tmpname = canonicalize_hostname(strdup(argv[1]));
@@ -692,7 +693,7 @@ int ShowMachineInfo(int argc, char **argv)
 int ShowMachineQuery(int argc, char **argv)
 {
   int stat;
-  struct qelem *top, *elem = NULL;
+  struct mqelem *top, *elem = NULL;
   char *args[5];
 
   if (!strcmp(argv[1], "") && !strcmp(argv[2], "") &&
@@ -743,7 +744,7 @@ int AddMachine(int argc, char **argv)
 {
   char **args, *info[MAX_ARGS_SIZE], *name, buf[256], *xargs[5];
   char **rinfo;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   int stat;
 
   if (!ValidName(argv[1]))     /* Checks for wildcards. */
@@ -842,7 +843,7 @@ static void RealUpdateMachine(char **info, Bool junk)
 
 int UpdateMachine(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   char *tmpname;
 
   tmpname = canonicalize_hostname(strdup(argv[1]));
@@ -867,7 +868,7 @@ int CheckAndRemoveFromCluster(char *name, Bool ask_user)
   int stat, ret_value;
   Bool delete_it;
   char *args[10], temp_buf[BUFSIZ], *ptr;
-  struct qelem *top, *elem = NULL;
+  struct mqelem *top, *elem = NULL;
 
   ret_value = SUB_NORMAL;      /* initialize ret_value. */
   args[0] = name;
@@ -968,7 +969,7 @@ static void RealDeleteMachine(char **info, Bool one_machine)
 
 int DeleteMachine(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   char *tmpname;
 
   tmpname = canonicalize_hostname(strdup(argv[1]));
@@ -1014,7 +1015,7 @@ char *partial_canonicalize_hostname(char *s)
 
 int ShowCname(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   char *tmpalias, *tmpname;
 
   tmpalias = partial_canonicalize_hostname(strdup(argv[1]));
@@ -1079,7 +1080,7 @@ int AddMachineToCluster(int argc, char **argv)
   int stat;
   char *machine, *cluster, temp_buf[BUFSIZ], *args[10];
   Bool add_it, one_machine, one_cluster;
-  struct qelem *melem, *mtop, *celem, *ctop;
+  struct mqelem *melem, *mtop, *celem, *ctop;
 
   machine = canonicalize_hostname(strdup(argv[1]));
   if (strcasecmp(machine, argv[1]) && *argv[1] != '"')
@@ -1197,7 +1198,7 @@ static void RealRemoveMachineFromCluster(char **info, Bool one_map)
 
 int RemoveMachineFromCluster(int argc, char **argv)
 {
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char buf[BUFSIZ], * args[10];
   int stat;
 
@@ -1243,7 +1244,7 @@ int RemoveMachineFromCluster(int argc, char **argv)
 
 int ShowSubnetInfo(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetMCInfo(SUBNET, argv[1], (char *) NULL);
   Loop(top, (void *) PrintSubnetInfo);
@@ -1325,7 +1326,7 @@ static void RealUpdateSubnet(char **info, Bool junk)
 
 int UpdateSubnet(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   top = GetMCInfo(SUBNET, argv[1], NULL);
   QueryLoop(top, NullPrint, RealUpdateSubnet, "Update the subnet");
 
@@ -1374,7 +1375,7 @@ static void RealDeleteSubnet(char **info, Bool one_subnet)
 
 int DeleteSubnet(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetMCInfo(SUBNET, argv[1], NULL);
   QueryLoop(top, PrintSubnetInfo, RealDeleteSubnet, "Delete the subnet");
@@ -1393,7 +1394,7 @@ int DeleteSubnet(int argc, char **argv)
 
 int ShowClusterInfo(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetMCInfo(CLUSTER, argv[1], NULL);
   Loop(top, (void *) PrintClusterInfo);
@@ -1477,7 +1478,7 @@ static void RealUpdateCluster(char **info, Bool junk)
 
 int UpdateCluster(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
   top = GetMCInfo(CLUSTER, argv[1], NULL);
   QueryLoop(top, NullPrint, RealUpdateCluster, "Update the cluster");
 
@@ -1499,7 +1500,7 @@ int CheckAndRemoveMachines(char *name, Bool ask_first)
   int stat, ret_value;
   Bool delete_it;
   char *args[10], temp_buf[BUFSIZ], *ptr;
-  struct qelem *top, *elem = NULL;
+  struct mqelem *top, *elem = NULL;
 
   ret_value = SUB_NORMAL;
   args[MAP_MACHINE] = "*";
@@ -1607,7 +1608,7 @@ static void RealDeleteCluster(char **info, Bool one_cluster)
 
 int DeleteCluster(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetMCInfo(CLUSTER, argv[1], NULL);
   QueryLoop(top, PrintClusterInfo, RealDeleteCluster, "Delete the cluster");
@@ -1627,7 +1628,7 @@ int DeleteCluster(int argc, char **argv)
 
 int ShowClusterData(int argc, char **argv)
 {
-  struct qelem *elem, *top;
+  struct mqelem *elem, *top;
   char **info;
 
   top = elem = GetMCInfo(DATA, argv[1], argv[2]);
@@ -1697,7 +1698,7 @@ static void RealRemoveClusterData(char **info, Bool one_item)
 
 int RemoveClusterData(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetMCInfo(DATA, argv[1], argv[2]);
   QueryLoop(top, PrintClusterData, RealRemoveClusterData,
@@ -1716,7 +1717,7 @@ int RemoveClusterData(int argc, char **argv)
 
 int MachineToClusterMap(int argc, char **argv)
 {
-  struct qelem *elem, *top;
+  struct mqelem *elem, *top;
   char *tmpname, temp_buf[256];
 
   tmpname = canonicalize_hostname(strdup(argv[1]));

diff --git a/clients/moira/defs.h b/clients/moira/defs.h
index 062c44be134e3caa5af404d9e1a3ded6b8251a02..1f1b0768ba654379adf352d363affbabeec816be 100644 (file)
--- a/clients/moira/defs.h
+++ b/clients/moira/defs.h
@@ -52,11 +52,11 @@ typedef int Bool;
 
 #define FORMFEED     Put_message(" ")
 
-/* for use with insqueue and remque. */
+/* NOT for use with insqueue and remque. */
 
-struct qelem {
-  struct qelem *q_forw;
-  struct qelem *q_back;
+struct mqelem {
+  struct mqelem *q_forw;
+  struct mqelem *q_back;
   void *q_data;
 };
 

diff --git a/clients/moira/delete.c b/clients/moira/delete.c
index 6a92fa99fba74e97bb172f983ff250c5b98cef70..379069db9bf6384cc035f40f413be47e8562e24e 100644 (file)
--- a/clients/moira/delete.c
+++ b/clients/moira/delete.c
@@ -28,7 +28,7 @@ RCSID("$Header$");
 int CheckListForDeletion(char *name, Bool verbose);
 void CheckAce(char *type, char *name, Bool verbose);
 int CheckIfAce(char *name, char *type, Bool verbose);
-int RemoveItemFromLists(char *name, char *type, struct qelem **elem,
+int RemoveItemFromLists(char *name, char *type, struct mqelem **elem,
                        int verbose);
 int RemoveMembersOfList(char *name, Bool verbose);
 int DeleteUserGroup(char *name, Bool verbose);
@@ -45,7 +45,7 @@ void AttemptToDeleteList(char **list_info, Bool ask_first);
 
 int CheckListForDeletion(char *name, Bool verbose)
 {
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   int status;
   char *args[2], buf[BUFSIZ], **info;
 
@@ -135,7 +135,7 @@ void CheckAce(char *type, char *name, Bool verbose)
 int CheckIfAce(char *name, char *type, Bool verbose)
 {
   char *args[2], buf[BUFSIZ], **info;
-  struct qelem *local, *elem;
+  struct mqelem *local, *elem;
   int status;
   elem = NULL;
 
@@ -192,10 +192,10 @@ int CheckIfAce(char *name, char *type, Bool verbose)
  *     Returns: SUB_ERROR if there is an error.
  */
 
-int RemoveItemFromLists(char *name, char *type, struct qelem **elem,
+int RemoveItemFromLists(char *name, char *type, struct mqelem **elem,
                        int verbose)
 {
-  struct qelem *local;
+  struct mqelem *local;
   char *args[10], temp_buf[BUFSIZ];
   int lists;
   int status;
@@ -283,7 +283,7 @@ int RemoveItemFromLists(char *name, char *type, struct qelem **elem,
 int RemoveMembersOfList(char *name, Bool verbose)
 {
   char buf[BUFSIZ], *args[10];
-  struct qelem *local, *elem = NULL;
+  struct mqelem *local, *elem = NULL;
   int status, members;
   /*
    * Get the members of this list.
@@ -503,7 +503,7 @@ static int RealDeleteList(char *name)
 void AttemptToDeleteList(char **list_info, Bool ask_first)
 {
   int status;
-  struct qelem *local, *member_of;
+  struct mqelem *local, *member_of;
   char *name = list_info[L_NAME];
   member_of = NULL;
 
@@ -581,7 +581,7 @@ void AttemptToDeleteList(char **list_info, Bool ask_first)
 int DeleteList(int argc, char *argv[])
 {
   char buf[BUFSIZ];
-  struct qelem *top, *list;
+  struct mqelem *top, *list;
   int status;
   Bool one_list;
 
@@ -652,7 +652,7 @@ int DeleteUser(int argc, char **argv)
   char buf[BUFSIZ];
   char *name = argv[1];        /* name of the user we are deleting. */
 #ifndef ATHENA
-  struct qelem *local, *member_of = NULL;
+  struct mqelem *local, *member_of = NULL;
 #endif
 
   if (!ValidName(name))

diff --git a/clients/moira/f_defs.h b/clients/moira/f_defs.h
index d6b5a1176eba9ba014629e4a623deea7f8677290..aa30b0508ccefd608133f0edc76d4e85d60f2d59 100644 (file)
--- a/clients/moira/f_defs.h
+++ b/clients/moira/f_defs.h
@@ -191,10 +191,10 @@ int ShowAlias(int argc, char **argv);
 
 char **CopyInfo(char **info);
 void FreeInfo(char **);
-void FreeQueue(struct qelem *elem);
+void FreeQueue(struct mqelem *elem);
 void FreeAndClear(char **pointer, Bool free_it);
-void Loop(struct qelem *elem, void (*func)(char **));
-void QueryLoop(struct qelem *elem, char * (*print_func)(char **),
+void Loop(struct mqelem *elem, void (*func)(char **));
+void QueryLoop(struct mqelem *elem, char * (*print_func)(char **),
               void (*op_func)(char **, Bool), char *query_string);
 void SlipInNewName(char **info, char *name);
 int CountArgs(char **args);
@@ -208,7 +208,7 @@ int StoreInfo(int argc, char **argv, void *data);
 int ToggleVerboseMode(int argc, char **argv);
 char *NullPrint(char **info);
 char *atot(char *itime);
-struct qelem *QueueTop(struct qelem *elem);
+struct mqelem *QueueTop(struct mqelem *elem);
 Bool Confirm(char *prompt);
 Bool YesNoQuestion(char *prompt, int bool_def);
 Bool YesNoQuitQuestion(char *prompt, int bool_def);
@@ -217,8 +217,8 @@ int do_mr_query(char *name, int argc, char **argv,
 int GetTypeFromUser(char *prompt, char *tname, char **pointer);
 int GetAddressFromUser(char *prompt, char **pointer);
 Bool ValidName(char *s);
-int QueueCount(struct qelem *elem);
+int QueueCount(struct mqelem *elem);
 int PromptWithDefault(char *prompt, char *buf, int buflen, char *def);
-struct qelem *GetTypeValues(char *tname);
+struct mqelem *GetTypeValues(char *tname);
 
 #endif /* _f_defs_ */

diff --git a/clients/moira/lists.c b/clients/moira/lists.c
index 4776e71b1e53601d9699135b5a9da4a03afe5914..f3fce71d82dd5580ac80808239956661ab1ec4e9 100644 (file)
--- a/clients/moira/lists.c
+++ b/clients/moira/lists.c
@@ -25,7 +25,7 @@
 
 RCSID("$Header$");
 
-struct qelem *GetListInfo(int type, char *name1, char *name2);
+struct mqelem *GetListInfo(int type, char *name1, char *name2);
 char **AskListInfo(char **info, Bool name);
 int AddList(int argc, char **argv);
 void ListMembersByType(char *type);
@@ -117,10 +117,10 @@ static void PrintListInfo(char **info)
  *     Returns: the first element in the queue.
  */
 
-struct qelem *GetListInfo(int type, char *name1, char *name2)
+struct mqelem *GetListInfo(int type, char *name1, char *name2)
 {
   char *args[2];
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   int status;
 
   switch (type)
@@ -253,7 +253,7 @@ char **AskListInfo(char **info, Bool name)
 
 int ShowListInfo(int argc, char **argv)
 {
-  struct qelem *top, *list;
+  struct mqelem *top, *list;
 
   top = list = GetListInfo(LIST, argv[1], NULL);
   while (list)
@@ -277,7 +277,7 @@ static void RealUpdateList(char **info, Bool junk)
 {
   int stat;
   char **args;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if (!(args = AskListInfo(info, TRUE)))
     {
@@ -326,7 +326,7 @@ static void RealUpdateList(char **info, Bool junk)
 
 int UpdateList(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetListInfo(LIST, argv[1], (char *) NULL);
   QueryLoop(top, NullPrint, RealUpdateList, "Update the list");
@@ -368,7 +368,7 @@ int AddList(int argc, char **argv)
 {
   static char *info[MAX_ARGS_SIZE], **add_args;
   int status, ret_code = SUB_NORMAL;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if (!ValidName(argv[1]))
     return DM_NORMAL;
@@ -636,7 +636,7 @@ int AddMember(int argc, char **argv)
 {
   char *args[10], temp_buf[BUFSIZ], *p;
   int status;
-  struct qelem *mailhubs, *elem;
+  struct mqelem *mailhubs, *elem;
 
   if (GetMemberInfo("add", args) == SUB_ERROR)
     return DM_NORMAL;
@@ -732,7 +732,7 @@ int InterRemoveItemFromLists(int argc, char **argv)
 {
   int status;
   char *type, *name, *args[10], buf[BUFSIZ];
-  struct qelem *top, *elem;
+  struct mqelem *top, *elem;
 
   type = strdup("USER");
   if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)
@@ -793,7 +793,7 @@ int ListByMember(int argc, char **argv)
 {
   char buf[BUFSIZ], temp_buf[BUFSIZ], *type, *name, **info;
   Bool maillist, group;
-  struct qelem *top, *elem;
+  struct mqelem *top, *elem;
 
   type = strdup("USER");
   if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)
@@ -840,7 +840,7 @@ int ListByMember(int argc, char **argv)
 int ListByAdministrator(int argc, char **argv)
 {
   char buf[BUFSIZ], temp_buf[BUFSIZ], *type, *name;
-  struct qelem *top;
+  struct mqelem *top;
 
   type = strdup("USER");
   if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 15c8b73db27099b6fd215c6c45e0e99a5af338de..4c7ec2869119d179036ad1b866d200c919be3e58 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -12,7 +12,9 @@
  * <mit-copyright.h>.
  */
 
-#include <mit-copyright.h>
+#include <stdio.h>
+
+#include "mit-copyright.h"
 #include <moira.h>
 #include "defs.h"
 #include "f_defs.h"

diff --git a/clients/moira/misc.c b/clients/moira/misc.c
index 8ac7d7b024ab13531d4199647052743e9105a848..bf3693dde642f7805d3f60f2fcbf86f4bd06c5c8 100644 (file)
--- a/clients/moira/misc.c
+++ b/clients/moira/misc.c
@@ -66,7 +66,7 @@ void PrintStats(char **info)
 int TableStats(int argc, char **argv)
 {
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((status = do_mr_query("get_all_table_stats", 0, NULL, StoreInfo, &elem)))
     {
@@ -116,7 +116,7 @@ void PrintClients(char **info)
 int ShowClients(int argc, char **argv)
 {
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((status = do_mr_query("_list_users", 0, NULL, StoreInfo, &elem)))
     {
@@ -152,7 +152,7 @@ void PrintValue(char **info)
 int ShowValue(int argc, char **argv)
 {
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((status = do_mr_query("get_value", 1, &argv[1], StoreInfo, &elem)))
     {
@@ -190,7 +190,7 @@ int ShowAlias(int argc, char **argv)
 {
   int status;
   char *info[4];
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   info[0] = argv[1];
   info[1] = argv[2];

diff --git a/clients/moira/nfs.c b/clients/moira/nfs.c
index 47ae6195b31f23c345edcb50dc88a4c6e1a68654..2fcdf0da4f8bbad2f1e55c9cb69e27c5728624b4 100644 (file)
--- a/clients/moira/nfs.c
+++ b/clients/moira/nfs.c
@@ -155,7 +155,7 @@ char **AskNFSInfo(char **info)
 int ShowNFSService(int argc, char **argv)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *args[10];
 
   if (!ValidName(argv[1]))
@@ -262,7 +262,7 @@ static void RealUpdateNFSService(char **info, Bool junk)
 int UpdateNFSService(int argc, char **argv)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *args[10];
 
   if (!ValidName(argv[1]))
@@ -312,7 +312,7 @@ static void FSPartPrint(char **info)
 static void RealDeleteNFSService(char **info, Bool one_item)
 {
   char temp_buf[BUFSIZ], *args[10];
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   int stat;
 
   sprintf(temp_buf,
@@ -364,7 +364,7 @@ static void RealDeleteNFSService(char **info, Bool one_item)
 int DeleteNFSService(int argc, char **argv)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *args[10];
 
   if (!ValidName(argv[1]))

diff --git a/clients/moira/pobox.c b/clients/moira/pobox.c
index c19e20ddf3dbef8e0749fbc1c878f0b712bf607b..310aeea4bf4a2542197e043911b588be8ab183f7 100644 (file)
--- a/clients/moira/pobox.c
+++ b/clients/moira/pobox.c
@@ -66,7 +66,7 @@ static int PrintPOMachines(void)
 {
   int status;
   static char *args[] = {"pop", NULL};
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
 
   if ((status = do_mr_query("get_server_locations", CountArgs(args), args,
                            StoreInfo, &top)))
@@ -90,7 +90,7 @@ static int PrintPOMachines(void)
 int GetUserPOBox(int argc, char **argv)
 {
   int status;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
   char buf[BUFSIZ];
 
   if (!ValidName(argv[1]))
@@ -150,7 +150,7 @@ int SetUserPOBox(int argc, char **argv)
   int status;
   char *type, temp_buf[BUFSIZ], *local_user, *args[10], box[BUFSIZ];
   char *temp_box;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
   local_user = argv[1];
 
   if (!ValidName(local_user))

diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index 0188d779e221c2ae34c1f1b23d94596aeca26c25..b06cef0c9d7b815f1c6d30c4e9d5590d8fe6ee4c 100644 (file)
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -66,10 +66,10 @@ static char **SetDefaults(char **info, char *name)
  *             if printer not found.
  */
 
-static struct qelem *GetPcapInfo(char *name)
+static struct mqelem *GetPcapInfo(char *name)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((stat = do_mr_query("get_printcap_entry", 1, &name, StoreInfo, &elem)))
     {
@@ -168,7 +168,7 @@ static char **AskPcapInfo(char **info)
 
 int GetPcap(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetPcapInfo(argv[1]); /* get info. */
   Loop(top, (void *) PrintPcapInfo);
@@ -203,7 +203,7 @@ void RealDeletePcap(char **info, Bool one_item)
 
 int DeletePcap(int argc, char **argv)
 {
-  struct qelem *elem = GetPcapInfo(argv[1]);
+  struct mqelem *elem = GetPcapInfo(argv[1]);
   QueryLoop(elem, PrintPcapInfo, RealDeletePcap, "Delete Printer");
 
   FreeQueue(elem);
@@ -293,7 +293,7 @@ void ChangePcap(char **info, Bool one_item)
 
 int ChngPcap(int argc, char **argv)
 {
-  struct qelem *elem = GetPcapInfo(argv[1]);
+  struct mqelem *elem = GetPcapInfo(argv[1]);
   QueryLoop(elem, NullPrint, ChangePcap, "Change the printer");
   FreeQueue(elem);
   return DM_NORMAL;
@@ -376,10 +376,10 @@ static char *PrintPalladiumInfo(char **info)
 }
 
 
-static struct qelem *GetPalladiumInfo(char *name)
+static struct mqelem *GetPalladiumInfo(char *name)
 {
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((status = do_mr_query("get_palladium", 1, &name, StoreInfo, &elem)))
     {
@@ -431,7 +431,7 @@ void RealDeletePalladium(char **info, Bool one_item)
 
 int GetPalladium(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetPalladiumInfo(argv[1]);
   Loop(top, (void (*)(char **))PrintPalladiumInfo);
@@ -477,7 +477,7 @@ int AddPalladium(int argc, char **argv)
 
 int ChngPalladium(int argc, char **argv)
 {
-  struct qelem *elem = GetPalladiumInfo(argv[1]);
+  struct mqelem *elem = GetPalladiumInfo(argv[1]);
   QueryLoop(elem, NullPrint, ChangePalladium, "Change the server/supervisor");
   FreeQueue(elem);
   return DM_NORMAL;
@@ -486,7 +486,7 @@ int ChngPalladium(int argc, char **argv)
 
 int DeletePalladium(int argc, char **argv)
 {
-  struct qelem *elem = GetPalladiumInfo(argv[1]);
+  struct mqelem *elem = GetPalladiumInfo(argv[1]);
   QueryLoop(elem, PrintPalladiumInfo, RealDeletePalladium,
            "Delete server/supervisor");
   FreeQueue(elem);
@@ -495,7 +495,7 @@ int DeletePalladium(int argc, char **argv)
 
 int ShowPalladiumAlias(int argc, char **argv)
 {
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char *qargv[3], buf[BUFSIZ];
   int status;
 

diff --git a/clients/moira/quota.c b/clients/moira/quota.c
index 7058443e570d8e7c620041fc785055d77b3d63bb..57c4539353a79c2aa5670b246880aee3fd059684 100644 (file)
--- a/clients/moira/quota.c
+++ b/clients/moira/quota.c
@@ -46,7 +46,7 @@ static char *GetDefaultUserQuota(Bool override)
 {
   int status;
   char **info;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
   static char *val[] = {"def_quota", NULL};
 
   if (override || (def_quota == NULL))
@@ -270,7 +270,7 @@ int ChangeDefaultQuota(int argc, char *argv[])
 
 int GetQuota(int argc, char **argv)
 {
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
   int status;
   char **args;
 
@@ -300,7 +300,7 @@ int GetQuota(int argc, char **argv)
 
 int GetQuotaByFilesys(int argc, char **argv)
 {
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
   int status;
   char **args = malloc(2 * sizeof(char *));
 
@@ -391,7 +391,7 @@ int UpdateQuota(int argc, char **argv)
 {
   int status;
   char **args;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
 
   if (!(args = GetQuotaArgs(FALSE)))
     return DM_NORMAL;
@@ -458,7 +458,7 @@ int DeleteQuota(int argc, char **argv)
 {
   int status;
   char **args;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
 
   if (!(args = GetQuotaArgs(FALSE)))
     return DM_NORMAL;

diff --git a/clients/moira/user.c b/clients/moira/user.c
index ac544ec34d050db26ec3f9d01f498b123ee4111d..8397dac0f4ef80d33317440a7b6c5d2c14ae5c09 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -19,6 +19,8 @@
 #include "f_defs.h"
 #include "globals.h"
 
+#include <sys/time.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,7 +34,7 @@ RCSID("$Header$");
 
 void CorrectCapitalization(char **name);
 char **AskUserInfo(char **info, Bool name);
-struct qelem *GetUserInfo(int type, char *name1, char *name2);
+struct mqelem *GetUserInfo(int type, char *name1, char *name2);
 
 #define LOGIN 0
 #define UID   1
@@ -210,7 +212,7 @@ char **AskUserInfo(char **info, Bool name)
     }
   else
     {
-      struct qelem *elem = NULL;
+      struct mqelem *elem = NULL;
       char *argv[3];
 
       if (GetValueFromUser("User's last name", &info[U_LAST]) == SUB_ERROR)
@@ -363,11 +365,11 @@ char **AskUserInfo(char **info, Bool name)
  *
  */
 
-struct qelem *GetUserInfo(int type, char *name1, char *name2)
+struct mqelem *GetUserInfo(int type, char *name1, char *name2)
 {
   char *args[2];
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   switch (type)
     {
@@ -477,7 +479,7 @@ static char *GetLoginName(void)
  *     Returns: uid - the malloced uid of the user that was chosen.
  */
 
-static char *ChooseUser(struct qelem *elem)
+static char *ChooseUser(struct mqelem *elem)
 {
   while (elem)
     {
@@ -507,7 +509,7 @@ static char *GetUidNumberFromName(void)
 {
   char *args[5], *uid, first[BUFSIZ], last[BUFSIZ];
   int status;
-  struct qelem *top = NULL;
+  struct mqelem *top = NULL;
 
   if (!Prompt_input("First Name: ", first, BUFSIZ))
     return NULL;
@@ -676,7 +678,7 @@ static void RealUpdateUser(char **info, Bool junk)
 
 int UpdateUser(int argc, char **argv)
 {
-  struct qelem *elem;
+  struct mqelem *elem;
 
   elem = GetUserInfo(LOGIN, argv[1], NULL);
   QueryLoop(elem, NullPrint, RealUpdateUser, "Update the user");
@@ -697,7 +699,7 @@ static void RealDeactivateUser(char **info, Bool one_item)
   int status;
   char txt_buf[BUFSIZ];
   char *qargs[2], **args;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if (one_item)
     {
@@ -789,7 +791,7 @@ static void RealDeactivateUser(char **info, Bool one_item)
 
 int DeactivateUser(int argc, char **argv)
 {
-  struct qelem *elem;
+  struct mqelem *elem;
 
   elem = GetUserInfo(LOGIN, argv[1], NULL);
   QueryLoop(elem, NullPrint, RealDeactivateUser, "Deactivate user");
@@ -814,7 +816,7 @@ int DeactivateUser(int argc, char **argv)
 int DeleteUserByUid(int argc, char **argv)
 {
   int status;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char **info;
 
   if (!ValidName(argv[1]))
@@ -841,7 +843,7 @@ int DeleteUserByUid(int argc, char **argv)
 
 int ShowUserByLogin(int argc, char *argv[])
 {
-  struct qelem *top, *elem;
+  struct mqelem *top, *elem;
 
   elem = top = GetUserInfo(LOGIN, argv[1], NULL);
   Loop(elem, PrintUserInfo);
@@ -859,7 +861,7 @@ int ShowUserByLogin(int argc, char *argv[])
 
 int ShowUserByName(int argc, char *argv[])
 {
-  struct qelem *top;
+  struct mqelem *top;
   char buf[BUFSIZ];
 
   top = GetUserInfo(BY_NAME, argv[1], argv[2]);
@@ -895,7 +897,7 @@ int ShowUserByName(int argc, char *argv[])
 
 int ShowUserByClass(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   if (YesNoQuestion("This will take a long time.  Are you sure", 0) == FALSE)
     return DM_NORMAL;
@@ -915,7 +917,7 @@ int ShowUserByClass(int argc, char **argv)
 
 int ShowUserById(int argc, char *argv[])
 {
-  struct qelem *top, *elem;
+  struct mqelem *top, *elem;
 
   elem = top = GetUserInfo(ID, argv[1], NULL);
   Loop(elem, PrintUserInfo);
@@ -935,7 +937,7 @@ int ShowUserById(int argc, char *argv[])
 int GetKrbmap(int argc, char **argv)
 {
   int stat;
-  struct qelem *elem = NULL, *top;
+  struct mqelem *elem = NULL, *top;
   char buf[BUFSIZ];
 
   if ((stat = do_mr_query("get_kerberos_user_map", 2, &argv[1],
@@ -1015,7 +1017,7 @@ int DeleteKrbmap(int argc, char **argv)
 int GetDirFlags(int argc, char **argv)
 {
   int stat, flags;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
   char buf[BUFSIZ], **info;
 
   if (!ValidName(argv[1]))
@@ -1059,7 +1061,7 @@ int SetDirFlags(int argc, char **argv)
 {
   int stat, flags;
   char **info, buf[BUFSIZ], *args[2];
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if (!ValidName(argv[1]))
     return DM_NORMAL;

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index a31b62b77171caae93ebe745389e7e81d5e890dd..f8493fddb2717a765ae58d05f747e80903d6a7c6 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -19,6 +19,8 @@
 #include "f_defs.h"
 #include "globals.h"
 
+#include <sys/types.h>
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>             /* for gethostbyname. */
@@ -37,7 +39,7 @@ RCSID("$Header$");
  *     Returns: none.
  */
 
-static void AddQueue(struct qelem *elem, struct qelem *pred)
+static void AddQueue(struct mqelem *elem, struct mqelem *pred)
 {
   if (!pred)
     {
@@ -56,7 +58,7 @@ static void AddQueue(struct qelem *elem, struct qelem *pred)
  *     Returns: none.
  */
 
-static void RemoveQueue(struct qelem *elem)
+static void RemoveQueue(struct mqelem *elem)
 {
   if (elem->q_forw)
     elem->q_forw->q_back = elem->q_back;
@@ -113,13 +115,13 @@ void FreeAndClear(char **pointer, Bool free_it)
 }
 
 /*     Function Name: QueueTop
- *     Description: returns a qelem pointer that points to the top of
+ *     Description: returns a mqelem pointer that points to the top of
  *                   a queue.
  *     Arguments: elem - any element of a queue.
  *     Returns: top element of a queue.
  */
 
-struct qelem *QueueTop(struct qelem *elem)
+struct mqelem *QueueTop(struct mqelem *elem)
 {
   if (!elem)           /* NULL returns NULL.  */
     return NULL;
@@ -134,7 +136,7 @@ struct qelem *QueueTop(struct qelem *elem)
  *     Returns: none
  */
 
-static void FreeQueueElem(struct qelem *elem)
+static void FreeQueueElem(struct mqelem *elem)
 {
   char **info = elem->q_data;
 
@@ -153,9 +155,9 @@ static void FreeQueueElem(struct qelem *elem)
  *     Returns: none.
  */
 
-void FreeQueue(struct qelem *elem)
+void FreeQueue(struct mqelem *elem)
 {
-  struct qelem *temp, *local = QueueTop(elem);
+  struct mqelem *temp, *local = QueueTop(elem);
 
   while (local)
     {
@@ -171,7 +173,7 @@ void FreeQueue(struct qelem *elem)
  *     Returns: none.
  */
 
-int QueueCount(struct qelem *elem)
+int QueueCount(struct mqelem *elem)
 {
   int count = 0;
   elem = QueueTop(elem);
@@ -188,7 +190,7 @@ int QueueCount(struct qelem *elem)
  *     Arguments: argc, argv, - information returned from the query returned
  *                               in argv.
  *                 data - the previous element on the queue, this data will be
- *                        stored in a qelem struct immediatly after this elem.
+ *                        stored in a mqelem struct immediatly after this elem.
  *                        If NULL then a new queue will be created.  This value
  *                        is updated to the current element at the end off the
  *                        call.
@@ -198,8 +200,8 @@ int QueueCount(struct qelem *elem)
 int StoreInfo(int argc, char **argv, void *data)
 {
   char **info = malloc(MAX_ARGS_SIZE * sizeof(char *));
-  struct qelem **old_elem = data;
-  struct qelem *new_elem = malloc(sizeof(struct qelem));
+  struct mqelem **old_elem = data;
+  struct mqelem *new_elem = malloc(sizeof(struct mqelem));
   int count;
 
   if (!new_elem || !info)
@@ -624,7 +626,7 @@ int PrintHelp(char **message)
  *     Returns: none.
  */
 
-void Loop(struct qelem *elem, void (*func)(char **))
+void Loop(struct mqelem *elem, void (*func)(char **))
 {
   while (elem)
     {
@@ -660,7 +662,7 @@ void Loop(struct qelem *elem, void (*func)(char **))
  *                              "Delete the list"
  */
 
-void QueryLoop(struct qelem *elem, char * (*print_func)(char **),
+void QueryLoop(struct mqelem *elem, char * (*print_func)(char **),
               void (*op_func)(char **, Bool), char *query_string)
 {
   Bool one_item;
@@ -712,15 +714,15 @@ char *NullPrint(char **info)
  *     Returns: argv of values
  */
 
-struct qelem *GetTypeValues(char *tname)
+struct mqelem *GetTypeValues(char *tname)
 {
   int stat;
   char *argv[3], *p, **pp;
-  struct qelem *elem, *oelem;
-  static struct qelem *cache = NULL;
+  struct mqelem *elem, *oelem;
+  static struct mqelem *cache = NULL;
   struct cache_elem {
     char *cache_name;
-    struct qelem *cache_data;
+    struct mqelem *cache_data;
   } *ce;
 
   for (elem = cache; elem; elem = elem->q_forw)
@@ -747,7 +749,7 @@ struct qelem *GetTypeValues(char *tname)
       FreeInfo(pp);
       elem->q_data = p;
     }
-  elem = malloc(sizeof(struct qelem));
+  elem = malloc(sizeof(struct mqelem));
   ce = malloc(sizeof(struct cache_elem));
   ce->cache_name = strdup(tname);
   ce->cache_data = QueueTop(oelem);
@@ -767,7 +769,7 @@ struct qelem *GetTypeValues(char *tname)
 int GetTypeFromUser(char *prompt, char *tname, char **pointer)
 {
   char def[BUFSIZ], buffer[BUFSIZ], *p, *argv[3];
-  struct qelem *elem;
+  struct mqelem *elem;
   int stat;
 
   strcpy(def, *pointer);
@@ -827,7 +829,7 @@ int GetTypeFromUser(char *prompt, char *tname, char **pointer)
        com_err(program_name, stat, " in add_alias");
       else
        {
-         elem = malloc(sizeof(struct qelem));
+         elem = malloc(sizeof(struct mqelem));
          elem->q_data = strdup(*pointer);
          AddQueue(elem, GetTypeValues(tname));
          Put_message("Done.");

diff --git a/clients/moira/zephyr.c b/clients/moira/zephyr.c
index 96322cc4f11a209f2c4d90bbc6f0ccc83e5830c0..ef86803a21b76a47287d3d2c55ffaacabd0e0ed6 100644 (file)
--- a/clients/moira/zephyr.c
+++ b/clients/moira/zephyr.c
@@ -43,10 +43,10 @@ static char **SetDefaults(char **info, char *name)
 
 /* Get info from database */
 
-static struct qelem *GetZephyrInfo(char *name)
+static struct mqelem *GetZephyrInfo(char *name)
 {
   int stat;
-  struct qelem *elem = NULL;
+  struct mqelem *elem = NULL;
 
   if ((stat = do_mr_query("get_zephyr_class", 1, &name, StoreInfo, &elem)))
     {
@@ -222,7 +222,7 @@ static char **AskZephyrInfo(char **info, Bool rename)
 /* Menu entry for get zephyr */
 int GetZephyr(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetZephyrInfo(argv[1]);
   Loop(top, (void *) PrintZephyrInfo);
@@ -249,7 +249,7 @@ void RealDeleteZephyr(char **info, Bool one_item)
 
 int DeleteZephyr(int argc, char **argv)
 {
-  struct qelem *elem = GetZephyrInfo(argv[1]);
+  struct mqelem *elem = GetZephyrInfo(argv[1]);
   QueryLoop(elem, PrintZephyrInfo, RealDeleteZephyr,
            "Delete Zephyr class restriction for class ");
   FreeQueue(elem);
@@ -321,7 +321,7 @@ static void RealUpdateZephyr(char **info, Bool junk)
 
 int ChngZephyr(int argc, char **argv)
 {
-  struct qelem *top;
+  struct mqelem *top;
 
   top = GetZephyrInfo(argv[1]);
   QueryLoop(top, NullPrint, RealUpdateZephyr, "Update class");