[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.16,1.15.2.17 alias.c,1.4.2.5,1.4.2.6

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32649

Modified Files:
      Tag: stable-1_2
	ChangeLog alias.c 
Log Message:
Before considering an alias/forward to be a 'blackhole', make sure it's only a single line.

Index: alias.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- alias.c	29 Apr 2004 23:31:36 -0000	1.4.2.5
+++ alias.c	25 Aug 2004 23:58:56 -0000	1.4.2.6
@@ -132,8 +132,16 @@
       }
       if (k > startnumber) {
         if (*alias_line == '#') {
-          add_alias_entry (alias_name, "#");
-        } else while (1) {
+          alias_line = valias_select_all_next (alias_name);
+          if (strcmp (this_alias, alias_name) != 0) {
+            /* single comment, treat as blackhole */
+            add_alias_entry (this_alias, "#");
+            continue;
+          } else {
+            alias_name_from_command = dotqmail_alias_command(alias_line);
+          }
+        }
+        while (1) {
           if (alias_name_from_command != NULL) {
             add_alias_entry (alias_name, alias_name_from_command);
           }
@@ -197,16 +205,17 @@
           continue;
         }
 
-      /* Note that the current system fails for multi-line .qmail-user files
-         where the first line starts with a '#' or is invalid.
-         This is good for mailing lists (since dotqmail_alias_command bails
-         on program delivery that contains ezmlm) but bad for people who
-         may have complex .qmail-user files that start with a comment. */
-
         if (*TmpBuf2 == '#') {
-          /* this is a blackhole account */
-          add_alias_entry (alias_name, "#");
-        } else while (1) {
+          if (fgets(TmpBuf2, sizeof(TmpBuf2), fs) == NULL) {
+            /* just a single comment, this is a blackhole account */
+            add_alias_entry (alias_name, "#");
+            fclose(fs);
+            continue;
+          } else {
+            alias_name_from_command = dotqmail_alias_command(TmpBuf2);
+          }
+        }
+        while (1) {
           if (alias_name_from_command != NULL) {
             add_alias_entry (alias_name, alias_name_from_command);
           }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.16
retrieving revision 1.15.2.17
diff -u -d -r1.15.2.16 -r1.15.2.17
--- ChangeLog	24 Aug 2004 05:51:03 -0000	1.15.2.16
+++ ChangeLog	25 Aug 2004 23:58:56 -0000	1.15.2.17
@@ -6,6 +6,10 @@
 	Rick Widmer
 	- Updated INSTALL documentation (from 2004-05-07).
 
+	Tom Collins
+	- Before considering an alias/forward to be a 'blackhole', make
+	  sure it's only a single line.
+
 1.2.2 - released 25-Jun-04
 
 	Oden Eriksson