remove some weirdness with changing "WILDCARD" to "*.*@*" and back,

probably there because the old server choked on the string "*.*@*"
or something.

diff --git a/clients/moira/zephyr.c b/clients/moira/zephyr.c
index dc33cb0b54c4a83909480faed9b3fc96999134da..02de7eacfb88add977198f701393eba5282983a7 100644 (file)
--- a/clients/moira/zephyr.c
+++ b/clients/moira/zephyr.c
@@ -27,14 +27,14 @@ void RealDeleteZephyr(char **info, Bool one_item);
 static char **SetDefaults(char **info, char *name)
 {
   info[ZA_CLASS] = strdup(name);
-  info[ZA_XMT_TYPE] = strdup("LIST");
-  info[ZA_SUB_TYPE] = strdup("LIST");
-  info[ZA_IWS_TYPE] = strdup("LIST");
-  info[ZA_IUI_TYPE] = strdup("LIST");
-  info[ZA_XMT_ID] = strdup("empty");
-  info[ZA_SUB_ID] = strdup("empty");
-  info[ZA_IWS_ID] = strdup("empty");
-  info[ZA_IUI_ID] = strdup("empty");
+  info[ZA_XMT_TYPE] = strdup("NONE");
+  info[ZA_SUB_TYPE] = strdup("NONE");
+  info[ZA_IWS_TYPE] = strdup("NONE");
+  info[ZA_IUI_TYPE] = strdup("NONE");
+  info[ZA_XMT_ID] = strdup("");
+  info[ZA_SUB_ID] = strdup("");
+  info[ZA_IWS_ID] = strdup("");
+  info[ZA_IUI_ID] = strdup("");
   info[ZA_MODTIME] = info[ZA_MODBY] = info[ZA_MODWITH] = NULL;
   info[ZA_END] = NULL;
   return info;
@@ -70,35 +70,15 @@ static char *PrintZephyrInfo(char **info)
     }
   sprintf(buf, "        Zephyr class: %s", info[ZA_CLASS]);
   Put_message(buf);
-  if (!strcmp(info[ZA_XMT_ID], "WILDCARD"))
-    {
-      free(info[ZA_XMT_ID]);
-      info[ZA_XMT_ID] = strdup("*.*@*");
-    }
   sprintf(buf, "Transmit ACL:           %s %s", info[ZA_XMT_TYPE],
          strcasecmp(info[ZA_XMT_TYPE], "NONE") ? info[ZA_XMT_ID] : "");
   Put_message(buf);
-  if (!strcmp(info[ZA_SUB_ID], "WILDCARD"))
-    {
-      free(info[ZA_SUB_ID]);
-      info[ZA_SUB_ID] = strdup("*.*@*");
-    }
   sprintf(buf, "Subscription ACL:       %s %s", info[ZA_SUB_TYPE],
          strcasecmp(info[ZA_SUB_TYPE], "NONE") ? info[ZA_SUB_ID] : "");
   Put_message(buf);
-  if (!strcmp(info[ZA_IWS_ID], "WILDCARD"))
-    {
-      free(info[ZA_IWS_ID]);
-      info[ZA_IWS_ID] = strdup("*.*@*");
-    }
   sprintf(buf, "Instance Wildcard ACL:  %s %s", info[ZA_IWS_TYPE],
          strcasecmp(info[ZA_IWS_TYPE], "NONE") ? info[ZA_IWS_ID] : "");
   Put_message(buf);
-  if (!strcmp(info[ZA_IUI_ID], "WILDCARD"))
-    {
-      free(info[ZA_IUI_ID]);
-      info[ZA_IUI_ID] = strdup("*.*@*");
-    }
   sprintf(buf, "Instance Indentity ACL: %s %s", info[ZA_IUI_TYPE],
          strcasecmp(info[ZA_IUI_TYPE], "NONE") ? info[ZA_IUI_ID] : "");
   Put_message(buf);
@@ -138,76 +118,36 @@ static char **AskZephyrInfo(char **info, Bool rename)
     return NULL;
   if (strcasecmp(info[ZA_XMT_TYPE], "NONE"))
     {
-      if (!strcmp(info[ZA_XMT_ID], "WILDCARD"))
-       {
-         free(info[ZA_XMT_ID]);
-         info[ZA_XMT_ID] = strdup("*.*@*");
-       }
       sprintf(buf, "Which %s: ", info[ZA_XMT_TYPE]);
       if (GetValueFromUser(buf, &info[ZA_XMT_ID]) == SUB_ERROR)
        return NULL;
-      if (!strcmp(info[ZA_XMT_ID], "*.*@*"))
-       {
-         free(info[ZA_XMT_ID]);
-         info[ZA_XMT_ID] = strdup("WILDCARD");
-       }
     }
   if (GetTypeFromUser("What kind of subscription restriction", "ace_type",
                      &info[ZA_SUB_TYPE]) == SUB_ERROR)
     return NULL;
   if (strcasecmp(info[ZA_SUB_TYPE], "NONE"))
     {
-      if (!strcmp(info[ZA_SUB_ID], "WILDCARD"))
-       {
-         free(info[ZA_SUB_ID]);
-         info[ZA_SUB_ID] = strdup("*.*@*");
-       }
       sprintf(buf, "Which %s: ", info[ZA_SUB_TYPE]);
       if (GetValueFromUser(buf, &info[ZA_SUB_ID]) == SUB_ERROR)
        return NULL;
-      if (!strcmp(info[ZA_SUB_ID], "*.*@*"))
-       {
-         free(info[ZA_SUB_ID]);
-         info[ZA_SUB_ID] = strdup("WILDCARD");
-       }
     }
   if (GetTypeFromUser("What kind of wildcard instance restriction",
                      "ace_type", &info[ZA_IWS_TYPE]) == SUB_ERROR)
     return NULL;
   if (strcasecmp(info[ZA_IWS_TYPE], "NONE") != 0)
     {
-      if (!strcmp(info[ZA_IWS_ID], "WILDCARD"))
-       {
-         free(info[ZA_IWS_ID]);
-         info[ZA_IWS_ID] = strdup("*.*@*");
-       }
       sprintf(buf, "Which %s: ", info[ZA_IWS_TYPE]);
       if (GetValueFromUser(buf, &info[ZA_IWS_ID]) == SUB_ERROR)
        return NULL;
-      if (!strcmp(info[ZA_IWS_ID], "*.*@*"))
-       {
-         free(info[ZA_IWS_ID]);
-         info[ZA_IWS_ID] = strdup("WILDCARD");
-       }
     }
   if (GetTypeFromUser("What kind of instance identity restriction",
                      "ace_type", &info[ZA_IUI_TYPE]) == SUB_ERROR)
     return NULL;
   if (strcasecmp(info[ZA_IUI_TYPE], "NONE"))
     {
-      if (!strcmp(info[ZA_IUI_ID], "WILDCARD"))
-       {
-         free(info[ZA_IUI_ID]);
-         info[ZA_IUI_ID] = strdup("*.*@*");
-       }
       sprintf(buf, "Which %s: ", info[ZA_IUI_TYPE]);
       if (GetValueFromUser(buf, &info[ZA_IUI_ID]) == SUB_ERROR)
        return NULL;
-      if (!strcmp(info[ZA_IUI_ID], "*.*@*"))
-       {
-         free(info[ZA_IUI_ID]);
-         info[ZA_IUI_ID] = strdup("WILDCARD");
-       }
     }
   FreeAndClear(&info[ZA_MODTIME], TRUE);
   FreeAndClear(&info[ZA_MODBY], TRUE);