[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.11,1.15.2.12 user.c,1.11,1.11.2.1

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

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

Modified Files:
      Tag: stable-1_2
	ChangeLog user.c 
Log Message:
Use '# delete' instead of '|/bin/true delete' for blackholed accounts.

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- user.c	26 Jan 2004 18:16:40 -0000	1.11
+++ user.c	12 Jun 2004 21:28:04 -0000	1.11.2.1
@@ -996,8 +996,10 @@
     snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);
     fs = fopen(NewBuf,"w");
 
-    /* for now we use /bin/true, eventually switch this to '# delete' */
-    fprintf(fs, "|%s/true delete\n", TRUE_PATH);
+    /* we use '# delete' since comments are ignored in vdelivermail, 
+     * but qmailadmin looks for ' delete' to know that it's a
+     * blackhole account. */
+    fprintf(fs, "# delete\n");
 
     fclose(fs);
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -u -d -r1.15.2.11 -r1.15.2.12
--- ChangeLog	29 Apr 2004 23:31:36 -0000	1.15.2.11
+++ ChangeLog	12 Jun 2004 21:28:04 -0000	1.15.2.12
@@ -19,6 +19,8 @@
 	  QmailAdmin into an infinite loop (Modify Alias). [941082]
 	- Display non-ezmlm aliases with "-owner" in the name.
 	- Display aliases with "-default" in the name.
+	- Use "# delete" instead of "|/bin/true delete" for blackholed
+	  accounts.
 
 1.2.1 - released 10-Feb-04