[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.9,1.15.2.10 alias.c,1.4.2.3,1.4.2.4

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

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

Modified Files:
      Tag: stable-1_2
	ChangeLog alias.c 
Log Message:
Fixed bug where unrecognized .qmail-alias entries could throw QmailAdmin into an infinite loop (Modify Alias). [fixes 941082]

Index: alias.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- alias.c	24 Apr 2004 01:06:40 -0000	1.4.2.3
+++ alias.c	24 Apr 2004 01:12:50 -0000	1.4.2.4
@@ -342,10 +342,10 @@
   while (alias_line != NULL) {
     alias_name_from_command = dotqmail_alias_command(alias_line);
                         
-    /* check to see if it is an invalid line , if so skip to next */
-    if (alias_name_from_command == NULL ) continue;
+    /* Make sure it is valid before displaying it. */
+    if (alias_name_from_command != NULL )
+      add_alias_entry (user, alias_line);
 
-    add_alias_entry (user, alias_line);
     alias_line = valias_select_next();
   }
   

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -u -d -r1.15.2.9 -r1.15.2.10
--- ChangeLog	24 Apr 2004 01:06:40 -0000	1.15.2.9
+++ ChangeLog	24 Apr 2004 01:12:46 -0000	1.15.2.10
@@ -15,6 +15,8 @@
 	- Allow user to create a 'blackhole' address by entering "#" as 
 	  the forwarding address when creating a new alias.
 	- Display forwards even if they're all blackholes. [941083]
+	- Fixed bug where unrecognized .qmail-alias entries could throw
+	  QmailAdmin into an infinite loop (Modify Alias). [941082]
 
 1.2.1 - released 10-Feb-04