Reimplement events.gen as a Pro*C application.

[moira.git] / gen / mailhub.pc

diff --git a/gen/mailhub.pc b/gen/mailhub.pc
index a995fb2b271ec494b36865f43108b9e64bfcf733..6e531aa5e306d5d25f683f969e67e3af0c54a027 100644 (file)
--- a/gen/mailhub.pc
+++ b/gen/mailhub.pc
@@ -292,14 +292,7 @@ void get_info(void)
       l->acl_t = type[0];
       l->acl_id = acl;
       l->mailman = mailman;
-      if ((s = strchr(mailman_server, '.')))
-       *s = '\0';
-      else
-       strtrim(mailman_server);
-#ifdef ATHENA
-      strcat(mailman_server, ".LOCAL");
-#endif
-      l->mailman_server = strdup(mailman_server);
+      l->mailman_server = strdup(strtrim(mailman_server));
       l->m = NULL;
       if (hash_store(lists, id, l) < 0)
        {
@@ -397,9 +390,10 @@ void output_mlist(int id, void *list, void *out)
       for (i = 0; mailman_suffixes[i]; i++)
        fprintf(out, "%s%s: %s%s@%s\n", l->name, mailman_suffixes[i], l->name,
                mailman_suffixes[i], l->mailman_server);
+      fprintf(out, "owner-%s: %s-owner@%s\n", l->name, l->name,
+             l->mailman_server);
     }
-
-  if (l->acl_t ==  'L' && (l1 = hash_lookup(lists, l->acl_id)))
+  else if (l->acl_t ==  'L' && (l1 = hash_lookup(lists, l->acl_id)))
     {
       fprintf(out, "owner-%s: ", l->name);
       if ((l1->maillist) && (strcmp(l->name, l1->name)))