Attachment #92781 for bug #141790

View | Details | Raw Unified | Return to bug 141790
Collapse All | Expand All

Lines 716-722 Link Here

(-)qmailadmin-1.2.1/template.c (-1 / +1 lines)
716		716
717	if (vpw==NULL) vpw = vauth_getpw(ActionUser, Domain);	717	if (vpw==NULL) vpw = vauth_getpw(ActionUser, Domain);
718	if (fs1== NULL) {	718	if (fs1== NULL) {
719	snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/.qmail", vpw->pw_dir);	719	snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/../.qmail-%s", vpw->pw_dir, ActionUser);
720	fs1 = fopen(NTmpBuf,"r");	720	fs1 = fopen(NTmpBuf,"r");
721	}	721	}
722		722





    /* unlink the .qmail file */
    if ( vpw == NULL ) vpw = vauth_getpw(ActionUser, Domain); 
    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 */

    if ( vpw == NULL ) {
      vpw = vauth_getpw(ActionUser, Domain); 
    }
    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);

    fs = fopen(NewBuf,"w+");
    tmpstr = strtok(box," ,;\n");

    mkdir(NewBuf, 0750);

    /* open the .qmail file */
    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 );


    /* save the forward for vacation too */
    GetValue(TmpCGI,box,"nforward=", sizeof(box));
    snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
    fs = fopen(NewBuf, "a+");
    tmpstr = strtok(box, " ,;\n");
    count = 0;

  } else if (strcmp(box,"blackhole") == 0 ) {

    /* open the .qmail file */
    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' */

Return to bug 141790

Lines 867-873 Link Here

(-)qmailadmin-1.2.1/user.c (-5 / +5 lines)
867		867
868	/* unlink the .qmail file */	868	/* unlink the .qmail file */
869	if ( vpw == NULL ) vpw = vauth_getpw(ActionUser, Domain);	869	if ( vpw == NULL ) vpw = vauth_getpw(ActionUser, Domain);
870	snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);	870	snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
871	unlink(NewBuf);	871	unlink(NewBuf);
872		872
873	/* if the mail is to be checked for spam, rewrite the file with command */	873	/* if the mail is to be checked for spam, rewrite the file with command */
Lines 905-911 Link Here
905	if ( vpw == NULL ) {	905	if ( vpw == NULL ) {
906	vpw = vauth_getpw(ActionUser, Domain);	906	vpw = vauth_getpw(ActionUser, Domain);
907	}	907	}
908	snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);	908	snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
909		909
910	fs = fopen(NewBuf,"w+");	910	fs = fopen(NewBuf,"w+");
911	tmpstr = strtok(box," ,;\n");	911	tmpstr = strtok(box," ,;\n");
Lines 953-959 Link Here
953	mkdir(NewBuf, 0750);	953	mkdir(NewBuf, 0750);
954		954
955	/* open the .qmail file */	955	/* open the .qmail file */
956	snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);	956	snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
957	fs = fopen(NewBuf,"w+");	957	fs = fopen(NewBuf,"w+");
958	fprintf(fs, "\| %s/autorespond 86400 3 %s/vacation/message %s/vacation\n",	958	fprintf(fs, "\| %s/autorespond 86400 3 %s/vacation/message %s/vacation\n",
959	AUTORESPOND_PATH, vpw->pw_dir, vpw->pw_dir );	959	AUTORESPOND_PATH, vpw->pw_dir, vpw->pw_dir );
Lines 977-983 Link Here
977		977
978	/* save the forward for vacation too */	978	/* save the forward for vacation too */
979	GetValue(TmpCGI,box,"nforward=", sizeof(box));	979	GetValue(TmpCGI,box,"nforward=", sizeof(box));
980	snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", vpw->pw_dir);	980	snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
981	fs = fopen(NewBuf, "a+");	981	fs = fopen(NewBuf, "a+");
982	tmpstr = strtok(box, " ,;\n");	982	tmpstr = strtok(box, " ,;\n");
983	count = 0;	983	count = 0;
Lines 993-999 Link Here
993	} else if (strcmp(box,"blackhole") == 0 ) {	993	} else if (strcmp(box,"blackhole") == 0 ) {
994		994
995	/* open the .qmail file */	995	/* open the .qmail file */
996	snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir);	996	snprintf(NewBuf,sizeof(NewBuf),"%s/../.qmail-%s", vpw->pw_dir, ActionUser);
997	fs = fopen(NewBuf,"w");	997	fs = fopen(NewBuf,"w");
998		998
999	/* for now we use /bin/true, eventually switch this to '# delete' */	999	/* for now we use /bin/true, eventually switch this to '# delete' */