[patch] Solution(?) for this problem?

qmailadmin-1.2.1-dot-qmail.patch (text/plain), 2.42 KB, created by Erik Wasser on 2006-07-26 06:40:31 UTC

diff -ru qmailadmin-1.2.1/template.c qmailadmin-1.2.1-dot-qmail/template.c
--- qmailadmin-1.2.1/template.c	2004-02-02 01:39:47.000000000 +0100
+++ qmailadmin-1.2.1-dot-qmail/template.c	2006-07-26 15:31:16.000000000 +0200
@@ -716,7 +716,7 @@
 
   if (vpw==NULL) vpw = vauth_getpw(ActionUser, Domain); 
   if (fs1== NULL) {
-    snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/.qmail", vpw->pw_dir);
+    snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/../.qmail-%s", vpw->pw_dir, ActionUser);
     fs1 = fopen(NTmpBuf,"r");
   }
 
diff -ru qmailadmin-1.2.1/user.c qmailadmin-1.2.1-dot-qmail/user.c
--- qmailadmin-1.2.1/user.c	2004-01-26 19:16:40.000000000 +0100
+++ qmailadmin-1.2.1-dot-qmail/user.c	2006-07-26 15:31:05.000000000 +0200
@@ -867,7 +867,7 @@
 
     /* unlink the .qmail file */
     if ( vpw == NULL ) vpw = vauth_getpw(ActionUser, Domain); 
-    snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);
+    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
     unlink(NewBuf);
 
     /* if the mail is to be checked for spam, rewrite the file with command */
@@ -905,7 +905,7 @@
     if ( vpw == NULL ) {
       vpw = vauth_getpw(ActionUser, Domain); 
     }
-    snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);
+    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
 
     fs = fopen(NewBuf,"w+");
     tmpstr = strtok(box," ,;\n");
@@ -953,7 +953,7 @@
     mkdir(NewBuf, 0750);
 
     /* open the .qmail file */
-    snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);
+    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
     fs = fopen(NewBuf,"w+");
     fprintf(fs, "| %s/autorespond 86400 3 %s/vacation/message %s/vacation\n",
       AUTORESPOND_PATH, vpw->pw_dir, vpw->pw_dir );
@@ -977,7 +977,7 @@
 
     /* save the forward for vacation too */
     GetValue(TmpCGI,box,"nforward=", sizeof(box));
-    snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", vpw->pw_dir);
+    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
     fs = fopen(NewBuf, "a+");
     tmpstr = strtok(box, " ,;\n");
     count = 0;
@@ -993,7 +993,7 @@
   } else if (strcmp(box,"blackhole") == 0 ) {
 
     /* open the .qmail file */
-    snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);
+    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
     fs = fopen(NewBuf,"w");
 
     /* for now we use /bin/true, eventually switch this to '# delete' */