OSSP CVS Repository

ossp - Difference in ossp-pkg/petidomo/config.c versions 1.13 and 1.14
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/petidomo/config.c 1.13 -> 1.14

--- config.c     2001/01/15 16:35:06     1.13
+++ config.c     2001/01/15 16:55:45     1.14
@@ -1,6 +1,6 @@
 /*
    $Source: /v/ossp/cvs/ossp-pkg/petidomo/Attic/config.c,v $
-   $Revision: 1.13 $
+   $Revision: 1.14 $
 
    Copyright (C) 2000 by CyberSolutions GmbH, Germany.
 
@@ -136,7 +136,7 @@
 static char*     reply_to;
 static char*     postingfilter;
 static char*     archivepath;
-static bool      allowpubsub;
+static char*     subtype;
 static bool      allowmembers;
 static char*     intro_file;
 static char*     sig_file;
@@ -161,7 +161,7 @@
     struct ConfigFile ListCF[] =
         {
         { "ListType", CF_STRING, &listtype },
-        { "AllowPublicSubscription", CF_YES_NO, &allowpubsub },
+        { "SubscriptionType", CF_STRING, &subtype },
         { "AllowMembersCommand", CF_YES_NO, &allowmembers },
         { "ReplyTo", CF_STRING, &reply_to },
         { "Hostname", CF_STRING, &list_fqdn },
@@ -188,7 +188,7 @@
     reply_to         = NULL;
     postingfilter    = NULL;
     archivepath      = NULL;
-    allowpubsub      = TRUE;
+    subtype          = NULL;
     allowmembers     = FALSE;
     intro_file       = "introduction";
     sig_file         = "signature";
@@ -252,12 +252,23 @@
         ListConfig->listtype = LIST_CLOSED;
     else if (!strcasecmp(listtype, "moderated"))
         ListConfig->listtype = LIST_MODERATED;
+    else if (!strcasecmp(listtype, "acknowledged") || !strcasecmp(listtype, "acked"))
+        ListConfig->listtype = LIST_ACKED;
+    else if (!strcasecmp(listtype, "acknowledged-once") || !strcasecmp(listtype, "acked-once"))
+        ListConfig->listtype = LIST_ACKED_ONCE;
     else
         {
         syslog(LOG_ERR, "List \"%s\" doesn't have a valid type in config file.", listname);
         exit(1);
         }
-    ListConfig->allowpubsub = allowpubsub;
+
+    if (!strcasecmp(subtype, "public"))
+        ListConfig->listtype = SUBSCRIPTION_PUBLIC;
+    else if (!strcasecmp(subtype, "admin"))
+        ListConfig->listtype = SUBSCRIPTION_ADMIN;
+    else if (!strcasecmp(subtype, "acknowledged") || !strcasecmp(subtype, "acked"))
+        ListConfig->listtype = SUBSCRIPTION_ACKED;
+
     ListConfig->allowmembers = allowmembers;
     ListConfig->fqdn = (list_fqdn) ? list_fqdn : MasterConfig->fqdn;
     ListConfig->reply_to = reply_to;

CVSTrac 2.0.1