[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.8,1.15.2.9 alias.c,1.4.2.2,1.4.2.3 forward.c,1.2.2.1,1.2.2.2 qmailadmin.c,1.6,1.6.2.1 qmailadminx.h,1.2,1.2.2.1

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

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

Modified Files:
      Tag: stable-1_2
	ChangeLog alias.c forward.c qmailadmin.c qmailadminx.h 
Log Message:
Display forwards even if they're all blackholes. [fixes 941083]

Index: qmailadminx.h
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadminx.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- qmailadminx.h	10 Dec 2003 06:00:48 -0000	1.2
+++ qmailadminx.h	24 Apr 2004 01:06:40 -0000	1.2.2.1
@@ -67,6 +67,7 @@
 
 extern int CurPopAccounts;
 extern int CurForwards;
+extern int CurBlackholes;
 extern int CurAutoResponders;
 extern int CurMailingLists;
 

Index: qmailadmin.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- qmailadmin.c	26 Jan 2004 00:41:07 -0000	1.6
+++ qmailadmin.c	24 Apr 2004 01:06:40 -0000	1.6.2.1
@@ -87,6 +87,7 @@
 
 int CurPopAccounts;
 int CurForwards;
+int CurBlackholes;
 int CurAutoResponders;
 int CurMailingLists;
 uid_t Uid;

Index: alias.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- alias.c	24 Apr 2004 01:03:07 -0000	1.4.2.2
+++ alias.c	24 Apr 2004 01:06:40 -0000	1.4.2.3
@@ -622,7 +622,7 @@
 
   /* don't display aliases/forwards if we just deleted the last one */
   count_forwards();
-  if(CurForwards == 0) {
+  if(CurForwards == 0 && CurBlackholes == 0) {
     show_menu(Username, Domain, Mytime);
   } else {
     show_forwards(Username,Domain,Mytime,RealDir);

Index: forward.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/forward.c,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- forward.c	2 Feb 2004 00:39:47 -0000	1.2.2.1
+++ forward.c	24 Apr 2004 01:06:40 -0000	1.2.2.2
@@ -43,7 +43,7 @@
 
   count_forwards();
 
-  if(CurForwards == 0) {
+  if(CurForwards == 0 && CurBlackholes == 0) {
     sprintf(StatusMessage,"%s", get_html_text("232"));
     show_menu(Username, Domain, Mytime);
     vclose();
@@ -64,11 +64,12 @@
  int isforward;
 
   CurForwards = 0;
+  CurBlackholes = 0;
 
   alias_line = valias_select_all (alias_name, Domain);
   while (alias_line != NULL) {
     strcpy (this_alias, alias_name);
-    if (*alias_line == '#') { /* blackhole++ */ }
+    if (*alias_line == '#') { CurBlackholes++; }
     else {
       char *p1, *p2;
       int isforward;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -d -r1.15.2.8 -r1.15.2.9
--- ChangeLog	24 Apr 2004 01:03:07 -0000	1.15.2.8
+++ ChangeLog	24 Apr 2004 01:06:40 -0000	1.15.2.9
@@ -14,6 +14,7 @@
 	Tom Collins
 	- 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]
 
 1.2.1 - released 10-Feb-04