From: Tom C. <tom...@us...> - 2007-11-03 17:44:39
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15927 Modified Files: Tag: stable-1_2 ChangeLog user.c Log Message: Slight change to Jorgen Moth's patch. [1647157] Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.19 retrieving revision 1.11.2.20 diff -u -d -r1.11.2.19 -r1.11.2.20 --- user.c 3 Nov 2007 17:29:23 -0000 1.11.2.19 +++ user.c 3 Nov 2007 17:44:12 -0000 1.11.2.20 @@ -398,35 +398,36 @@ GetValue(TmpCGI, c_num, "number_of_mailinglist=", MAX_BUFF); num = atoi(c_num); - if((num > 0) && !(mailingListNames = malloc(sizeof(char *) * num))) { - snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]); - vclose(); - exit(0); - - } else { - for(cnt = 0; cnt < num; cnt++) { - if(!(mailingListNames[cnt] = malloc(MAX_BUFF))) { - snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]); - vclose(); - exit(0); + if (num > 0) { + if (!(mailingListNames = malloc(sizeof(char *) * num))) { + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]); + vclose(); + exit(0); + } else { + for(cnt = 0; cnt < num; cnt++) { + if(!(mailingListNames[cnt] = malloc(MAX_BUFF))) { + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]); + vclose(); + exit(0); + } } - } - for(cnt = 0; cnt < num; cnt++) { - sprintf(tmp, "subscribe%d=", cnt); - error = GetValue(TmpCGI, mailingListNames[cnt], tmp, MAX_BUFF); - if( error != -1 ) { - pid=fork(); + for(cnt = 0; cnt < num; cnt++) { + sprintf(tmp, "subscribe%d=", cnt); + error = GetValue(TmpCGI, mailingListNames[cnt], tmp, MAX_BUFF); + if( error != -1 ) { + pid=fork(); - if (pid==0) { - sprintf(TmpBuf1, "%s/ezmlm-sub", EZMLMDIR); - sprintf(TmpBuf2, "%s/%s", RealDir, mailingListNames[cnt]); - execl(TmpBuf1, "ezmlm-sub", TmpBuf2, email, NULL); - exit(127); - } else { - wait(&pid); - } - } + if (pid==0) { + sprintf(TmpBuf1, "%s/ezmlm-sub", EZMLMDIR); + sprintf(TmpBuf2, "%s/%s", RealDir, mailingListNames[cnt]); + execl(TmpBuf1, "ezmlm-sub", TmpBuf2, email, NULL); + exit(127); + } else { + wait(&pid); + } + } + } } } Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.104 retrieving revision 1.15.2.105 diff -u -d -r1.15.2.104 -r1.15.2.105 --- ChangeLog 3 Nov 2007 17:39:34 -0000 1.15.2.104 +++ ChangeLog 3 Nov 2007 17:44:12 -0000 1.15.2.105 @@ -14,6 +14,7 @@ - Move HTML out of alias.c and into html.h as move toward more flexible HTML templates. - When deleting a subscriber, convert '=' to '@' if no '@'. [1651370] + - Slight change to Jorgen Moth's patch. 1.2.11 - released 29-Dec-06 |