[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.90, 1.15.2.91 autorespond.c, 1.3.2.4, 1.3.2.5

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

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

Modified Files:
      Tag: stable-1_2
	ChangeLog autorespond.c 
Log Message:
Create autoresponder message before creating its .qmail file.  Deliver copy before autoresponding to ensure delivery.

Index: autorespond.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- autorespond.c	23 Jan 2005 17:35:11 -0000	1.3.2.4
+++ autorespond.c	29 Jun 2006 19:30:05 -0000	1.3.2.5
@@ -168,18 +168,6 @@
   mkdir(TmpBuf2, 0750);
 
   /*
-   * Make the autoresponder .qmail file
-   */
-  valias_delete (ActionUser, Domain);
-  sprintf(TmpBuf, "|%s/autorespond 10000 5 %s/%s/message %s/%s",
-    AUTORESPOND_PATH, RealDir, TmpBuf2, RealDir, TmpBuf2);
-  valias_insert (ActionUser, Domain, TmpBuf);
-  if ( strlen(Newu) > 0 ) {
-    sprintf(TmpBuf, "&%s", Newu);
-    valias_insert (ActionUser, Domain, TmpBuf);
-  } 
-
-  /*
     * Make the autoresponder message file
    */
   sprintf(TmpBuf, "%s/message", TmpBuf2);
@@ -190,6 +178,18 @@
   fclose(fs);
 
   /*
+   * Make the autoresponder .qmail file
+   */
+  valias_delete (ActionUser, Domain);
+  if ( strlen(Newu) > 0 ) {
+    sprintf(TmpBuf, "&%s", Newu);
+    valias_insert (ActionUser, Domain, TmpBuf);
+  } 
+  sprintf(TmpBuf, "|%s/autorespond 10000 5 %s/%s/message %s/%s",
+    AUTORESPOND_PATH, RealDir, TmpBuf2, RealDir, TmpBuf2);
+  valias_insert (ActionUser, Domain, TmpBuf);
+
+  /*
    * Report success
    */
   snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n",

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.90
retrieving revision 1.15.2.91
diff -u -d -r1.15.2.90 -r1.15.2.91
--- ChangeLog	8 May 2006 05:22:34 -0000	1.15.2.90
+++ ChangeLog	29 Jun 2006 19:30:04 -0000	1.15.2.91
@@ -21,6 +21,10 @@
 	  QmailAdmin include the user's email address as the last 
 	  parameter to --enable-spam-command.
 
+	Tom Collins
+	- Create autoresponder message before creating its .qmail file.
+	- Deliver copy before autoresponding to ensure delivery.
+
 1.2.10 - released 20-Feb-06
 
 	Peter Pentchev