Menu
▾
▴
qmailadmin-cvs — CVS commits for the qmailadmin project
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(18) |
Oct
(28) |
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(37) |
Feb
(16) |
Mar
|
Apr
(11) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(6) |
Sep
(6) |
Oct
(8) |
Nov
(14) |
Dec
(20) |
| 2005 |
Jan
(11) |
Feb
(8) |
Mar
(7) |
Apr
(1) |
May
|
Jun
|
Jul
(3) |
Aug
(7) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(11) |
Mar
|
Apr
(2) |
May
(7) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(6) |
Dec
|
| 2008 |
Jan
(5) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rw...@pr...> - 2004-01-30 19:27:36
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30505 Modified Files: NEWS alias.c auth.c autorespond.c command.c configure forward.c mailinglist.c qmailadmin.c qmailadmin.h qmailadminx.h template.c user.c util.c Log Message: Part 1 of big rww patch. See NEWS for details. More to come Index: NEWS =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/NEWS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- NEWS 10 Sep 2003 21:38:41 -0000 1.1.1.1 +++ NEWS 30 Jan 2004 03:28:19 -0000 1.2 @@ -1 +1,57 @@ See CHANGELOG + +NOTE: QmailAdmin 1.3.0 may not run properly... I still have +more changes to add! + +The following information relates to a large block of changes +that Rick Widmer added right before the final release of 1.2.0. +I built up a large number of changes and will commit them in +batches, in the same order they were created. + + +################################################################# + +Changes from 040107 : + +Move all use of global TmpBuf* to function local Buffer*. + +Move as much HTML as possible out of c into templates. + +Don't pass so much stuff to QmailButton. Much of this will +be moved to the session file. For now use global variables. + +Replace vclose(); exit(0); with return() so the program can +ALWAYS call header and footer. + +Replace all calls to count_*() and load_limits() with a single +call to count_stuff(). + +Increase efficiency of reading Autoresponder Message File by making +the file static, and adding a flag that tells if it is properly +set to read the actual text. (This will usually happen.) + +Change various field names that are passed from fields that end up +in the moduser variable. All become modu. Old values include: +moduser, deluser, maybe others. + +Re-order a number of variable declarations in qmailadmin.c so they +match the order and spacing in qmailadminx.h. + +Send errors the sys admin might be interested in to error_log. +(stderr) + +Move 'F' code from template.c to autorespond.c + +Delete obsolete template tags: b, f, h, l, m, n, O + +Add new tags: u - stuff for single line templates + W - common variables to add to a URL + +Drastic changes to check_mailbox_flags so it only reads the +.qmail file once. + +Provide tags for ##t with the opposite meaning. For example +##th is skipped if HELP is not defined. I have added ##tH that +is skipped if HELP is defined. h and H have opposite meanings. + +Move much of the function of V into a template file - version.html Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- alias.c 14 Jan 2004 21:23:25 -0000 1.4 +++ alias.c 30 Jan 2004 03:28:19 -0000 1.5 @@ -60,6 +60,7 @@ DIR *mydir; struct dirent *mydirent; FILE *fs; + char Buffer[MAX_BUFF]; char alias_user[MAX_BUFF]; char alias_name[MAX_FILE_NAME]; char *alias_domain; @@ -82,9 +83,9 @@ k=0; if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"<tr><td colspan=\"4\">"); - fprintf(actout,"%s %d", get_html_text("143"), 1); - fprintf(actout,"</td></tr>"); + strcpy(uBufA, "4"); + sprintf(uBufB, "%s %d", get_html_text("143"), 1); + send_template_now("show_error_line.html"); return(0); } @@ -111,9 +112,9 @@ } if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout,"<tr><td colspan=4>"); - fprintf(actout,"%s %s", get_html_text("144"), mydirent->d_name); - fprintf(actout,"</td></tr>\n"); + strcpy(uBufA, "4"); + sprintf(uBufB, "SDQL %s %s", get_html_text("144"), mydirent->d_name); + send_template_now("show_error_line.html"); continue; } for(i=7,j=0;j<MAX_FILE_NAME-1&&mydirent->d_name[i]!=0;++i,++j) { @@ -133,21 +134,22 @@ if ( alias_name_from_command != NULL || *TmpBuf2 == '#') { stop=0; - fprintf(actout, "<tr>\n"); - qmail_button (alias_name, "deldotqmail", user, dom, mytime, "trash.png"); + qmail_button(uBufA, "deldotqmail", alias_name, "trash.png"); + if (*TmpBuf2 == '#') - fprintf(actout, "<td> </td>"); /* don't allow modify on blackhole */ + strcpy( uBufB, " "); else - qmail_button (alias_name, "moddotqmail", user, dom, mytime, "modify.png"); - fprintf(actout, "<td align=left>%s</td>\n", alias_name); - fprintf(actout, "<td align=left>"); + qmail_button(uBufB, "moddotqmail", alias_name, "modify.png"); + + sprintf(uBufC, "%s", alias_name); if (*TmpBuf2 == '#') { /* this is a blackhole account */ - fprintf (actout, "<I>%s</I>", get_html_text("303")); + sprintf (Buffer, "%s", get_html_text("303")); stop = 1; } while (!stop) { + alias_name_from_command = dotqmail_alias_command(TmpBuf2); /* check to see if it is an invalid line , @@ -182,14 +184,15 @@ if (fgets(TmpBuf2, sizeof(TmpBuf2), fs) == NULL) { stop=1; - fprintf(actout, "%s ", alias_user); + sprintf(Buffer, "%s%s ", Buffer, alias_user); } else { - fprintf(actout, "%s, ", alias_user); + sprintf(Buffer, "%s%s, ", Buffer, alias_user); } + } - fprintf(actout, "</td>\n"); - - fprintf(actout, "</tr>\n"); + strcpy(uBufD, Buffer); + strcpy(Buffer, ""); + send_template_now("show_forwards_line.html"); } fclose(fs); k++; @@ -201,24 +204,6 @@ free(namelist[m]); free(namelist); - if (AdminType == DOMAIN_ADMIN) { - fprintf(actout, "<tr><td align=\"right\" colspan=\"4\">"); - fprintf(actout, "[ "); - if(atoi(Pagenumber) > 1 ) { - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%d\">%s</a>", - CGIPATH,user,dom,mytime,atoi(Pagenumber)-1?atoi(Pagenumber)-1:atoi(Pagenumber),get_html_text("135")); - fprintf(actout, " | "); - } - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%s\">%s</a>", - CGIPATH,user,dom,mytime,Pagenumber,get_html_text("136")); - fprintf(actout, " | "); - if (moreusers) { - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%d\">%s</a>", - CGIPATH,user,dom,mytime,atoi(Pagenumber)+1,get_html_text("137")); - fprintf(actout, " ]"); - } - fprintf(actout, "</td></tr>"); - } } /* @@ -251,14 +236,10 @@ } if ( (fs=fopen(dot_file,"r"))==NULL) { - sprintf(StatusMessage,"%s %s<br>\n", get_html_text("144"), dot_file); - vclose(); - exit(0); + sprintf(StatusMessage,"SDQF %s %s<br>\n", get_html_text("144"), dot_file); + return(144); } - fprintf(actout, "<tr>"); - fprintf(actout, "<td align=\"center\" valign=\"top\"><b>%s</b></td>", user); - memset(TmpBuf2, 0, sizeof(TmpBuf2)); while (fgets( TmpBuf2, sizeof(TmpBuf2), fs) != NULL) { @@ -286,34 +267,7 @@ alias_name_from_command); } } - fprintf(actout, "<td align=\"center\" valign=\"top\">%s</td>\n", alias_user); - fprintf(actout, "<td align=\"center\" valign=\"top\">\n"); - fprintf(actout, "<form method=\"post\" name=\"moddotqmail\" action=\"%s/com/moddotqmailnow\">\n", CGIPATH); - fprintf(actout, "<input type=\"hidden\" name=\"user\" value=\"%s\">\n", - Username); - fprintf(actout, "<input type=\"hidden\" name=\"dom\" value=\"%s\">\n", - Domain); - fprintf(actout, "<input type=\"hidden\" name=\"time\" value=\"%i\">\n", - Mytime); - fprintf(actout, "<input type=\"hidden\" name=\"modu\" value=\"%s\">\n", - user); - fprintf(actout, "<input type=\"hidden\" name=\"linedata\" value=\"%s\">\n", - TmpBuf2); - fprintf(actout, "<input type=\"hidden\" name=\"action\" value=\"delentry\">\n"); - fprintf(actout, "<input type=\"image\" border=\"0\" src=\"%s/delete.png\">\n", - IMAGEURL); - fprintf(actout, "</form>\n"); - - - fprintf(actout, "</td>\n"); - fprintf(actout, "</tr>\n"); - fprintf(actout, "<tr>\n"); - fprintf(actout, "<td align=\"left\"> </td>\n"); } - /* finish up the last line (all empty) */ - fprintf(actout, "<td align=\"left\"> </td>"); - fprintf(actout, "<td align=\"left\"> </td>"); - fprintf(actout, "</tr>"); fclose(fs); } @@ -414,8 +368,6 @@ adddotqmail() { - count_forwards(); - load_limits(); if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { sprintf(StatusMessage, "%s %d\n", get_html_text("157"), MaxForwards); @@ -438,8 +390,6 @@ exit(0); } - count_forwards(); - load_limits(); if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { sprintf(StatusMessage, "%s %d\n", get_html_text("157"), MaxForwards); send_template( "add_forward.html" ); @@ -549,7 +499,6 @@ } /* don't display aliases/forwards if we just deleted the last one */ - count_forwards(); if(CurForwards == 0) { show_menu(Username, Domain, Mytime); } else { Index: autorespond.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- autorespond.c 13 Jan 2004 06:28:34 -0000 1.3 +++ autorespond.c 30 Jan 2004 03:28:19 -0000 1.4 @@ -31,6 +31,9 @@ #include "qmailadmin.h" #include "qmailadminx.h" +static int FileReady=0; +static FILE *MessageFile=NULL; + show_autoresponders(user,dom,mytime,dir) char *user; char *dom; @@ -39,8 +42,6 @@ { if ( MaxAutoResponders == 0 ) return(0); - count_autoresponders(); - if(CurAutoResponders == 0) { sprintf(StatusMessage,"%s", get_html_text("233")); show_menu(Username, Domain, Mytime); @@ -58,9 +59,8 @@ int i,j; if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout, "<tr><td colspan=\"3\">%s %d</td></tr>\n", - get_html_text("143"), 1); - return 0; + fprintf(stderr, "%s\n", get_html_text("143")); + return 143; } sort_init(); @@ -69,8 +69,9 @@ /* does name start with ".qmail-" ? */ if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout, "<tr><td colspan=\"3\">%s %s</td></tr>\n", - get_html_text("144"), mydirent->d_name); + strcpy(uBufA, "3"); + sprintf(uBufB, "SAL %s %s\n", get_html_text("144"), mydirent->d_name); + send_template_now("show_error_line.html"); continue; } @@ -86,24 +87,10 @@ sort_dosort(); for (i = 0; addr = sort_get_entry(i); ++i) { - str_replace (addr, ':', '.'); - fprintf(actout, "<tr>"); - - fprintf(actout, "<td align=\"center\">"); - fprintf(actout, "<a href=\"%s/com/delautorespond?user=%s&dom=%s&time=%d&modu=%s\">", - CGIPATH,user,dom,mytime,addr); - fprintf(actout, "<img src=\"%s/trash.png\" border=\"0\"></a>", IMAGEURL); - fprintf(actout, "</td>"); - - fprintf(actout, "<td align=\"center\">"); - fprintf(actout, "<a href=\"%s/com/modautorespond?user=%s&dom=%s&time=%d&modu=%s\">", - CGIPATH,user,dom,mytime,addr); - fprintf(actout, "<img src=\"%s/modify.png\" border=\"0\"></a>", IMAGEURL); - fprintf(actout, "</td>"); - - fprintf(actout, "<td align=\"left\">%s@%s</td>", addr, Domain); - - fprintf(actout, "</tr>\n"); + qmail_button(uBufA, "delautorespond", addr, "Buffer.png" ); + qmail_button(uBufB, "modautorespond", addr, "modify.png" ); + sprintf(uBufC, "%s@%s", addr, Domain); + send_template_now("show_autorespond_line.html"); } sort_cleanup(); } @@ -117,8 +104,6 @@ exit(0); } - count_autoresponders(); - load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { fprintf(actout, "%s %d\n", get_html_text("158"), MaxAutoResponders); show_menu(); @@ -142,8 +127,6 @@ exit(0); } - count_autoresponders(); - load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { fprintf(actout, "%s %d\n", get_html_text("158"), MaxAutoResponders); show_menu(); @@ -278,8 +261,6 @@ vdelfiles(TmpBuf); sprintf(StatusMessage, "%s %s\n", get_html_text("182"), ActionUser); - count_autoresponders(); - if(CurAutoResponders == 0) { show_menu(Username, Domain, Mytime); } else { @@ -289,12 +270,96 @@ modautorespond() { + char fqfn[MAX_BUFF]; + char Buffer[MAX_BUFF]; + char Subj[MAX_BUFF]; + FILE *fs; + int i,j; + if ( AdminType!=DOMAIN_ADMIN ) { sprintf(StatusMessage,"%s", get_html_text("142")); vclose(); exit(0); } + + /* Build the .qmail file name */ + sprintf(fqfn, ".qmail-%s", ActionUser); + + /* Change '.' to ':' to follow .qmail file name rules */ + for (i=6; fqfn[i] != 0; ++i) { + if (fqfn[i] == '.') fqfn[i] = ':'; + } + + /* Open the .qmail file */ + if ((fs=fopen(fqfn, "r")) == NULL) { + /* open failed */ + ack("123", 123); + } + + /* Discard the first line */ + fgets(Buffer, sizeof(Buffer), fs); + + /* Read the second line - forward */ + if (fgets(Buffer, sizeof(Buffer), fs)) { + + /* See if it's a Maildir path or full address */ + i = strlen(Buffer) - 2; + if (Buffer[i] == '/') { + /* Maildir path */ + --i; + for(; Buffer[i] != '/'; --i); + --i; + for(;Buffer[i]!='/';--i); + for(++i, j=0; Buffer[i] != '/'; ++j,++i) { + uBufA[j] = Buffer[i]; + } + uBufA[j] = '\0'; + + } else { + /* Full Address - take off newline */ + i = strlen(Buffer); --i; Buffer[i] = 0; + strcpy(uBufA, Buffer); + } + } + + /* close .qmail file */ + fclose(fs); + + /* Now look at the message file */ + + /* Build the message file name */ + strcpy(Buffer, ActionUser); + upperit(Buffer); + sprintf(fqfn, "%s/message", Buffer); + + /* Open the message file */ + if ((MessageFile = fopen(fqfn, "r")) == NULL) { + ack("123", 123); + } + + /* Discard the From line */ + fgets(Buffer, sizeof(Buffer), MessageFile); + + /* Read the Subject */ + fgets(uBufA, sizeof(uBufB), MessageFile); + + /* Discard blank line */ + fgets(Buffer, sizeof(Buffer), MessageFile); + FileReady=1; + send_template( "mod_autorespond.html" ); + + fclose( MessageFile ); +} + + +int display_robot_message() +{ + char Buffer[MAX_BUFF]; + + while (fgets(Buffer, sizeof(TmpBuf2), MessageFile)) { + fprintf(actout, "%s", Buffer); + } } @@ -383,37 +448,3 @@ sprintf(StatusMessage, "%s %s@%s\n", get_html_text("183"),ActionUser,Domain); show_autoresponders(Username, Domain, Mytime); } - -count_autoresponders() -{ - DIR *mydir; - struct dirent *mydirent; - FILE *fs; - char mailinglist_name[MAX_FILE_NAME]; - int i,j; - - if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); - fprintf(actout,"</table>"); - return(0); - } - - CurAutoResponders = 0; - while( (mydirent=readdir(mydir)) != NULL ) { - /* does name start with ".qmail-" ? */ - if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { - if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout,"%s %s<br>\n", get_html_text("144"), - mydirent->d_name); - continue; - } - fgets( TmpBuf2, sizeof(TmpBuf2), fs); - if ( strstr( TmpBuf2, "autorespond") != 0 ) { - ++CurAutoResponders; - } - fclose(fs); - } - } - closedir(mydir); - -} Index: command.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- command.c 10 Oct 2003 16:36:24 -0000 1.2 +++ command.c 30 Jan 2004 03:28:19 -0000 1.3 @@ -122,7 +122,7 @@ show_list_group("show_digest_subscribers.html"); } else if (strcmp(TmpBuf2, "moduser") == 0 ) { - GetValue(TmpCGI, ActionUser, "moduser=", sizeof(ActionUser)); + GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser)); moduser(); } else if (strcmp(TmpBuf2, "modusernow") == 0 ) { @@ -240,7 +240,7 @@ show_list_group("show_subscribers.html"); } else if (strcmp(TmpBuf2, "setdefault") == 0 ) { - GetValue(TmpCGI, ActionUser, "deluser=", sizeof(ActionUser)); + GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser)); GetValue(TmpCGI, Pagenumber, "page=", sizeof(Pagenumber)); setdefaultaccount(); @@ -279,6 +279,7 @@ sprintf(StatusMessage,"%s %s@%s", get_html_text("223"), ActionUser, Domain); } else { fprintf(fs, "| %s/bin/vdelivermail '' %s\n", VPOPMAILDIR, pw->pw_dir); + sprintf(CurCatchall, ActionUser); } fclose(fs); } Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- configure 26 Jan 2004 00:43:40 -0000 1.14 +++ configure 30 Jan 2004 03:28:19 -0000 1.15 @@ -1,19 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.57. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - -if expr a : '\(a\)' >/dev/null 2>&1; then [...2540 lines suppressed...] + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -6237,8 +6528,11 @@ # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. Index: forward.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/forward.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forward.c 10 Oct 2003 16:36:24 -0000 1.2 +++ forward.c 30 Jan 2004 03:28:19 -0000 1.3 @@ -41,8 +41,6 @@ exit(0); } - count_forwards(); - if(CurForwards == 0) { sprintf(StatusMessage,"%s", get_html_text("232")); show_menu(Username, Domain, Mytime); @@ -54,44 +52,3 @@ return 0; } - -int count_forwards(void) -{ - DIR *mydir; - struct dirent *mydirent; - struct stat mystat; - FILE *fs; - char *alias_name_from_command; - - /* FIXME: Do some caching here. */ - CurForwards = 0; - - if ((mydir = opendir(".")) == NULL) { - fprintf(actout, "<tr><td>%s %d</tr></td>\n", get_html_text("143"), 1); - return 0; - } - - while ((mydirent=readdir(mydir)) != NULL) { - /* - * don't read files that are really ezmlm-idx listowners, - * i.e. .qmail-user-owner - * - */ - if (strncmp (".qmail-", mydirent->d_name, 7) == 0) { - /* ignore symbolic links (ezmlm files) */ - if (!lstat(mydirent->d_name, &mystat) && S_ISLNK(mystat.st_mode)) continue; - - if ((fs=fopen(mydirent->d_name,"r")) == NULL) { - fprintf(actout, "%s %s<br>\n", get_html_text("144"), mydirent->d_name); - continue; - } - memset(TmpBuf2, 0, sizeof(TmpBuf2)); - fgets(TmpBuf2, sizeof(TmpBuf2), fs); - if (*TmpBuf2 != '|' && *TmpBuf2 != '#') CurForwards++; - fclose(fs); - } - } - closedir(mydir); - - return 0; -} Index: mailinglist.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mailinglist.c 4 Dec 2003 15:22:33 -0000 1.5 +++ mailinglist.c 30 Jan 2004 03:28:19 -0000 1.6 @@ -53,7 +53,6 @@ } /* see if there's anything to display */ - count_mailinglists(); if ( CurMailingLists == 0 ) { sprintf(StatusMessage,"%s", get_html_text("231")); show_menu(); @@ -81,36 +80,16 @@ vclose(); exit(0); } - if ( MaxMailingLists == 0 ) { return(0); } if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"<tr><td>%s %d</tr><td>", get_html_text("143"), 1); - return(0); + fprintf(stderr,"QmailAdmin: %s %s", + get_html_text("143"), "domain directory"); + return(143); } - /* First display the title row */ - fprintf(actout, "<tr bgcolor=\"#cccccc\">"); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("072")); -#ifdef EZMLMIDX - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("071")); -#endif - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("081")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("083")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("084")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("085")); -#ifdef EZMLMIDX - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("086")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("087")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("088")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("237")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("238")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("239")); -#endif - fprintf(actout, "</tr>\n"); - sort_init(); /* Now, display each list */ @@ -118,10 +97,12 @@ if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { #ifdef EZMLMIDX - fprintf(actout, "<tr><td colspan=12>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); + strcpy(uBufA, "12"); #else - fprintf(actout, "<tr><td colspan=5>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); + strcpy(uBufA, "5"); #endif + sprintf(uBufB, "SMLL %s %s\n", get_html_text("144"), mydirent->d_name); + send_template_now("show_error_line.html"); continue; } fgets(TmpBuf2, sizeof(TmpBuf2), fs); @@ -139,35 +120,34 @@ /* convert ':' in addr to '.' */ str_replace (addr, ':', '.'); - fprintf(actout,"<tr>"); - qmail_button(addr, "delmailinglist", user, dom, mytime, "trash.png"); + qmail_button(uBufA, "delmailinglist", addr, "trash.png"); #ifdef EZMLMIDX - qmail_button(addr, "modmailinglist", user, dom, mytime, "modify.png"); + qmail_button(uBufB, "modmailinglist", addr, "modify.png"); #endif - fprintf(actout,"<td align=left>%s</td>\n", addr); + sprintf(uBufC,"%s\n", addr); - qmail_button(addr, "addlistuser", user, dom, mytime, "delete.png"); - qmail_button(addr, "dellistuser", user, dom, mytime, "delete.png"); - qmail_button(addr, "showlistusers", user, dom, mytime, "delete.png"); + qmail_button(uBufD, "addlistuser", addr, "delete.png"); + qmail_button(uBufE, "dellistuser", addr, "delete.png"); + qmail_button(uBufF, "showlistusers", addr, "delete.png"); #ifdef EZMLMIDX - qmail_button(addr, "addlistmod", user, dom, mytime, "delete.png"); - qmail_button(addr, "dellistmod", user, dom, mytime, "delete.png"); - qmail_button(addr, "showlistmod", user, dom, mytime, "delete.png"); + qmail_button(uBufG, "addlistmod", addr, "delete.png"); + qmail_button(uBufH, "dellistmod", addr, "delete.png"); + qmail_button(uBufI, "showlistmod", addr, "delete.png"); /* Is it a digest list? */ if ( (fs=fopen(testfn,"r"))==NULL) { /* not a digest list */ fprintf (actout, "<TD COLSPAN=3> </TD>"); } else { - qmail_button(addr, "addlistdig", user, dom, mytime, "delete.png"); - qmail_button(addr, "dellistdig", user, dom, mytime, "delete.png"); - qmail_button(addr, "showlistdig", user, dom, mytime, "delete.png"); + qmail_button(uBufJ, "addlistdig", addr, "delete.png"); + qmail_button(uBufK, "dellistdig", addr, "delete.png"); + qmail_button(uBufL, "showlistdig", addr, "delete.png"); fclose(fs); } #endif - fprintf(actout, "</tr>\n"); + send_template_now("show_mailinglist_line.html"); } sort_cleanup(); } @@ -204,8 +184,8 @@ } if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); - return(0); + fprintf(stderr,"%s %s\n", get_html_text("143"), "domain directory"); + return(143); } listcount = 0; @@ -214,8 +194,7 @@ while( (mydirent=readdir(mydir)) != NULL ) { if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout,"%s %s<br>\n", - get_html_text("144"), mydirent->d_name); + fprintf(stderr,"SMLL3 %s %s\n", get_html_text("144"), mydirent->d_name); continue; } fgets( TmpBuf2, sizeof(TmpBuf2), fs); @@ -234,38 +213,31 @@ return 0; } - fprintf(actout,"<hr><table width=100%% cellpadding=1 cellspacing=0 border=0"); - fprintf(actout," align=center bgcolor=\"#000000\"><tr><td>"); - fprintf(actout,"<table width=100%% cellpadding=0 cellspacing=0 border=0 bgcolor=\"#e6e6e6\">"); - fprintf(actout,"<tr><th bgcolor=\"#000000\" colspan=2>"); - fprintf(actout,"<font color=\"#ffffff\">%s</font></th>\n", - get_html_text("095")); - sort_dosort(); fprintf(actout, "<INPUT NAME=number_of_mailinglist TYPE=hidden VALUE=%d>\n", listcount); - for (i = 0; i < listcount; ++i) - { + for (i = 0; i < listcount; ++i) { addr = sort_get_entry(i); str_replace (addr, ':', '.'); - fprintf(actout,"<TR><TD ALIGN=RIGHT><INPUT NAME=\"subscribe%d\" TYPE=checkbox VALUE=%s></TD>", i, addr); - fprintf(actout,"<TD align=LEFT>%s@%s</TD></TR>", addr, Domain); + sprintf(uBufA,"%d", i); + sprintf(uBufB,"%s", addr); + sprintf(uBufC,"%s@%s", addr, Domain); + send_template_now("show_mailinglist_line2.html"); } - fprintf(actout,"</table></td></tr></table>\n"); + sort_cleanup(); } int addmailinglist(void) { + if ( AdminType!=DOMAIN_ADMIN ) { sprintf(StatusMessage,"%s", get_html_text("142")); vclose(); exit(0); } - count_mailinglists(); - load_limits(); if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { fprintf(actout, "%s %d\n", get_html_text("184"), MaxMailingLists); @@ -343,7 +315,6 @@ sprintf(TmpBuf2, "%s/%s", RealDir, ActionUser); vdelfiles(TmpBuf2); - count_mailinglists(); sprintf(StatusMessage, "%s %s\n", get_html_text("186"), ActionUser); if ( CurMailingLists == 0 ) { show_menu(); @@ -357,6 +328,7 @@ * designed to be called by ezmlm_make() (after calling ezmlm-make) * Replaces the "Reply-To" line in <filename> with <newtext>. */ + void ezmlm_setreplyto (char *filename, char *newtext) { FILE *headerfile, *temp; @@ -590,8 +562,6 @@ int addmailinglistnow(void) { - count_mailinglists(); - load_limits(); if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { fprintf(actout, "%s %d\n", get_html_text("184"), MaxMailingLists); @@ -751,6 +721,7 @@ vclose(); exit(0); } + send_template(template); } @@ -886,38 +857,6 @@ dellistdignow() { dellistgroupnow(2); } */ -count_mailinglists() -{ - DIR *mydir; - struct dirent *mydirent; - FILE *fs; - - if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); - fprintf(actout,"</table>"); - return(0); - } - - - CurMailingLists = 0; - while( (mydirent=readdir(mydir)) != NULL ) { - if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { - if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout, get_html_text("144"), - mydirent->d_name); - continue; - } - fgets( TmpBuf2, sizeof(TmpBuf2), fs); - if ( strstr( TmpBuf2, "ezmlm-reject") != 0 ) { - ++CurMailingLists; - } - fclose(fs); - } - } - closedir(mydir); - -} - modmailinglist() { /* name of list to modify is stored in ActionUser */ Index: qmailadmin.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- qmailadmin.c 26 Jan 2004 00:41:07 -0000 1.6 +++ qmailadmin.c 30 Jan 2004 03:28:19 -0000 1.7 @@ -54,9 +54,8 @@ char Action[MAX_BUFF]; char Message[MAX_BIG_BUFF]; char StatusMessage[MAX_BIG_BUFF]; -int num_of_mailinglist; int CGIValues[256]; -char Pagenumber[MAX_BUFF]; +char Pagenumber[MAX_BUFF]=""; char SearchUser[MAX_BUFF]; time_t Mytime; char *TmpCGI = NULL; @@ -67,10 +66,9 @@ char TempBuf[MAX_BUFF]; int Compressed; FILE *actout; -FILE *lang_fs; -FILE *color_table; struct vlimits Limits; +int num_of_mailinglist; int AdminType; int MaxPopAccounts; int MaxAliases; @@ -85,15 +83,36 @@ int DisableWebmail; int DisableRelay; -int CurPopAccounts; -int CurForwards; -int CurAutoResponders; -int CurMailingLists; +int CurPopAccounts=0; +int CurForwards=0; +int CurAutoResponders=0; +int CurMailingLists=0; +int CurBlackholes=0; +char CurCatchall[MAX_BUFF]; + uid_t Uid; gid_t Gid; char RealDir[156]; + char Lang[40]; +char uBufA[MAX_BUFF]; +char uBufB[MAX_BUFF]; +char uBufC[MAX_BUFF]; +char uBufD[MAX_BUFF]; +char uBufE[MAX_BUFF]; +char uBufF[MAX_BUFF]; +char uBufG[MAX_BUFF]; +char uBufH[MAX_BUFF]; +char uBufI[MAX_BUFF]; +char uBufJ[MAX_BUFF]; +char uBufK[MAX_BUFF]; +char uBufL[MAX_BUFF]; + +/* not in qmailadminx.h */ +FILE *lang_fs; +FILE *color_table; + void del_id_files( char *); main(argc,argv) @@ -122,6 +141,8 @@ if ( pi ) pi = strdup(pi); if (pi && strncmp(pi, "/com/", 5) == 0) { + /* /com/ found in URL so there is something to do */ + fprintf( stderr, "\nMystery if case #1\n" ); struct vqpasswd *pw; memset(TmpBuf2, 0, sizeof(TmpBuf2)); @@ -150,11 +171,11 @@ } if ( chdir(RealDir) < 0 ) { - fprintf(stderr, "<h2>%s %s</h2>\n", get_html_text("171"), RealDir ); + fprintf(stderr, "MAIN %s %s\n", get_html_text("171"), RealDir ); } - load_limits(); - set_admin_type(); + fprintf( stderr, "in main before count_stuff\n" ); + count_stuff(); if ( AdminType == USER_ADMIN || AdminType == DOMAIN_ADMIN ) { auth_user_domain(ip_addr, pw); @@ -162,9 +183,12 @@ auth_system(ip_addr, pw); } + fprintf( stderr, "in main before process_commands\n" ); process_commands(); + fprintf( stderr, "in main after process_commands\n" ); } else if (pi && strncmp(pi, "/open/", 6) == 0) { + fprintf( stderr, "\nMystery if case #2\n" ); memset(TmpBuf2, 0, sizeof(TmpBuf2)); for(j=0,i=6;pi[i]!=0&&j<99;++i,++j) TmpBuf2[j] = pi[i]; rm = getenv("REQUEST_METHOD"); @@ -196,7 +220,9 @@ struct vqpasswd *pw; FILE *fs; + fprintf( stderr, "\nMystery if case #3\n" ); + /* Just logged in */ rm = getenv("REQUEST_METHOD"); if ( rm ) rm = strdup(rm); @@ -238,7 +264,8 @@ sprintf(TmpBuf, "%s/Maildir/%d.qw", pw->pw_dir, Mytime); fs = fopen(TmpBuf, "w"); if ( fs == NULL ) { - fprintf(actout,"%s %s<br>\n", get_html_text("144"), TmpBuf); + fprintf(actout,"MAIN %s %s\n", get_html_text("144"), TmpBuf); + fprintf(stderr,"MAIN %s %s\n", get_html_text("144"), TmpBuf); vclose(); exit(0); } Index: qmailadmin.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qmailadmin.h 10 Sep 2003 21:38:43 -0000 1.1.1.1 +++ qmailadmin.h 30 Jan 2004 03:28:19 -0000 1.2 @@ -50,5 +50,5 @@ void sort_dosort(); void str_replace (char *, char, char); -void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png); +char qmail_button(char *rv, char *modu, char *command, char *png); Index: qmailadminx.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadminx.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qmailadminx.h 10 Dec 2003 06:00:48 -0000 1.2 +++ qmailadminx.h 30 Jan 2004 03:28:19 -0000 1.3 @@ -57,7 +57,6 @@ extern int MaxAutoResponders; extern int MaxMailingLists; -extern int CallVmoduser; extern int DisablePOP; extern int DisableIMAP; extern int DisableDialup; @@ -69,13 +68,36 @@ extern int CurForwards; extern int CurAutoResponders; extern int CurMailingLists; +extern int CurBlackholes; +extern char CurCatchall[MAX_BUFF]; extern int Uid; extern int Gid; extern char RealDir[156]; -extern char *strstart(); -extern char *safe_getenv(); extern char Lang[40]; + +extern char uBufA[MAX_BUFF]; +extern char uBufB[MAX_BUFF]; +extern char uBufC[MAX_BUFF]; +extern char uBufD[MAX_BUFF]; +extern char uBufE[MAX_BUFF]; +extern char uBufF[MAX_BUFF]; +extern char uBufG[MAX_BUFF]; +extern char uBufH[MAX_BUFF]; +extern char uBufI[MAX_BUFF]; +extern char uBufJ[MAX_BUFF]; +extern char uBufK[MAX_BUFF]; +extern char uBufL[MAX_BUFF]; + void del_id_files( char *); int open_lang( char *lang); + +extern char *strstart(); +extern char *safe_getenv(); + +extern int count_stuff(void); + +/* Not found in any other QmailAdmin source file */ +/* extern int CallVmoduser; */ + Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- template.c 26 Jan 2004 00:41:07 -0000 1.7 +++ template.c 30 Jan 2004 03:28:19 -0000 1.8 @@ -45,8 +45,6 @@ void get_calling_host(); char *get_session_val(char *session_var); -static char NTmpBuf[500]; - /* * send an html template to the browser */ @@ -72,48 +70,58 @@ char *qnote = " MB"; struct vqpasswd *vpw; char value[MAX_BUFF]; + char Buffer[MAX_BUFF]; + char fqfn[MAX_BUFF]; if (strstr(filename, "/")!= NULL||strstr(filename,"..")!=NULL) { - printf("warning: invalid file name %s\n", filename ); + fprintf(stderr, "Qmailadmin: invalid template name %s\n", filename ); return(-1); } + /* Try to get the template path from ENVIRONMENT */ tmpstr = getenv(QMAILADMIN_TEMPLATEDIR); + + /* If not use the compiled in value */ if (tmpstr == NULL ) tmpstr = HTMLLIBDIR; - snprintf(TmpBuf2, (sizeof(TmpBuf2) - 1), "%s/html/%s", tmpstr, filename); - if (lstat(TmpBuf2, &mystat) == -1) { - printf("Warning: cannot lstat '%s', check permissions.<BR>\n", TmpBuf2); - return(-1); + /* Build the fully qualified file name */ + snprintf(fqfn, (sizeof(fqfn) - 1), "%s/html/%s", tmpstr, filename); + + /* Does file exist */ + if (lstat(fqfn, &mystat) == -1) { + fprintf(stderr, "Qmailadmin: Can't stat '%s', check permissions.\n", fqfn); + return(-2); } + + /* Don't allow symlinks in template directories */ if (S_ISLNK(mystat.st_mode)) { - printf("Warning: '%s' is a symbolic link.<BR>\n", TmpBuf2); - return(-1); + fprintf(stderr, "Qmailadmin: symlink not allowed '%s'\n", fqfn); + return(-3); } /* open the template */ - fs = fopen( TmpBuf2, "r" ); + fs = fopen( fqfn, "r" ); if (fs == NULL) { - fprintf(actout,"%s %s<br>\n", get_html_text("144"), TmpBuf2); - return 0; + fprintf(stderr,"STN1 %s %s\n", get_html_text("144"), fqfn); + return 144; } /* parse the template looking for "##" pattern */ while ((inchar = fgetc(fs)) >= 0) { + /* if not '#' then send it */ if (inchar != '#') { fputc(inchar, actout); - /* found a '#' */ } else { - /* look for a second '#' */ + /* found a '#' - look for a second '#' */ inchar = fgetc(fs); if (inchar < 0) { break; - /* found a tag */ } else if (inchar == '#') { + /* found a tag */ inchar = fgetc(fs); if (inchar < 0) break; @@ -131,8 +139,6 @@ /* show number of pop accounts */ case 'B': - load_limits(); - count_users(); if(MaxPopAccounts > -1) { printf("%d/%d", CurPopAccounts, MaxPopAccounts); } else { @@ -140,11 +146,6 @@ } break; - /* show the lines inside a alias table */ - case 'b': - show_dotqmail_lines(Username,Domain,Mytime,RealDir,"alias"); - break; - /* send the CGIPATH parameter */ case 'C': fprintf(actout,"%s", CGIPATH); @@ -178,70 +179,7 @@ /* display a file (used for mod_autorespond ONLY) */ /* this code should be moved to a function in autorespond.c */ case 'F': - { - FILE *fs; - sprintf(TmpBuf, ".qmail-%s", ActionUser); - for (i=6; TmpBuf[i] != 0; ++i) { - if (TmpBuf[i] == '.') TmpBuf[i] = ':'; - } - if ((fs=fopen(TmpBuf, "r")) == NULL) ack("123", 123); - fgets(TmpBuf2, sizeof(TmpBuf2), fs); - - if (fgets(TmpBuf2, sizeof(TmpBuf2), fs)) { - - /* See if it's a Maildir path rather than address */ - i = strlen(TmpBuf2) - 2; - if (TmpBuf2[i] == '/') { - --i; - for(; TmpBuf2[i] != '/'; --i); - --i; - for(;TmpBuf2[i]!='/';--i); - for(++i, j=0; TmpBuf2[i] != '/'; ++j,++i) { - TmpBuf3[j] = TmpBuf2[i]; - } - TmpBuf3[j] = '\0'; - fprintf(actout, "value=\"%s@%s\"><td>\n", TmpBuf3, Domain); - } else { - /* take off newline */ - i = strlen(TmpBuf2); --i; TmpBuf2[i] = 0; - fprintf(actout, "value=\"%s\"><td>\n", &TmpBuf2[1]); - } - } - fclose(fs); - upperit(ActionUser); - sprintf(TmpBuf, "%s/message", ActionUser); - - if ((fs = fopen(TmpBuf, "r")) == NULL) ack("123", 123); - - fgets( TmpBuf2, sizeof(TmpBuf2), fs); - fgets( TmpBuf2, sizeof(TmpBuf2), fs); - fprintf(actout, " <td> </td>\n"); - fprintf(actout, " </tr>\n"); - fprintf(actout, " <tr>\n"); - fprintf(actout, " <td align=right><b>%s</b></td>\n", get_html_text("006")); - - /* take off newline */ - i = strlen(TmpBuf2); --i; TmpBuf2[i] = 0; - fprintf(actout, " <td><input type=\"text\" size=40 name=\"alias\" maxlength=128 value=\"%s\"></td>\n", - &TmpBuf2[9]); - fprintf(actout, " <td> </td>\n"); - fprintf(actout, " </tr>\n"); - fprintf(actout, " </table>\n"); - fprintf(actout, " <textarea cols=80 rows=40 name=\"message\">"); - fgets(TmpBuf2, sizeof(TmpBuf2), fs); - while (fgets(TmpBuf2, sizeof(TmpBuf2), fs)) { - fprintf(actout, "%s", TmpBuf2); - } - fprintf(actout, "</textarea>"); - fclose(fs); - } - break; - - /* show the forwards */ - case 'f': - if (AdminType == DOMAIN_ADMIN) { - show_forwards(Username,Domain,Mytime,RealDir); - } + display_robot_message(); break; /* show the mailing list digest subscribers */ @@ -256,11 +194,6 @@ show_autorespond_line(Username,Domain,Mytime,RealDir); break; - /* show the counts */ - case 'h': - show_counts(); - break; - case 'I': show_dotqmail_file(ActionUser); break; @@ -279,8 +212,6 @@ /* show number of mailing lists */ /* Added by <mb...@pi...> 5th June 2003 */ case 'j': - load_limits(); - count_mailinglists(); if(MaxMailingLists > -1) { printf("%d/%d", CurMailingLists, MaxMailingLists); } else { @@ -291,8 +222,6 @@ /* show number of forwards */ /* Added by <mb...@pi...> 5th June 2003 */ case 'k': - load_limits(); - count_forwards(); if(MaxForwards > -1) { printf("%d/%d", CurForwards, MaxForwards); } else { @@ -303,8 +232,6 @@ /* show number of autoresponders */ /* Added by <mb...@pi...> 5th June 2003 */ case 'K': - load_limits(); - count_autoresponders(); if(MaxAutoResponders > -1) { printf("%d/%d", CurAutoResponders, MaxAutoResponders); } else { @@ -312,13 +239,6 @@ } break; - /* show the aliases stuff */ - case 'l': - if (AdminType == DOMAIN_ADMIN) { - show_aliases(Username,Domain,Mytime,RealDir); - } - break; - /* login username */ case 'L': if(strlen(Username)>0) { @@ -336,46 +256,25 @@ } break; - /* show the mailing lists */ - case 'm': - if (AdminType == DOMAIN_ADMIN) { - show_mailing_lists(Username,Domain,Mytime,RealDir); - } - break; - /* parse include files */ case 'N': i=0; TmpBuf[i]=fgetc(fs); if (TmpBuf[i] == '/') { - fprintf(actout, "%s", get_html_text("144")); + fprintf(actout, "STN2 %s", get_html_text("144")); } else { for(;TmpBuf[i] != '\0' && TmpBuf[i] != '#' && i < sizeof(TmpBuf)-1;) { TmpBuf[++i] = fgetc(fs); } TmpBuf[i] = '\0'; if ((strstr(TmpBuf, "../")) != NULL) { - fprintf(actout, "%s: %s", get_html_text("144"), TmpBuf); + fprintf(actout, "STN3 %s: %s", get_html_text("144"), TmpBuf); } else if((strcmp(TmpBuf, filename)) != 0) { send_template_now(TmpBuf); } } break; - /* build a pulldown menu of all POP/IMAP users */ - case 'O': - { - struct vqpasswd *pw; - - pw = vauth_getall(Domain,1,1); - while (pw != NULL) { - fprintf(actout, "<option value=\"%s\">%s</option>\n", - pw->pw_name, pw->pw_name); - pw = vauth_getall(Domain,0,0); - } - } - break; - /* show the mailing list moderators */ case 'o': if (AdminType == DOMAIN_ADMIN) { @@ -425,7 +324,7 @@ /* show the catchall name */ case 's': - get_catchall(); + fprintf(actout,"%s", CurCatchall); break; /* send the time parameter */ @@ -445,134 +344,72 @@ /* show the users */ case 'u': - show_users(Username,Domain,Mytime,RealDir); + switch(fgetc(fs)) { + case 'A': + fprintf(actout, "%s", uBufA); + break; + + case 'B': + fprintf(actout, "%s", uBufB); + break; + + case 'C': + fprintf(actout, "%s", uBufC); + break; + + case 'D': + fprintf(actout, "%s", uBufD); + break; + + case 'E': + fprintf(actout, "%s", uBufE); + break; + + case 'F': + fprintf(actout, "%s", uBufF); + break; + + case 'G': + fprintf(actout, "%s", uBufG); + break; + + case 'H': + fprintf(actout, "%s", uBufH); + break; + + case 'I': + fprintf(actout, "%s", uBufI); + break; + + case 'J': + fprintf(actout, "%s", uBufJ); + break; + + case 'K': + fprintf(actout, "%s", uBufK); + break; + + case 'L': + fprintf(actout, "%s", uBufL); + break; + + } break; /* show version number */ case 'V': - printf("<a href=\"http://sourceforge.net/projects/qmailadmin/\">%s</a> %s<BR>", - QA_PACKAGE, QA_VERSION); - printf("<a href=\"http://www.inter7.com/vpopmail/\">%s</a> %s<BR>", - PACKAGE, VERSION); + sprintf( uBufA, "%s", QA_PACKAGE ); + sprintf( uBufB, "%s", QA_VERSION ); + sprintf( uBufC, "%s", PACKAGE ); + sprintf( uBufD, "%s", VERSION ); + send_template_now("version.html"); break; - /* display the main menu */ - /* move this to a function... */ - case 'v': - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font><br>", - Domain); - fprintf(actout, - "<font size=\"2\" color=\"#ff0000\"><b>%s</b></font><br>", - get_html_text("001")); - if (AdminType==DOMAIN_ADMIN){ - - if (MaxPopAccounts != 0) { - fprintf(actout, - "<a href=\"%s/com/showusers?user=%s&time=%i&dom=%s&\">", - CGIPATH,Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("061")); - } - - if (MaxForwards != 0 || MaxAliases != 0) { - fprintf(actout, - "<a href=\"%s/com/showforwards?user=%s&time=%i&dom=%s&\">", - CGIPATH,Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("122")); - } - - if (MaxAutoResponders != 0) { - fprintf(actout, - "<a href=\"%s/com/showautoresponders?user=%s&time=%i&dom=%s&\">", - CGIPATH,Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></a></font><br>", - get_html_text("077")); - } - - if (*EZMLMDIR != 'n' && MaxMailingLists != 0) { - fprintf(actout, - "<a href=\"%s/com/showmailinglists?user=%s&time=%i&dom=%s&\">", - CGIPATH, Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("080")); - } - } else { - /* the quota code in here is kinda screwy and could use review - * then again, with recent changes, the non-admin shouldn't - * even get to this page. - */ - long diskquota = 0, maxmsg = 0; - char path[256]; - vpw = vauth_getpw(Username, Domain); - - fprintf(actout, - "<a href=\"%s/com/moduser?user=%s&time=%i&dom=%s&moduser=%s\">", - CGIPATH,Username,Mytime,Domain,Username); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s %s</b></font></a><br><br>", - get_html_text("111"), Username); - if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) { - quota_to_megabytes(qconvert, vpw->pw_shell); - } else { - sprintf(qconvert, get_html_text("229")); qnote = ""; - } - fprintf(actout, "<font size=\"2\" color=\"#000000\"><b>%s:</b><br>%s %s %s", - get_html_text("249"), get_html_text("253"), qconvert, qnote); - fprintf(actout, "<br>%s ", get_html_text("254")); - snprintf(path, sizeof(path), "%s/Maildir", vpw->pw_dir); - readuserquota(path, &diskquota, &maxmsg); - fprintf(actout, "%-2.2lf MB</font><br>", ((double)diskquota)/1048576.0); /* Convert to MB */ - } - - if (AdminType == DOMAIN_ADMIN) { - fprintf(actout, "<br>"); - fprintf(actout, - "<font size=\"2\" color=\"#ff0000\"><b>%s</b></font><br>", - get_html_text("124")); - - if (MaxPopAccounts != 0) { - fprintf(actout, - "<a href=\"%s/com/adduser?user=%s&time=%i&dom=%s&\">", - CGIPATH,Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("125")); - } - - if (MaxForwards != 0) { - fprintf(actout, - "<a href=\"%s/com/adddotqmail?atype=forward&user=%s&time=%i&dom=%s&\">", - CGIPATH, Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("127")); - } - - if (MaxAutoResponders != 0) { - fprintf(actout, - "<a href=\"%s/com/addautorespond?user=%s&time=%i&dom=%s&\">", - CGIPATH, Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></a></font><br>", - get_html_text("128")); - } - - if (*EZMLMDIR != 'n' && MaxMailingLists != 0) { - fprintf(actout, - "<a href=\"%s/com/addmailinglist?user=%s&time=%i&dom=%s&\">", - CGIPATH, Username,Mytime,Domain); - fprintf(actout, - "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", - get_html_text("129")); - } - } - break; + /* send the common URL parms */ + case 'W': + fprintf(actout,"user=%s&dom=%s&time=%d&page=%s", + Username, Domain, Mytime, Pagenumber); + break; /* dictionary line, we three more chars for the line */ case 'X': @@ -586,13 +423,12 @@ printf("<a href=\""); strcpy (value, get_session_val("returntext=")); if(strlen(value) > 0) { - printf("%s\">%s", + printf("%s\">%s</a>", get_session_val("returnhttp="), value); } else { - printf("%s/com/logout?user=%s&dom=%s&time=%d&\">%s", + printf("%s/com/logout?user=%s&dom=%s&time=%d&\">%s</a>", CGIPATH, Username, Domain, Mytime, get_html_text("218")); } - printf("</a>\n"); break; /* returnhttp */ @@ -716,142 +552,202 @@ static struct vqpasswd *vpw = NULL; static FILE *fs1=NULL; /* for the .qmail file */ static FILE *fs2=NULL; /* for the vacation message file */ + static char IsStandard[9]; /* ##i0 */ + static char IsForward[9]; /* ##i1 */ + static char ForwardAddr[MAX_BUFF]; /* ##i2 */ + static char IsLocalCopy[9]; /* ##i3 */ + static char IsVacation[9]; /* ##i4 */ + static char VacationSubject[MAX_BUFF]; /* ##i5 */ + static char IsBlackHole[9]; /* ##i8 */ + static char IsSpamCheck[9]; /* ##i9 */ + static int Initialized=0; + static int ResetVacation=1; int i; + char NTmpBuf[500]; - if (vpw==NULL) vpw = vauth_getpw(ActionUser, Domain); - if (fs1== NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/.qmail", vpw->pw_dir); - fs1 = fopen(NTmpBuf,"r"); - } - if ( newchar=='7') { - fprintf(actout, "%s", vpw->pw_gecos); - return; - } + /*********************************************************/ + + if( 0==Initialized ) { /* Not Initialized */ + fprintf( stderr, "Not initialized user: %s Domain %s\n", + ActionUser, Domain ); + /* Get data on user from vpopmail */ + vpw = vauth_getpw(ActionUser, Domain); - if (fs1 == NULL) { - if (newchar=='0'){ - printf("checked "); + /* Open the user's .qmail file */ + snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/.qmail", vpw->pw_dir); + if( (fs1 = fopen(NTmpBuf,"r"))==NULL) { + fprintf( stderr, "Unable to open user .qmail file: %s", NTmpBuf ); } - return; - } - /* start at the begingin if second time thru */ - rewind(fs1); + /* Initialize display values */ + strcpy(IsStandard, ""); + strcpy(IsForward, ""); + strcpy(IsLocalCopy, ""); + strcpy(IsVacation, ""); + strcpy(IsBlackHole, ""); + strcpy(IsSpamCheck, ""); - if (fgets(NTmpBuf,sizeof(NTmpBuf),fs1)!=NULL) { + if (fs1 == NULL) { + /* No .qmail file - standard delivery */ + strcpy(IsStandard, "checked "); + + } else if (fgets(NTmpBuf,sizeof(NTmpBuf),fs1)!=NULL) { + /* Parse the first line of the .qmail file */ - /* if it is a forward to a program */ - if (strstr(NTmpBuf, "autorespond")!=NULL ) { - if (newchar=='4') { - printf("checked "); - } else if (newchar=='5') { - if (fs2 == NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/vacation/message", vpw->pw_dir); - fs2 = fopen(NTmpBuf,"r"); - } - if (fs2 != NULL) { - rewind(fs2); - /* - * it's a hack, the second line always has - * the subject - */ - fgets(NTmpBuf,sizeof(NTmpBuf),fs2); - fgets(NTmpBuf,sizeof(NTmpBuf),fs2); - printf("%s", &NTmpBuf[9]); - } - } else if (newchar=='6') { - if (fs2 == NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/vacation/message", vpw->pw_dir); - fs2 = fopen(NTmpBuf,"r"); - } - if (fs2 != NULL) { - rewind(fs2); - for(i = 0; i < 3 && fgets(NTmpBuf,sizeof(NTmpBuf),fs2) != NULL; ++i); - while (fgets(NTmpBuf,sizeof(NTmpBuf),fs2) != NULL) { - printf("%s", NTmpBuf); - } - } + fprintf( stderr, "First line of .qmail file: " ); + fprintf( stderr, NTmpBuf ); + fprintf( stderr, "SPAM_COMMAND: " ); + fprintf( stderr, SPAM_COMMAND ); + fprintf( stderr, "\n" ); + + if( '&'==NTmpBuf[0] ) { + /* It is a forward */ + fprintf( stderr, "Forward\n" ); + strcpy(IsForward, "checked "); + strcpy(ForwardAddr, strtok(&NTmpBuf[1], "\n")); + + } else if (strstr(NTmpBuf, "autorespond")!=NULL ) { + /* It is a mail robot */ + fprintf( stderr, "Vacation\n" ); + strcpy(IsVacation, "checked "); + + } else if (strstr(NTmpBuf, "|/bin/true delete")!=NULL ) { + /* It is a black hole */ + fprintf( stderr, "Black Hole\n" ); + strcpy(IsBlackHole, "checked "); + + } else if (strstr(NTmpBuf, "#")!=NULL ) { + /* It is a better black hole */ + fprintf( stderr, "Better Black Hole\n" ); + strcpy(IsBlackHole, "checked "); + + } else if (strstr(NTmpBuf, "preline")!=NULL ) { + /* It is a spam checked simple delivery */ + fprintf( stderr, "Spam Checked\n" ); + strcpy(IsSpamCheck, "checked "); + + } else { + /* Nothing identified from first line */ + fprintf( stderr, "Not Identified\n" ); } - i = 0; - do { - if (newchar == '3' && (NTmpBuf[0] == '/' || - strstr(NTmpBuf, SPAM_COMMAND)!=NULL) ) { - printf("checked "); - return; - } - if ( newchar == '2' ) { - if (NTmpBuf[0]=='/') continue; - if (NTmpBuf[0]=='|') continue; - if ( i>0 ) printf(", "); - if (NTmpBuf[0]=='&') { - printf("%s", strtok(&NTmpBuf[1], "\n")); - } else { - printf("%s", NTmpBuf[0]); - } - ++i; - } - /* Jeff Hedlund (jef...@ma...) 28 May 2003 */ - /* i9: "checked" if spam filtering on */ - if ( newchar == '9' && strstr(NTmpBuf, SPAM_COMMAND)!=NULL ) { - printf("checked "); - return; + fprintf( stderr, "Before checking Second Line\n" ); + + if (fgets(NTmpBuf,sizeof(NTmpBuf),fs1)!=NULL) { + /* Parse the second line (if any) */ + fprintf( stderr, "Second Line %s\n", NTmpBuf ); + + if (strstr(IsForward, "checked ")!=NULL ) { + /* It is a forward with a saved copy */ + strcpy(IsLocalCopy, "checked "); + + if(strstr(NTmpBuf, SPAM_COMMAND)!=NULL) { + /* It is spam checked */ + fprintf( stderr, "Spam Checked\n" ); + strcpy(IsSpamCheck, "checked "); + } } - } while(fgets(NTmpBuf,sizeof(NTmpBuf),fs1) != NULL ); - - - return; - } else { - /* James Raftery <ja...@no...>, 21 May 2003 */ - /* i8: "checked" if blackhole */ - if (strstr(NTmpBuf, " delete\n") != NULL) { - if (newchar == '8') { - printf("checked "); + if (strstr(IsVacation, "checked ")!=NULL ) { + /* It is a Vacation check for spam */ + if(strstr(NTmpBuf, SPAM_COMMAND)!=NULL) { + /* It is spam checked */ + fprintf( stderr, "Spam Checked\n" ); + strcpy(IsSpamCheck, "checked "); + } } - return; - } - if (newchar == '1' || newchar == '0') { - if(strstr(NTmpBuf, SPAM_COMMAND)!=NULL) { - if(newchar == '0') printf("checked "); - } else { - if(newchar == '1') printf("checked "); + } else { /* There is no second line */ + fprintf( stderr, "No Second Line\n" ); + if (strstr(IsSpamCheck, "checked ")!=NULL ) { + /* One line, spam checked is Standard */ + strcpy(IsStandard, "checked "); } - return; } - i = 0; - do { - if (newchar == '3' && (NTmpBuf[0] == '/' || - strstr(NTmpBuf, SPAM_COMMAND)!=NULL)) { - printf("checked "); - return; - } + fprintf( stderr, "Before checking vacation second file\n" ); - if (newchar == '9' && strstr(NTmpBuf, SPAM_COMMAND)!=NULL ) { - printf("checked "); - return; - } - - if (newchar == '2') { - if (NTmpBuf[0]=='/') continue; - if (strstr(NTmpBuf, SPAM_COMMAND)!=NULL) continue; - if (i > 0) printf(", "); - if (NTmpBuf[0] == '&') { - printf("%s", strtok(&NTmpBuf[1], "\n")); - } else { - printf("%s", NTmpBuf); - } - ++i; - } - } while (fgets(NTmpBuf,sizeof(NTmpBuf),fs1) != NULL); + if (strstr(IsVacation, "checked ")!=NULL ) { + fprintf( stderr, "IsVacation - check second file\n" ); + snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/vacation/message", vpw->pw_dir); + fs2 = fopen(NTmpBuf,"r"); + /* Eat first line */ + fgets(NTmpBuf,sizeof(NTmpBuf),fs2); + + /* Second line is the subject */ + fgets(VacationSubject,sizeof(VacationSubject),fs2); + /* Leave the file ... [truncated message content] |
|
From: <tom...@pr...> - 2004-01-30 18:28:30
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22669 Modified Files: ChangeLog Log Message: set release date of 1.2.0 (final) Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChangeLog 26 Jan 2004 18:16:41 -0000 1.14 +++ ChangeLog 29 Jan 2004 05:18:22 -0000 1.15 @@ -1,7 +1,7 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. -1.2.0 - unreleased +1.2.0 - released 28-Jan-04 Tom Collins - Changes to Makefile to avoid copying CVS directories on install. |
|
From: <tom...@pr...> - 2004-01-29 14:12:14
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23324 Modified Files: configure Log Message: change aclocal/automake names back Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure 24 Jan 2004 15:56:51 -0000 1.13 +++ configure 26 Jan 2004 00:43:40 -0000 1.14 @@ -1484,13 +1484,13 @@ # Some tools Automake needs. -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} |
|
From: <tom...@pr...> - 2004-01-27 13:28:08
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22787 Modified Files: ChangeLog qmailadmin.c template.c user.c Log Message: undef PACKAGE_* macros defined in vpopmail_config.h to avoid warnings when redefined in QmailAdmin's config.h. [883245] Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChangeLog 24 Jan 2004 15:55:16 -0000 1.12 +++ ChangeLog 26 Jan 2004 00:41:07 -0000 1.13 @@ -7,6 +7,8 @@ - Changes to Makefile to avoid copying CVS directories on install. Fixes previous attempt that wasn't compatible with all platforms. - Update all mentions of --with-htmllibdir to --enable-htmllibdir. + - undef some macros defined in vpopmail_config.h and later defined + in QmailAdmin's config.h (PACKAGE_*). [883245] 1.2.0-rc3 - released 19-Jan-04 Index: qmailadmin.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- qmailadmin.c 8 Dec 2003 18:55:09 -0000 1.5 +++ qmailadmin.c 26 Jan 2004 00:41:07 -0000 1.6 @@ -25,10 +25,15 @@ #include <unistd.h> #include <pwd.h> #include <dirent.h> +#include <vpopmail_config.h> +/* undef some macros that get redefined in config.h below */ +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION #include "config.h" #include "qmailadmin.h" #include <vpopmail.h> -#include <vpopmail_config.h> #include <vauth.h> #include <vlimits.h> Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- template.c 7 Jan 2004 15:36:26 -0000 1.6 +++ template.c 26 Jan 2004 00:41:07 -0000 1.7 @@ -27,6 +27,11 @@ #include <dirent.h> #include <vpopmail.h> #include <vpopmail_config.h> +/* undef some macros that get redefined in config.h below */ +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION #include <vauth.h> #include "config.h" #include "qmailadmin.h" Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- user.c 14 Jan 2004 15:57:42 -0000 1.9 +++ user.c 26 Jan 2004 00:41:07 -0000 1.10 @@ -26,11 +26,16 @@ #include <pwd.h> #include <dirent.h> #include <errno.h> +#include <vpopmail_config.h> +/* undef some macros that get redefined in config.h below */ +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION #include "config.h" #include "qmailadmin.h" #include "qmailadminx.h" #include "vpopmail.h" -#include "vpopmail_config.h" #include "vauth.h" |
|
From: <tom...@pr...> - 2004-01-26 18:17:40
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11454 Modified Files: user.c ChangeLog Log Message: Fix bad quota when adding user with default (blank) quota field. Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- user.c 26 Jan 2004 00:41:07 -0000 1.10 +++ user.c 26 Jan 2004 18:16:40 -0000 1.11 @@ -481,15 +481,14 @@ #ifdef MODIFY_QUOTA if (strcmp (Quota, "NOQUOTA") == 0) { - strcpy (pw_shell, "NOQUOTA"); + vsetuserquota (Newu, Domain, "NOQUOTA"); } else if ( Quota[0] != 0 ) { if(quota_to_bytes(qconvert, Quota)) { sprintf(StatusMessage, get_html_text("314")); } else { - strcpy (pw_shell, qconvert); + vsetuserquota (Newu, Domain, qconvert); } } - mypw->pw_shell = pw_shell; #endif #ifdef MODIFY_SPAM @@ -502,24 +501,13 @@ } #endif - /* update the user information */ - if ( vauth_setpw( mypw, Domain ) != VA_SUCCESS ) { - - /* report error */ - sprintf(StatusMessage, "%s %s@%s (%s) %s", - get_html_text("002"), Newu, Domain, Gecos, - get_html_text("120")); - - } else { - - /* report success */ - sprintf(StatusMessage, "%s %s@%s (%s) %s", - get_html_text("002"), Newu, Domain, Gecos, - get_html_text("119")); - } + /* report success */ + sprintf(StatusMessage, "%s %s@%s (%s) %s", + get_html_text("002"), Newu, Domain, Gecos, + get_html_text("119")); - /* otherwise, report error */ } else { + /* otherwise, report error */ sprintf(StatusMessage, "<font color=\"red\">%s %s@%s (%s) %s</font>", get_html_text("002"), Newu, Domain, Gecos, get_html_text("120")); } Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChangeLog 26 Jan 2004 00:41:07 -0000 1.13 +++ ChangeLog 26 Jan 2004 18:16:41 -0000 1.14 @@ -9,6 +9,7 @@ - Update all mentions of --with-htmllibdir to --enable-htmllibdir. - undef some macros defined in vpopmail_config.h and later defined in QmailAdmin's config.h (PACKAGE_*). [883245] + - Fix bad quota when adding user with default (blank) quota field. 1.2.0-rc3 - released 19-Jan-04 |
|
From: <tom...@pr...> - 2004-01-26 17:38:01
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25119 Modified Files: configure.in configure Log Message: remove trailing '/' on default template dir Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- configure.in 24 Jan 2004 15:55:11 -0000 1.14 +++ configure.in 24 Jan 2004 15:56:51 -0000 1.15 @@ -143,7 +143,7 @@ ] ) AC_SUBST(imagedir) -htmllibdir="/usr/local/share/qmailadmin/" +htmllibdir="/usr/local/share/qmailadmin" AC_ARG_ENABLE(htmllibdir, [ --enable-htmllibdir=DIR qmailadmin HTML library directory.], htmllibdir="$enableval", Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure 24 Jan 2004 15:55:11 -0000 1.12 +++ configure 24 Jan 2004 15:56:51 -0000 1.13 @@ -4566,7 +4566,7 @@ fi; -htmllibdir="/usr/local/share/qmailadmin/" +htmllibdir="/usr/local/share/qmailadmin" # Check whether --enable-htmllibdir or --disable-htmllibdir was given. if test "${enable_htmllibdir+set}" = set; then |
|
From: <tom...@pr...> - 2004-01-25 17:24:54
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24882 Modified Files: configure.in configure INSTALL ChangeLog Log Message: Update all mentions of --with-htmllibdir to --enable-htmllibdir. Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure.in 7 Jan 2004 15:34:45 -0000 1.13 +++ configure.in 24 Jan 2004 15:55:11 -0000 1.14 @@ -150,7 +150,7 @@ [ if test "$htmllibdir" = "" then - AC_MSG_ERROR([Unable to find your htmllibdir directory, specify --with-htmllibdir.]) + AC_MSG_ERROR([Unable to find your htmllibdir directory, specify --enable-htmllibdir.]) fi ] ) AC_SUBST(htmllibdir,$htmllibdir) Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure 18 Jan 2004 16:41:14 -0000 1.11 +++ configure 24 Jan 2004 15:55:11 -0000 1.12 @@ -1484,13 +1484,13 @@ # Some tools Automake needs. -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} @@ -4576,8 +4576,8 @@ if test "$htmllibdir" = "" then - { { echo "$as_me:$LINENO: error: Unable to find your htmllibdir directory, specify --with-htmllibdir." >&5 -echo "$as_me: error: Unable to find your htmllibdir directory, specify --with-htmllibdir." >&2;} + { { echo "$as_me:$LINENO: error: Unable to find your htmllibdir directory, specify --enable-htmllibdir." >&5 +echo "$as_me: error: Unable to find your htmllibdir directory, specify --enable-htmllibdir." >&2;} { (exit 1); exit 1; }; } fi Index: INSTALL =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- INSTALL 8 Jan 2004 05:13:08 -0000 1.4 +++ INSTALL 24 Jan 2004 15:55:16 -0000 1.5 @@ -55,7 +55,7 @@ *Use this if your don't want the HTML templates to be in /usr/local/share/qmailadmin - --with-htmllibdir={dir} qmailadmin HTML library directory. + --enable-htmllibdir={dir} qmailadmin HTML library directory. *Use this if your qmail directory is not in /var/qmail --enable-qmaildir={dir} directory where qmail is installed. @@ -181,7 +181,7 @@ 7. If you want to modify the "look" of qmail admin: Edit the html template files in /usr/local/share/qmailadmin/ - or if you changed the location with the --with-htmllibdir={dir} + or if you changed the location with the --enable-htmllibdir={dir} then edit the files in that directory. The HTML elements for some not-very-often used features are included in comments in the template files. Remove the comment tags to see the relevant bits. Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChangeLog 22 Jan 2004 04:43:12 -0000 1.11 +++ ChangeLog 24 Jan 2004 15:55:16 -0000 1.12 @@ -6,6 +6,7 @@ Tom Collins - Changes to Makefile to avoid copying CVS directories on install. Fixes previous attempt that wasn't compatible with all platforms. + - Update all mentions of --with-htmllibdir to --enable-htmllibdir. 1.2.0-rc3 - released 19-Jan-04 |
|
From: <tom...@us...> - 2004-01-22 04:43:16
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv7562 Modified Files: Makefile.am Makefile.in ChangeLog Log Message: fix Makefile problem with non-compatible method of copying files Index: Makefile.am =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 18 Jan 2004 15:39:35 -0000 1.11 +++ Makefile.am 22 Jan 2004 04:43:12 -0000 1.12 @@ -66,14 +66,16 @@ $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp $(srcdir)/html/[^C]* $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/*.html $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/colortable $(DESTDIR)@htmllibdir@/html chmod 755 $(DESTDIR)@htmllibdir@/html chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp $(srcdir)/lang/[^C]* $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/?? $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/??-?? $(DESTDIR)@htmllibdir@/lang chmod 755 $(DESTDIR)@htmllibdir@/lang chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp $(srcdir)/images/[^C]* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/*.png $(DESTDIR)@imagedir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.in 18 Jan 2004 15:39:35 -0000 1.16 +++ Makefile.in 22 Jan 2004 04:43:12 -0000 1.17 @@ -507,16 +507,18 @@ $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp $(srcdir)/html/[^C]* $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/*.html $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/colortable $(DESTDIR)@htmllibdir@/html chmod 755 $(DESTDIR)@htmllibdir@/html chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp $(srcdir)/lang/[^C]* $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/?? $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/??-?? $(DESTDIR)@htmllibdir@/lang chmod 755 $(DESTDIR)@htmllibdir@/lang chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp $(srcdir)/images/[^C]* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/*.png $(DESTDIR)@imagedir@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChangeLog 22 Jan 2004 04:39:56 -0000 1.10 +++ ChangeLog 22 Jan 2004 04:43:12 -0000 1.11 @@ -3,6 +3,10 @@ 1.2.0 - unreleased + Tom Collins + - Changes to Makefile to avoid copying CVS directories on install. + Fixes previous attempt that wasn't compatible with all platforms. + 1.2.0-rc3 - released 19-Jan-04 Tom Collins |
|
From: <tom...@us...> - 2004-01-22 04:39:59
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv7002 Modified Files: ChangeLog Log Message: add 1.2.0 release Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChangeLog 19 Jan 2004 22:32:43 -0000 1.9 +++ ChangeLog 22 Jan 2004 04:39:56 -0000 1.10 @@ -1,6 +1,8 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. +1.2.0 - unreleased + 1.2.0-rc3 - released 19-Jan-04 Tom Collins |
|
From: <tom...@us...> - 2004-01-19 22:32:48
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv21128 Modified Files: ChangeLog Log Message: set release date of 1.2.0-rc3 Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 18 Jan 2004 15:26:02 -0000 1.8 +++ ChangeLog 19 Jan 2004 22:32:43 -0000 1.9 @@ -1,7 +1,7 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. -1.2.0-rc3 - unreleased +1.2.0-rc3 - released 19-Jan-04 Tom Collins - Minor formatting changes to configure.in for consistency. |
|
From: <tom...@us...> - 2004-01-18 16:41:17
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv30326
Modified Files:
aclocal.m4 configure config.h.in
Log Message:
fix aclocal-1.6/automake-1.6 problem
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aclocal.m4 8 Jan 2004 05:27:34 -0000 1.4
+++ aclocal.m4 18 Jan 2004 16:41:14 -0000 1.5
@@ -86,9 +86,9 @@
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(ACLOCAL, aclocal)
AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOMAKE, automake)
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
Index: configure
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure 8 Jan 2004 05:27:34 -0000 1.10
+++ configure 18 Jan 2004 16:41:14 -0000 1.11
@@ -1484,13 +1484,13 @@
# Some tools Automake needs.
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
Index: config.h.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h.in 17 Dec 2003 19:59:30 -0000 1.4
+++ config.h.in 18 Jan 2004 16:41:14 -0000 1.5
@@ -1,128 +1,175 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated from configure.in by autoheader. */
-/* Define if the closedir function returns void instead of int. */
+/* "" */
+#undef AUTORESPOND_PATH
+
+/* "" */
+#undef CGIPATH
+
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* Define to empty if the keyword does not work. */
-#undef const
+/* "" */
+#undef DOMAIN_AUTOFILL
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
+/* "" */
+#undef ENABLE_MYSQL
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
+/* "" */
+#undef EZMLMDIR
-/* Define if you have the dup2 function. */
+/* "" */
+#undef EZMLMIDX
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
-/* Define if you have the memset function. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `crypt' library (-lcrypt). */
+#undef HAVE_LIBCRYPT
+
+/* Define to 1 if you have the `shadow' library (-lshadow). */
+#undef HAVE_LIBSHADOW
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define if you have the mkdir function. */
+/* Define to 1 if you have the `mkdir' function. */
#undef HAVE_MKDIR
-/* Define if you have the strcasecmp function. */
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
-/* Define if you have the strchr function. */
+/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strdup function. */
+/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
-/* Define if you have the strncasecmp function. */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
-/* Define if you have the strrchr function. */
+/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define if you have the strstr function. */
+/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the crypt library (-lcrypt). */
-#undef HAVE_LIBCRYPT
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define if you have the shadow library (-lshadow). */
-#undef HAVE_LIBSHADOW
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* */
-#undef QA_PACKAGE
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/* */
-#undef QA_VERSION
+/* "" */
+#undef HELP
-/* */
+/* "" */
+#undef HTMLLIBDIR
+
+/* "" */
#undef IMAGEURL
-/* */
-#undef HTMLLIBDIR
+/* "" */
+#undef IPAUTH
-/* */
-#undef QMAILDIR
+/* "" */
+#undef MAXALIASESPERPAGE
-/* */
-#undef TRUE_PATH
+/* "" */
+#undef MAXUSERSPERPAGE
-/* */
-#undef EZMLMDIR
+/* "" */
+#undef MODIFY_QUOTA
-/* */
-#undef CGIPATH
+/* "" */
+#undef MODIFY_SPAM
-/* */
-#undef AUTORESPOND_PATH
+/* "" */
+#undef NO_CACHE
-/* */
-#undef VPOPUSER
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
-/* */
-#undef VPOPGROUP
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
-/* */
-#undef ENABLE_MYSQL
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
-/* */
-#undef MAXUSERSPERPAGE
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
-/* */
-#undef MAXALIASESPERPAGE
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
-/* */
-#undef NO_CACHE
+/* "" */
+#undef QA_PACKAGE
-/* */
-#undef IPAUTH
+/* "" */
+#undef QA_VERSION
-/* */
-#undef USER_INDEX
+/* "" */
+#undef QMAILDIR
-/* */
-#undef MODIFY_QUOTA
+/* "" */
+#undef SPAM_COMMAND
-/* */
-#undef DOMAIN_AUTOFILL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
-/* */
-#undef MODIFY_SPAM
+/* "" */
+#undef TRUE_PATH
-/* */
-#undef SPAM_COMMAND
+/* "" */
+#undef USER_INDEX
-/* */
-#undef HELP
+/* "" */
+#undef VPOPGROUP
-/* */
-#undef EZMLMIDX
+/* "" */
+#undef VPOPUSER
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
|
|
From: <tom...@us...> - 2004-01-18 15:39:38
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv18686 Modified Files: Makefile.am Makefile.in Log Message: fix Makefile to not copy CVS directory when working from repository copy Index: Makefile.am =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 18 Jan 2004 15:25:01 -0000 1.10 +++ Makefile.am 18 Jan 2004 15:39:35 -0000 1.11 @@ -61,18 +61,19 @@ dist-hook: +# use the [^C]* pattern to skip the CVS directory install-data-local: $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/[^C]* $(DESTDIR)@htmllibdir@/html chmod 755 $(DESTDIR)@htmllibdir@/html chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/[^C]* $(DESTDIR)@htmllibdir@/lang chmod 755 $(DESTDIR)@htmllibdir@/lang chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp $(srcdir)/images/* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/[^C]* $(DESTDIR)@imagedir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.in 18 Jan 2004 15:25:01 -0000 1.15 +++ Makefile.in 18 Jan 2004 15:39:35 -0000 1.16 @@ -502,20 +502,21 @@ dist-hook: +# use the [^C]* pattern to skip the CVS directory install-data-local: $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/[^C]* $(DESTDIR)@htmllibdir@/html chmod 755 $(DESTDIR)@htmllibdir@/html chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/[^C]* $(DESTDIR)@htmllibdir@/lang chmod 755 $(DESTDIR)@htmllibdir@/lang chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp $(srcdir)/images/* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/[^C]* $(DESTDIR)@imagedir@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |
|
From: <tom...@us...> - 2004-01-18 15:26:06
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv16306 Modified Files: TRANSLATORS ChangeLog Log Message: Add Jussi Siponen's Finnish translation. [879032] Index: TRANSLATORS =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/TRANSLATORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TRANSLATORS 16 Sep 2003 02:12:43 -0000 1.2 +++ TRANSLATORS 18 Jan 2004 15:26:02 -0000 1.3 @@ -7,6 +7,7 @@ da Danish Jesper Have <web...@jd...> de German Franz Stancl <Fra...@un...> es Spanish Jeremiah Tieman (JT) <jt...@in...> +fi Finnish Jussi Siponen <jus...@us...> fr French Nicolas Croiset <ncr...@vd...> fr French Jerome MOLLIER-PIERRET <j.m...@ac...> hu Hungarian HONTI Miklos <mi...@mi...> Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 18 Jan 2004 15:25:01 -0000 1.7 +++ ChangeLog 18 Jan 2004 15:26:02 -0000 1.8 @@ -12,6 +12,9 @@ - Switch to using new pw_flags field in auth.c. - Set permissions on html templates and lang files to 644 (not 755). + Jussi Siponen + - Add Finnish translation. [879032] + 1.2.0-rc2 - released 1-Jan-04 Tom Collins |
|
From: <tom...@us...> - 2004-01-18 15:26:05
|
Update of /cvsroot/qmailadmin/qmailadmin/lang In directory sc8-pr-cvs1:/tmp/cvs-serv16306/lang Added Files: fi Log Message: Add Jussi Siponen's Finnish translation. [879032] --- NEW FILE: fi --- 000 iso-8859-1 001 Päävalikko 002 Postilaatikko 003 Lisää postirobotti: 004 Postirobotin nimi: 005 Lähetä kopio osoitteeseen: 006 Aihe: 007 Lisää edelleenlähetys: 008 Lähetä edelleen osoitteeseen: 009 Paikallinen nimi: 010 (Anna paikallisen postilaatikon nimi<br>TAI<br>kokonainen sähköpostiosoite.) 011 Lisää listan valvoja 012 Lisää valvoja postituslistalle 013 Sähköpostiosoite: 014 Lisää tilaaja postituslistalle 015 Lisää postituslista 016 Postituslistan nimi: 017 Listan omistajan sähköpostiosoite: 018 Arkistoidaan 039 Salli etähallinta ja viestien noutaminen arkistosta. 053 MySQL -tuki 054 Palvelin 055 Portti 056 Käyttäjätunnus 057 Salasana 058 Tietokanta 059 Taulu 060 Lisää 061 Sähköpostilaatikot 062 Haavi: 063 Kommentti 064 Muokkaa<br>käyttäjää 065 Poista<br>laatikko 066 Haavi<br>-laatikko 067 Luo postilaatikko 068 Aliakset 069 Alias 070 Postilaatikot 071 Muokkaa 072 Poista 073 Lisää uusi Alias 074 Edelleenlähetykset 075 Edelleenlähetys 076 Lisää uusi edelleenlähetys 077 Postirobotit 078 Postirobotti 079 Lisää uusi Postirobotti 080 Postituslistat 081 Lista 082 Virhe avattaessa tiedostoa .qmail-default 083 Lisää<br>tilaaja 084 Poista<br>tilaaja 085 Näytä<br>tilaajat 086 Lisää<br>valvoja 087 Poista<br>valvoja 088 Näytä<br>valvojat 089 Uusi postituslista 090 Lisää postilaatikko 091 Salasana (uudestaan): 092 Oikea nimi 093 Listan nimi 094 Lisää tilaajaksi 095 Lisää uusi käyttäjä seuraavien postituslistojen tilaajaksi 096 Poista alias 097 Vahvista poisto 098 Poista postirobotti 099 MySQL -asetukset 100 Poista edelleenlähetys 101 Poista postituslista 102 Poista postilaatikko 103 Lähetä viestit edelleen 104 Kyllä, osoitteeseen: 105 Muokkaa postirobottia 106 Nimi 107 Sisältö 108 Lisää edelleenlähetys 109 Muokkaa laatikkoa 110 Uusi salasana 111 Muokkaa laatikkoa 112 Käyttäjän laatikko 113 Verkkotunnus (domain) 114 Käyttäjätunnus 115 Ohjaukset käyttäjälle 116 Voimassa olevat ohjaukset 117 Lisää/korvaa postin ohjaus 118 Poista ohjaus 119 lisätty 120 ei voitu lisätä 121 Aliakset 122 Edelleenohjaukset 123 Näytä ohjaukset 124 Pikalinkit 125 Uusi laatikko 126 Uusi alias 127 Uusi edelleenlähetys 128 Uusi postirobotti 129 Uusi postituslista 130 Haavi: Palautetaan 131 Ei enempää tietoja, palaa edelliselle sivulle 132 Oletus 133 Hakemisto: 134 Palauta haaviin jäävät 135 Edellinen sivu 136 Päivitä näkymä 137 Edellinen sivu 138 Kirjoita salasana 139 Laatikon salasana vaihdettu 140 Salasanaa ei vaihdettu. 141 laatikko poistettu 142 Ei käyttöoikeutta 143 virhe kansion käyttöoikeuksissa 144 virhe tiedoston käyttöoikeuksissa 145 Virhe: tuntematon käyttäjä 146 Virhe: kääntö ei onnistu 147 Käännä nyt 148 Sähköpostiosoite ei kelpaa 149 Viimeistä ei voi poistaa 150 Tiedostovirhe 151 Rivi poistettu 152 Edelleenohjaus lisätty 153 Käyttäjätunnusta ei löydy 154 Alias lisätty 155 Virheellinen toiminto 156 Aliasten sallittu määrä täynnä 157 Edelleenlähetysten sallittu määrä täynnä 158 Postirobottien sallittu määrä täynnä 159 Invalid DotQmail Type: adddotqmail() 160 Alias ei kelpaa 161 Edelleenlähetystä ei lisätty. Pyydettyä paikallista laatikkoa ei löydetty. 162 Laatikon nimi ei kelpaa 163 Edelleenlähetyksen nimi ei kelpaa 164 Invalid Alias Type : adddotqmailnow() 165 Virhe lisättäessä aliasta laatikolle 166 Alias lisätty laatikolle 167 Virhe poistettaessa aliasta/edelleenlähetystä. 168 Alias/edelleenlähetys poistettu. 169 Virhe poistettaessa ohjausta/edelleenlähetystä. 170 Ohjaus/edelleenlähetys poistettu 171 Virhe: kansiota ei voitu avata 172 Tunnuksella postmaster voi olla vain yksi istunto kerrallaan auki. Joku on jo kirjautunut tällä tunnuksella. 173 istunto vanhentunut, kirjaudu uudelleen 174 Postirobotin nimi ei kelpaa 175 Nimi on jo käytössä 176 Anna postirobotin nimi 177 Omistajan sähköpostiosoite ei kelpaa 178 Anna Aihe 179 Kirjoita viesti 180 Postirobotti lisätty 181 Virhe poistettaessa postirobottia 182 Postirobotti poistettu 183 Postirobotin asetukset muutettu 184 Postituslistojen sallittu määrä täynnä 185 Tiedostoa ei voitu poistaa 186 Postituslista poistettu 187 Postituslista lisätty 188 Postituslistan nimi ei kelpaa 189 Listan tilaajien sähköpostiosoitteet 190 Lista päättyy 191 Listan valvojien sähköpostiosoitteet 192 Takaisin päävalikkoon 193 lisätty postituslistalle 194 Sähköpostiosoite lisätty valvojana listalle 195 Poista tilaaja listalta 196 Poista valvoja listalta 197 valvoja poistettu 198 Kirjautuminen ei onnistunut 199 Laatikoiden sallittu määrä täynnä 200 Salasanat eivät vastaa toisiaan, yritä uudelleen 201 Muisti loppui 202 Parametrit ovat: 203 poistettu listalta 204 Hyppää laatikkoon 205 Vakio 206 Aseta ulkoa tulevien viestien haavi 207 Aseta ulkoa tulevien haaviksi 208 Ulkoa tulevien viestien haavi: 209 Edelleenlähetys 210 Tallenna kopio 211 Lähetä osoitteeseen: 212 Lomatiedote 213 Lomatiedotteen aihe: 214 Lomatiedotteen viesti: 215 Osoite on annettava 216 Aihe on annettava 217 Päivitä näkymä 218 Poistu 219 Listan valvojat 220 Valvojan osoite 221 Listan tilaajat 222 Tilaajan osoite 223 Laatikkoa ei löytynyt 224 (napsauta muokataksesi) 225 Muokkaa postituslistaa 226 Postituslistan asetukset muutettu 227 Digest 228 Valvojia: 229 ei rajoitettu 230 Tilaajia: 231 Ei postituslistoja 232 Ei aliaksia/edelleenlähetyksiä 233 Ei postirobotteja 234 Anna salasana 235 Poista haaviin jäävät 236 Haavi: Poistetaan 237 Lisää<br>Digest -tilaaja 238 Poista<br>Digest -tilaaja 239 Näytä<br>Digest -tilaajat 240 Sähköpostiosoite lisätty digest -tilaajana listalle 241 Lisää digest -tilaaja listalle 242 poistettu digest -tilaajana 243 Poista digest -tilaaja listalta 244 Digest -tilaajia: 245 Poista<br>digest -tilaaja 246 Digest -tilaajan sähköpostiosoite 247 Näytä digest -tilaajat 248 Listan digest -tilaajien sähköpostiosoitteet 249 Kiintiö (MB) 250 Käytetty 251 (NOQUOTA jos ei rajoiteta) 252 (tyhjä jos ei rajoiteta) 253 Raja: 254 Käytetty: 255 Laatikoita 256 Lisää viestien aiheeseen etuliitteeksi: 257 Käyttäjän ohje 258 Pääkäyttäjän ohje 259 Ohjeen hakemisto 260 Reititys 261 listanimi 262 Viestien lähetys 263 Kaikki voivat lähettää. 264 Vain tilaajat voivat lähettää, muiden viestit hylätään. 265 Vain tilaajat voivat lähettää, muiden viestit menevät valvojille hyväksyttäviksi. 266 Vain valvojat voivat lähettää, muiden viestit hylätään. 267 Vain valvojat voivat lähettää, muiden viestit menevät valvojille hyväksyttäviksi. 268 Postituslistan asetukset 269 Viestien aiheiden eteen lisätään <B>[%s]</B>. 270 Viestien loppuun lisätään vakiotiedote. 271 Luo digest -versio listasta. 272 Digest -version nimi on %s-digest. 273 Palvele osoitteessa %s-request. 274 Osoitteiden %s-subscribe, %s-unsubscribe, jne. lisäksi tilaajat voivat lähettää palvelupyyntöjä osoitteeseen %s-request. 275 Etähallinta 276 Salli etähallinta valvojille. 277 Tee tästä yksityinen lista. 278 Vain valvojat voivat lisätä ja poistaa tilaajia, käyttää arkistoa, jne. 279 Valvojat voivat: 280 Pyytää luettelon tilaajista. 281 Muokata vakiotekstejä. 282 kuten viestin lopun vakiotiedote, ohjeet, jne. 283 Tilauspyynnöt: 284 Listan tilauspyynnöt: 285 Vaativat vahvistuksen tilaajan osoitteeseen lähetettyyn viestiin vastaamalla. 286 Vaativat valvojan hyväksynnän. 287 Listan tilauksen irtisanomispyynnöt: 288 Varoitus: jos vahvistuksia ei vaadita, on mahdollista tehdä ja irtisanoa tilauksia toisten nimissä väärentämällä lähettäjätietoja. 289 Viestien arkistointi 290 Arkistoi listalle lähetetyt viestit. 291 Web-julkaisukelpoisesti (käyttämällä ezmlm-cgi -ohjelmaa). 292 Arkiston käyttö on 293 sallittu kaikille 294 rajoitettu tilaajiin 295 rajoitetu valvojiin 296 Postilaatikon liput 297 kyllä 298 ei 299 Flag0 300 Flag1 301 Flag2 302 Flag3 303 Poistettu 304 Roskapostin torjunta? 305 Kohde 306 osoitteeseen 307 Kiintiö ei kelpaa 308 Kiintiö on rajoittamaton 309 Kiintiö on %s tavua 310 Vastaukset lähetetään 311 alkuperäiselle lähettäjälle 312 koko listalle 313 osoitteeseen 314 Annettu kiintiö ei kelpaa 315 Käyttäjä poistettu. Edelleenlähetystä osoitteeseen '%s' ei asetettu. |
|
From: <tom...@us...> - 2004-01-18 15:25:05
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv16139 Modified Files: Makefile.am Makefile.in ChangeLog Log Message: set proper permissions on html templates and translations Index: Makefile.am =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 2 Jan 2004 06:03:32 -0000 1.9 +++ Makefile.am 18 Jan 2004 15:25:01 -0000 1.10 @@ -65,12 +65,14 @@ $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp -R $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html - chmod -R 755 $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html + chmod 755 $(DESTDIR)@htmllibdir@/html + chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp -R $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang - chmod -R 755 $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang + chmod 755 $(DESTDIR)@htmllibdir@/lang + chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp -R $(srcdir)/images/* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/* $(DESTDIR)@imagedir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.in 8 Jan 2004 05:27:34 -0000 1.14 +++ Makefile.in 18 Jan 2004 15:25:01 -0000 1.15 @@ -506,14 +506,16 @@ $(mkinstalldirs) $(DESTDIR)@htmllibdir@ rm -rf $(DESTDIR)@htmllibdir@/html $(mkinstalldirs) $(DESTDIR)@htmllibdir@/html - cp -R $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html - chmod -R 755 $(DESTDIR)@htmllibdir@/html + cp $(srcdir)/html/* $(DESTDIR)@htmllibdir@/html + chmod 755 $(DESTDIR)@htmllibdir@/html + chmod 644 $(DESTDIR)@htmllibdir@/html/* rm -rf $(DESTDIR)@htmllibdir@/lang $(mkinstalldirs) $(DESTDIR)@htmllibdir@/lang - cp -R $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang - chmod -R 755 $(DESTDIR)@htmllibdir@/lang + cp $(srcdir)/lang/* $(DESTDIR)@htmllibdir@/lang + chmod 755 $(DESTDIR)@htmllibdir@/lang + chmod 644 $(DESTDIR)@htmllibdir@/lang/* $(mkinstalldirs) $(DESTDIR)@imagedir@ - cp -R $(srcdir)/images/* $(DESTDIR)@imagedir@ + cp $(srcdir)/images/* $(DESTDIR)@imagedir@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 14 Jan 2004 15:59:50 -0000 1.6 +++ ChangeLog 18 Jan 2004 15:25:01 -0000 1.7 @@ -10,6 +10,7 @@ - Properly format autoresponder names with '.' in them. [872721] - Remove old code and redundant quota setting code from user.c. - Switch to using new pw_flags field in auth.c. + - Set permissions on html templates and lang files to 644 (not 755). 1.2.0-rc2 - released 1-Jan-04 |
|
From: <tom...@us...> - 2004-01-14 21:23:28
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv15420 Modified Files: alias.c Log Message: remove dupe include of unistd.h Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- alias.c 26 Dec 2003 18:56:33 -0000 1.3 +++ alias.c 14 Jan 2004 21:23:25 -0000 1.4 @@ -21,7 +21,6 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <unistd.h> #include <pwd.h> #include <errno.h> #include <dirent.h> |
|
From: <tom...@us...> - 2004-01-14 15:59:53
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv29194
Modified Files:
auth.c ChangeLog
Log Message:
Switch to using new pw_flags field in auth.c.
Index: auth.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/auth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- auth.c 10 Oct 2003 16:36:24 -0000 1.2
+++ auth.c 14 Jan 2004 15:59:50 -0000 1.3
@@ -151,7 +151,11 @@
if ( strlen(Domain) > 0 ) {
if ( strcmp(Username,"postmaster")==0 ) {
AdminType = DOMAIN_ADMIN;
+#ifdef VQPASSWD_HAS_PW_FLAGS
+ } else if ( vpw->pw_flags & QA_ADMIN ) {
+#else
} else if ( vpw->pw_gid & QA_ADMIN ) {
+#endif
AdminType = DOMAIN_ADMIN;
} else {
AdminType = USER_ADMIN;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog 14 Jan 2004 15:57:42 -0000 1.5
+++ ChangeLog 14 Jan 2004 15:59:50 -0000 1.6
@@ -9,6 +9,7 @@
- More updates to build files.
- Properly format autoresponder names with '.' in them. [872721]
- Remove old code and redundant quota setting code from user.c.
+ - Switch to using new pw_flags field in auth.c.
1.2.0-rc2 - released 1-Jan-04
|
|
From: <tom...@us...> - 2004-01-14 15:57:45
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv28699
Modified Files:
user.c ChangeLog
Log Message:
Remove old code and redundant quota setting code from user.c.
Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- user.c 10 Dec 2003 06:29:41 -0000 1.8
+++ user.c 14 Jan 2004 15:57:42 -0000 1.9
@@ -469,31 +469,11 @@
#endif
(mypw = vauth_getpw( Newu, Domain )) != NULL ) {
- /* from the load_limits() function, set user flags */
- /* These aren't default limits, they're domain limits.
- They should not be applied to new accounts.
- if( DisablePOP > 0 ) mypw->pw_gid |= NO_POP;
- if( DisableIMAP > 0 ) mypw->pw_gid |= NO_IMAP;
- if( DisableDialup > 0 ) mypw->pw_gid |= NO_DIALUP;
- if( DisablePasswordChanging > 0 ) mypw->pw_gid |= NO_PASSWD_CHNG;
- if( DisableWebmail > 0 ) mypw->pw_gid |= NO_WEBMAIL;
- if( DisableRelay > 0 ) mypw->pw_gid |= NO_RELAY;
- */
-
- /* Once we're sure people are using vpopmail 5.3.29 or later,
- * we can switch back to old code (that only sets quota if
- * there's something in the field).
+ /* vadduser() in vpopmail 5.3.29 and later sets the default
+ * quota, so we only need to change it if the user enters
+ * something in the Quota field.
*/
- if (Limits.defaultquota > 0) {
- if (Limits.defaultmaxmsgcount > 0)
- snprintf(pw_shell, sizeof(pw_shell), "%dS,%dC", Limits.defaultquota, Limits.defaultmaxmsgcount);
- else
- snprintf(pw_shell, sizeof(pw_shell), "%dS", Limits.defaultquota);
- } else {
- strcpy(pw_shell, "NOQUOTA");
- }
- // Code added by jhopper
#ifdef MODIFY_QUOTA
if (strcmp (Quota, "NOQUOTA") == 0) {
strcpy (pw_shell, "NOQUOTA");
@@ -504,8 +484,8 @@
strcpy (pw_shell, qconvert);
}
}
-#endif
mypw->pw_shell = pw_shell;
+#endif
#ifdef MODIFY_SPAM
GetValue(TmpCGI, spamvalue, "spamcheck=", sizeof(spamvalue));
Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog 13 Jan 2004 06:28:34 -0000 1.4
+++ ChangeLog 14 Jan 2004 15:57:42 -0000 1.5
@@ -8,6 +8,7 @@
- Make function buffers static when returning pointers to them.
- More updates to build files.
- Properly format autoresponder names with '.' in them. [872721]
+ - Remove old code and redundant quota setting code from user.c.
1.2.0-rc2 - released 1-Jan-04
|
|
From: <tom...@us...> - 2004-01-13 06:28:37
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv25409
Modified Files:
autorespond.c ChangeLog
Log Message:
properly display autoresponder addresses with '.' in them. 872721
Index: autorespond.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- autorespond.c 10 Oct 2003 16:36:24 -0000 1.2
+++ autorespond.c 13 Jan 2004 06:28:34 -0000 1.3
@@ -86,6 +86,7 @@
sort_dosort();
for (i = 0; addr = sort_get_entry(i); ++i) {
+ str_replace (addr, ':', '.');
fprintf(actout, "<tr>");
fprintf(actout, "<td align=\"center\">");
Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 7 Jan 2004 15:36:58 -0000 1.3
+++ ChangeLog 13 Jan 2004 06:28:34 -0000 1.4
@@ -1,11 +1,13 @@
Numbers in square brackets ([]) indicate tracker item on SourceForge with
patch or information related to the entry.
-1.2.0 - unreleased
+1.2.0-rc3 - unreleased
Tom Collins
- Minor formatting changes to configure.in for consistency.
- Make function buffers static when returning pointers to them.
+ - More updates to build files.
+ - Properly format autoresponder names with '.' in them. [872721]
1.2.0-rc2 - released 1-Jan-04
|
|
From: <tom...@us...> - 2004-01-08 05:27:39
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv15161
Modified Files:
aclocal.m4 Makefile.in configure
Log Message:
updated files from autoconf 2.53 and automake 1.6.3
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aclocal.m4 17 Dec 2003 19:59:30 -0000 1.3
+++ aclocal.m4 8 Jan 2004 05:27:34 -0000 1.4
@@ -1,70 +1,233 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-# Do all the work for Automake. This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
+# Do all the work for Automake. -*- Autoconf -*-
-# serial 1
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+AC_PREREQ([2.52])
+
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_][CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_][CC],
+ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_][CXX],
+ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+ [AM_AUTOMAKE_VERSION([1.6.3])])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
#
# Check to make sure that the build environment is sane.
#
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "[$]*" = "X"; then
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test "[$]*" != "X $srcdir/configure conftestfile" \
- && test "[$]*" != "X conftestfile $srcdir/configure"; then
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -74,7 +237,7 @@
alias in your environment])
fi
- test "[$]2" = conftestfile
+ test "$[2]" = conftest.file
)
then
# Ok.
@@ -83,47 +246,593 @@
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-rm -f conftest*
AC_MSG_RESULT(yes)])
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
+# -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
- $1=$2
- AC_MSG_RESULT(found)
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
else
- $1="$3/missing $2"
- AC_MSG_RESULT(missing)
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
fi
-AC_SUBST($1)])
+])
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
+# AM_AUX_DIR_EXPAND
+
+# Copyright 2001 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4 -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST([DEPDIR])
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n -e '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+ @echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 5
+
+AC_PREREQ(2.52)
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([conditional \"$1\" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ([2.52])
+
+# serial 6
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. We must strip everything past the first ":",
+# and everything past the last "/".
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+ [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+ m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+ m4_if(regexp([$1], [^/.*]), -1,
+ [.],
+ patsubst([$1], [^\(/\).*], [\1])),
+ patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+ patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+])# _AM_DIRNAME
+
+
+# The stamp files are numbered to have different names.
+# We could number them on a directory basis, but that's additional
+# complications, let's have a unique counter.
+m4_define([_AM_STAMP_Count], [0])
+
+
+# _AM_STAMP(HEADER)
+# -----------------
+# The name of the stamp file for HEADER.
+AC_DEFUN([_AM_STAMP],
+[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+ [:.*])))/stamp-h[]_AM_STAMP_Count])
+
+
+# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+# ------------------------------------------------------------
+# We used to try to get a real timestamp in stamp-h. But the fear is that
+# that will cause unnecessary cvs conflicts.
+AC_DEFUN([_AM_CONFIG_HEADER],
+[# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+AC_CONFIG_HEADERS([$1],
+ [# update the timestamp
+echo 'timestamp for $1' >"_AM_STAMP([$1])"
+$2],
+ [$3])
+])# _AM_CONFIG_HEADER
+
+
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated. We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
- case " <<$>>CONFIG_HEADERS " in
- *" <<$>>am_file "*<<)>>
- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
- ;;
- esac
- am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+])# AM_CONFIG_HEADER
#serial 1
# This test replaces the one in autoconf.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.in 2 Jan 2004 06:03:32 -0000 1.13
+++ Makefile.in 8 Jan 2004 05:27:34 -0000 1.14
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -29,13 +31,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
ACLOCAL = @ACLOCAL@
@@ -43,11 +41,15 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -56,40 +58,50 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+
+bindir = @cgibindir@
+
+#
+# Install qmailadmin setuid to @vpopuser@
+#
+INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 6755 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
+AMTAR = @AMTAR@
+AWK = @AWK@
CC = @CC@
CGIBINTARGETS = @CGIBINTARGETS@
CPP = @CPP@
CXX = @CXX@
+DEPDIR = @DEPDIR@
+INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
+PACKAGE = @QA_PACKAGE@
+QA_PACKAGE = @QA_PACKAGE@
+QA_VERSION = @QA_VERSION@
RANLIB = @RANLIB@
SPAM_COMMAND = @SPAM_COMMAND@
+STRIP = @STRIP@
+VERSION = @QA_VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
auth_incs = @auth_incs@
auth_libs = @auth_libs@
cgibindir = @cgibindir@
enable_help = @enable_help@
+htmldir = @htmldir@
+
+htmllibdir = @htmllibdir@
+imagedir = @imagedir@
imageurl = @imageurl@
+install_sh = @install_sh@
vpopgroup = @vpopgroup@
vpopmaildir = @vpopmaildir@
vpopuser = @vpopuser@
EXTRA_DIST = BUGS FAQ TRANSLATORS README.hooks html lang images contrib
-
-htmllibdir = @htmllibdir@
-htmldir = @htmldir@
-imagedir = @imagedir@
-QA_PACKAGE = @QA_PACKAGE@
-QA_VERSION = @QA_VERSION@
-PACKAGE = @QA_PACKAGE@
-VERSION = @QA_VERSION@
-
-#
-# Install qmailadmin setuid to @vpopuser@
-#
-INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 6755 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
-
-bindir = @cgibindir@
bin_PROGRAMS = @CGIBINTARGETS@
EXTRA_PROGRAMS = qmailadmin
@@ -105,284 +117,359 @@
qmailadmin_LDADD = @auth_libs@
DEFS = -I. @auth_incs@
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(bin_PROGRAMS)
+CONFIG_CLEAN_FILES =
+EXTRA_PROGRAMS = qmailadmin$(EXEEXT)
+bin_PROGRAMS = @CGIBINTARGETS@
+PROGRAMS = $(bin_PROGRAMS)
+am__objects_1 = qmailadmin.$(OBJEXT) alias.$(OBJEXT) \
+ autorespond.$(OBJEXT) forward.$(OBJEXT) mailinglist.$(OBJEXT) \
+ user.$(OBJEXT) util.$(OBJEXT) auth.$(OBJEXT) template.$(OBJEXT) \
+ command.$(OBJEXT) show.$(OBJEXT) cgi.$(OBJEXT) limits.$(OBJEXT) \
+ dotqmail.$(OBJEXT)
+am_qmailadmin_OBJECTS = $(am__objects_1)
+qmailadmin_OBJECTS = $(am_qmailadmin_OBJECTS)
+qmailadmin_LDFLAGS =
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-qmailadmin_OBJECTS = qmailadmin.o alias.o autorespond.o forward.o \
-mailinglist.o user.o util.o auth.o template.o command.o show.o cgi.o \
-limits.o dotqmail.o
-qmailadmin_LDFLAGS =
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alias.Po ./$(DEPDIR)/auth.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/autorespond.Po ./$(DEPDIR)/cgi.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/command.Po ./$(DEPDIR)/dotqmail.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/forward.Po ./$(DEPDIR)/limits.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/mailinglist.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/qmailadmin.Po ./$(DEPDIR)/show.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/template.Po ./$(DEPDIR)/user.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/util.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \
-config.sub configure configure.in install-sh ltmain.sh missing \
-mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(qmailadmin_SOURCES)
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \
+ config.sub configure configure.in depcomp install-sh ltmain.sh \
+ missing mkinstalldirs
SOURCES = $(qmailadmin_SOURCES)
-OBJECTS = $(qmailadmin_OBJECTS)
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
-$(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-config.h: stamp-h
- @if test ! -f $@; then \
- rm -f stamp-h; \
- $(MAKE) stamp-h; \
- else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=config.h \
- $(SHELL) ./config.status
- @echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(ACLOCAL_M4): configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
@if test ! -f $@; then \
- rm -f $(srcdir)/stamp-h.in; \
- $(MAKE) $(srcdir)/stamp-h.in; \
+ rm -f stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-mostlyclean-hdr:
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
-clean-hdr:
+$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ touch $(srcdir)/config.h.in
distclean-hdr:
- -rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
+ -rm -f config.h stamp-h1
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- list='$(bin_PROGRAMS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
done
-.c.o:
- $(COMPILE) -c $<
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+qmailadmin$(EXEEXT): $(qmailadmin_OBJECTS) $(qmailadmin_DEPENDENCIES)
+ @rm -f qmailadmin$(EXEEXT)
+ $(LINK) $(qmailadmin_LDFLAGS) $(qmailadmin_OBJECTS) $(qmailadmin_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.o core *.core
-
-clean-compile:
+ -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
-maintainer-clean-compile:
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alias.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autorespond.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dotqmail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/limits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailinglist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qmailadmin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/show.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-qmailadmin: $(qmailadmin_OBJECTS) $(qmailadmin_DEPENDENCIES)
- @rm -f qmailadmin
- $(LINK) $(qmailadmin_LDFLAGS) $(qmailadmin_OBJECTS) $(qmailadmin_LDADD) $(LIBS)
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-clean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
+
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ find $$dc_install_base -type f -print ; \
+ exit 1; } >&2 ) \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
+distcleancheck: distclean
+ if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-all-recursive-am: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile $(PROGRAMS) config.h
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
-install-data-am: install-data-local
+install: install-am
+install-exec: install-exec-am
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-binPROGRAMS
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) config.h
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
- mostlyclean-compile mostlyclean-tags \
- mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
- clean-generic mostlyclean-am
+distclean: distclean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-hdr distclean-tags
-clean: clean-am
+dvi: dvi-am
-distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
- distclean-tags distclean-generic clean-am
+dvi-am:
-distclean: distclean-am
- -rm -f config.status
+info: info-am
-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am: install-data-local
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f config.status
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf autom4te.cache
+maintainer-clean-am: distclean-am maintainer-clean-generic
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck all-recursive-am install-exec-am \
-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic dist dist-all dist-gzip distcheck distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-hdr distclean-tags distcleancheck distdir dvi dvi-am \
+ info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-data-local install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
@SET_MAKE@
@@ -427,7 +514,6 @@
chmod -R 755 $(DESTDIR)@htmllibdir@/lang
$(mkinstalldirs) $(DESTDIR)@imagedir@
cp -R $(srcdir)/images/* $(DESTDIR)@imagedir@
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: configure
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure 7 Jan 2004 15:34:45 -0000 1.9
+++ configure 8 Jan 2004 05:27:34 -0000 1.10
@@ -1,74 +1,310 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by GNU Autoconf 2.53.
#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
[...7565 lines suppressed...]
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded. So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status. When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+ ac_cs_success=:
+ exec 5>/dev/null
+ $SHELL $CONFIG_STATUS || ac_cs_success=false
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
echo ""
|
|
From: <tom...@us...> - 2004-01-08 05:13:11
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv13201 Modified Files: INSTALL Log Message: added note about using gmake if make fails Index: INSTALL =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/INSTALL,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- INSTALL 10 Dec 2003 05:48:08 -0000 1.3 +++ INSTALL 8 Jan 2004 05:13:08 -0000 1.4 @@ -18,6 +18,8 @@ Be root before you follow the rest of the instructions or your installation will fail. +If you have problems using 'make', try using 'gmake' instead. + Note to people who did not read the above paragraph: When you give up on your installation, try reading the above information then starting from scratch. |
|
From: <tom...@us...> - 2004-01-07 15:37:01
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv3148 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 2 Jan 2004 05:58:57 -0000 1.2 +++ ChangeLog 7 Jan 2004 15:36:58 -0000 1.3 @@ -3,6 +3,10 @@ 1.2.0 - unreleased + Tom Collins + - Minor formatting changes to configure.in for consistency. + - Make function buffers static when returning pointers to them. + 1.2.0-rc2 - released 1-Jan-04 Tom Collins |
|
From: <tom...@us...> - 2004-01-07 15:36:33
|
Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv3091
Modified Files:
template.c util.c
Log Message:
Make function buffers static when returning pointers to them.
Index: template.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- template.c 24 Dec 2003 05:22:05 -0000 1.5
+++ template.c 7 Jan 2004 15:36:26 -0000 1.6
@@ -952,7 +952,7 @@
char *get_session_val(char *session_var) {
/* returns the value of session_var, first checking the .qw file for saved */
/* value, or the TmpCGI if it's not yet been saved */
- char value[MAX_BUFF];
+ static char value[MAX_BUFF];
char dir[MAX_BUFF];
char *retval;
FILE *fs_qw;
Index: util.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util.c 8 Dec 2003 17:52:12 -0000 1.3
+++ util.c 7 Jan 2004 15:36:26 -0000 1.4
@@ -281,6 +281,9 @@
return(0);
}
+/* It's a good thing qmailadmin is a cgi script, because this
+ function leaks memory. That's OK though, Tom has plans
+ for rewriting the html_text stuff soon. */
char *get_html_text( char *index )
{
char *tmpbuf;
@@ -316,7 +319,7 @@
char *get_color_text( char *index )
{
- char tmpbuf[400];
+ static char tmpbuf[400];
char *tmpstr;
if (color_table == NULL) return("");
@@ -333,8 +336,7 @@
}
/* bk - use maildir++ quotas now
char *get_quota_used(char *dir) {
- char *tmpstr;
- char tmpbuff[MAX_BUFF];
+ static char tmpbuff[40];
double size;
size = get_du(dir);
@@ -342,8 +344,7 @@
size = size / 1048576;
}
sprintf(tmpbuff, "%.2lf", size);
- tmpstr = tmpbuff;
- return tmpstr;
+ return tmpbuff;
}
*/
/* quota_to_bytes: used to convert user entered quota (given in MB)
|
|
From: <tom...@us...> - 2004-01-02 06:03:35
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv3550 Modified Files: Makefile.am Makefile.in Log Message: remove references to CHANGELOG (replaced by ChangeLog) in Makefiles Index: Makefile.am =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 2 Jan 2004 05:25:21 -0000 1.8 +++ Makefile.am 2 Jan 2004 06:03:32 -0000 1.9 @@ -1,7 +1,7 @@ @SET_MAKE@ -EXTRA_DIST=BUGS CHANGELOG FAQ TRANSLATORS README.hooks html lang images contrib +EXTRA_DIST=BUGS FAQ TRANSLATORS README.hooks html lang images contrib htmllibdir=@htmllibdir@ htmldir=@htmldir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile.in 2 Jan 2004 05:58:57 -0000 1.12 +++ Makefile.in 2 Jan 2004 06:03:32 -0000 1.13 @@ -73,7 +73,7 @@ vpopmaildir = @vpopmaildir@ vpopuser = @vpopuser@ -EXTRA_DIST = BUGS CHANGELOG FAQ TRANSLATORS README.hooks html lang images contrib +EXTRA_DIST = BUGS FAQ TRANSLATORS README.hooks html lang images contrib htmllibdir = @htmllibdir@ htmldir = @htmldir@ |
|
From: <tom...@us...> - 2004-01-02 05:59:01
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1:/tmp/cvs-serv2640 Modified Files: configure.in configure Makefile.in ChangeLog Log Message: prepare for final 1.2.0 release Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure.in 22 Dec 2003 04:37:10 -0000 1.11 +++ configure.in 2 Jan 2004 05:58:57 -0000 1.12 @@ -6,7 +6,7 @@ AC_CANONICAL_HOST QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.0-rc1" +QA_VERSION="1.2.0" AC_DEFINE_UNQUOTED(QA_PACKAGE,"$QA_PACKAGE","") AC_DEFINE_UNQUOTED(QA_VERSION,"$QA_VERSION","") Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure 22 Dec 2003 04:37:10 -0000 1.7 +++ configure 2 Jan 2004 05:58:57 -0000 1.8 @@ -846,7 +846,7 @@ QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.0-rc1" +QA_VERSION="1.2.0" cat >> confdefs.h <<EOF #define QA_PACKAGE "$QA_PACKAGE" Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.in 2 Jan 2004 05:25:21 -0000 1.11 +++ Makefile.in 2 Jan 2004 05:58:57 -0000 1.12 @@ -122,9 +122,10 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING INSTALL Makefile.am \ -Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in config.sub \ -configure configure.in install-sh ltmain.sh missing mkinstalldirs +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \ +config.sub configure configure.in install-sh ltmain.sh missing \ +mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChangeLog 2 Jan 2004 05:36:54 -0000 1.1 +++ ChangeLog 2 Jan 2004 05:58:57 -0000 1.2 @@ -1,6 +1,8 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. +1.2.0 - unreleased + 1.2.0-rc2 - released 1-Jan-04 Tom Collins @@ -11,7 +13,7 @@ Rick Widmer - Remove fclose(NULL) call in alias.c. - - Add html/README with information on template macros. + - Add html/README with information on template macros. [867305] 1.2.0-rc1 - released 21-Dec-03 |
1 message has been excluded from this view by a project administrator.
