Sorry, they are typo's introduced in the mods I made for 5.3.26
I have attached a patch
Michael.
----- Original Message -----
From: "Oden Eriksson" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, August 27, 2003 11:36 AM
Subject: Re: [vchkpw] vpopmail 5.3.25 and 5.3.26 released
> onsdagen den 27 augusti 2003 02.24 skrev Tom Collins:
>
> [...]
>
> Outstanding work guys!
>
> But I get this with 5.3.26:
>
>
> make[2]: Leaving directory `/home/oden/RPM/BUILD/vpopmail-5.3.26/cdb'
> make[2]: Entering directory `/home/oden/RPM/BUILD/vpopmail-5.3.26'
> gcc -I. -Icdb -Os -march=pentium -Wall -c vpopmail.c
> vpopmail.c: In function `open_smtp_relay':
> vpopmail.c:2418: `BUFF_SIZE' undeclared (first use in this function)
> vpopmail.c:2418: (Each undeclared identifier is reported only once
> vpopmail.c:2418: for each function it appears in.)
> vpopmail.c:2521: parse error before ';' token
> vpopmail.c:2529:1: directives may not be used inside a macro argument
> vpopmail.c:2528:22: unterminated argument list invoking macro
"unlock_lock"
> vpopmail.c:2531: `unlock_lock' undeclared (first use in this function)
> vpopmail.c:2531: parse error before "return"
> vpopmail.c:2418: warning: unused variable `tmpbuf1'
> vpopmail.c:2419: warning: unused variable `tmpbuf2'
> vpopmail.c: In function `update_rules':
> vpopmail.c:2643: `tmpbuf2' undeclared (first use in this function)
> vpopmail.c:2691: `tempstr' undeclared (first use in this function)
> make[2]: *** [vpopmail.o] Error 1
> make[2]: Leaving directory `/home/oden/RPM/BUILD/vpopmail-5.3.26'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/oden/RPM/BUILD/vpopmail-5.3.26'
> make: *** [all-recursive-am] Error 2
>
>
>
> Here's my configure line:
>
> ./configure \
> --enable-qmaildir=/var/qmail \
> --enable-qmail-newu=/var/qmail/bin/qmail-newu \
> --enable-qmail-inject=/var/qmail/bin/qmail-inject \
> --enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
> --enable-vpopuser=vpopmail \
> --enable-vpopgroup=vchkpw \
> --enable-roaming-users=y \
> --enable-tcprules-prog=/usr/bin/tcprules \
> --enable-tcpserver-file=/home/vpopmail/etc/smtp \
> --enable-relay-clear-minutes=360 \
> --enable-learn-passwords=y \
> --enable-md5-passwords=y \
> --enable-auth-logging=y \
> --enable-mysql-logging=n \
> --enable-mysql-limits=n \
> --enable-pgsql-logging=n \
> --enable-clear-passwd=y \
> --enable-users-big-dir=y \
> --enable-logging=p \
> --enable-sqwebmail-pass=y \
> --enable-log-name=vpopmail \
> --enable-domains-dir=domains \
> --enable-incdir= \
> --enable-libdir= \
> --enable-libs= \
> --enable-mysql=n \
> --enable-mysql-replication=n \
> --enable-valias=n \
> --enable-file-locking=y \
> --enable-file-sync=n \
> --enable-make-seekable=y \
> --enable-many-domains=y \
> --enable-ldap=n \
> --enable-oracle=n \
> --enable-postgres=n \
> --enable-sybase=n \
> --enable-active-directory=n \
> --enable-qmail-ext=y \
> --enable-rebuild-tcpserver-file=y \
> --enable-ip-alias-domains=n \
> --enable-passwd=n
>
>
>
>
--- ../vpopmail-5.3.26-orig/vpopmail.c Wed Aug 27 09:45:38 2003
+++ vpopmail.c Wed Aug 27 12:15:35 2003
@@ -1965,7 +1965,7 @@
/* Michael Bowe 14th August 2003
* What happens if domain isnt null terminated?
*/
- if ( strcmp( domain, tmpbuf)) == 0 ) {
+ if (( strcmp( domain, tmpbuf)) == 0 ) {
/* we found a match */
fclose(fs);
return(1);
@@ -2415,8 +2415,8 @@
int rebuild_cdb = 1;
char open_smtp_tmp_filename[MAX_BUFF];
char *cp;
- char tmpbuf1[BUFF_SIZE];
- char tmpbuf2[BUFF_SIZE];
+ char tmpbuf1[MAX_BUFF];
+ char tmpbuf2[MAX_BUFF];
mytime = time(NULL);
@@ -2518,13 +2518,13 @@
*/
if ( rebuild_cdb ) {
if (update_rules() != 0) {
- printf("Error. update_rules() failed\n";
+ printf("Error. update_rules() failed\n");
return (-1);
}
}
#ifdef FILE_LOCKING
- unlock_lock(fileno(fs_lok_file, 0, SEEK_SET, 0);
+ unlock_lock(fileno(fs_lok_file), 0, SEEK_SET, 0);
fclose(fs_lok_file);
#endif /* FILE_LOCKING */
#endif /* USE_SQL */
@@ -2640,7 +2640,7 @@
char tmpbuf1[MAX_BUFF];
#ifndef USE_SQL
- tmpbuf2[MAX_BUFF];
+ char tmpbuf2[MAX_BUFF];
char *tmpstr;
#endif
@@ -2688,7 +2688,7 @@
snprintf(tmpbuf2, sizeof(tmpbuf2), "%s", tmpbuf1);
/* dump the TAB and everything after it */
tmpstr = strtok( tmpbuf2, "\t");
- strncat(tmpstr, "\n", sizeof(tmpstr)-strlen(tempstr)-1);
+ strncat(tmpstr, "\n", sizeof(tmpstr)-strlen(tmpstr)-1);
/* write the line out to the tcprules pipe */
write(fdm,tmpstr, strlen(tmpstr));
}
--- ../vpopmail-5.3.26-orig/clearopensmtp.c Fri Aug 22 12:32:34 2003
+++ clearopensmtp.c Wed Aug 27 12:08:25 2003
@@ -60,7 +60,7 @@
/* create this file */
fs_smtp_tmp = fopen(OPEN_SMTP_TMP_FILE, "w+");
if ( fs_smtp_tmp == NULL ) {
- printf ("Error, could not create open-smtp.tmp\n";
+ printf ("Error, could not create open-smtp.tmp\n");
vexit(-1);
}
