combined patches: 2.99.33a2 UNIFIED DIFF

[Matti Aarnio <mea@nic.funet.fi>]

Ok, so that I don't need to reply to everybody, and can turn
on at my pillow for the night (clock is 23:50 and I have had
several short nights this week...)

	/Matti Aarnio <mea@nic.funet.fi>


diff -u -r zmailer-2.99.33/ChangeLog zmailer-2.99.33a2/ChangeLog
--- zmailer-2.99.33/ChangeLog	Thu Aug  1 19:37:46 1996
+++ zmailer-2.99.33a2/ChangeLog	Thu Aug  1 23:36:21 1996
@@ -1,5 +1,32 @@
 Thu Aug  1 15:05:53 1996  Matti Aarnio  <mea@nic.funet.fi>
 
+	* Makefile.in
+	    Version 2.99.33a2 (and good night folks..)
+
+	* compat/sendmail/sendmail.c:
+	    Removed "Boptcount = 0", which was accidental artefact
+	    from one earlier version of "-B" -option processing.
+	    (compabilities with Alman's sendmail)
+
+	    Processing of  SMTPOPTIONS zenv-variable needs to remove
+	    the quotes from the parameter -- but it is a bit dangerous
+	    in case there is something like:
+		SMTPTOPTIONS="-l '/some/path/with space'"
+	    lets hope not...
+
+	* configure.in:
+	    The dup2() -test appears to act as compilation environment
+	    checkup :-)  Great, added comments of that effect at the error
+	    message.
+
+	* smtpserver/smtpserver.c:
+	    Tested the built-in tcp-wrapper at nic.funet.fi, now
+	    it works as expected. (daemon name:  smtp-input)
+	    FYI: The  allow/deny rules are as follows:
+	       1) does it match at allow ?  Yes, return allow.
+	          not ? proceed to second test
+	       2) does it match at deny ?  Yes, return deny.
+	          not ? return allow.
 
 	* router/rfc822.c: sequencer()
 	  transports/mailbox/mailbox.c, scheduler/msgerror.c,
@@ -33,7 +60,9 @@
 	    wrapper behaviour -- suboptimal in efficiency,
 	    though... (but better than: inetd -> tcpd -> sendmail
 	    -> smtpserver, which is 1 fork + 3 execs..)
-	
+	    The magic name at hosts.deny/hosts.allow files
+	    is:  smtp-input
+
 	* smtpserver/smtpserver.c:
 	    Fixes to file-descriptor usage so that things should
 	    work just fine with all options.. (*should*..)
diff -u -r zmailer-2.99.33/Makefile.in zmailer-2.99.33a2/Makefile.in
--- zmailer-2.99.33/Makefile.in	Thu Aug  1 18:54:07 1996
+++ zmailer-2.99.33a2/Makefile.in	Thu Aug  1 23:14:35 1996
@@ -2,7 +2,7 @@
 
 MAJORVERSION =	2
 MINORVERSION =	99
-PATCHLEVEL =	33a1
+PATCHLEVEL =	33a2
 
 srcdir = @srcdir@
 VPATH = @srcdir@
diff -u -r zmailer-2.99.33/compat/sendmail/sendmail.c zmailer-2.99.33a2/compat/sendmail/sendmail.c
--- zmailer-2.99.33/compat/sendmail/sendmail.c	Thu Aug  1 09:03:28 1996
+++ zmailer-2.99.33a2/compat/sendmail/sendmail.c	Thu Aug  1 21:43:11 1996
@@ -97,7 +97,6 @@
 	ebp = errbuf;
 	*ebp = '\0';
 	errflg = 0;
-	Boptcount = 0;
 	configfile = pooption = NULL;
 	if (printq || aliases)
 		goto otherprog;
@@ -259,10 +258,10 @@
 		n = 2;
 		cp = getzenv("SMTPOPTIONS"); /* Normal smtp-server options */
 		/* pass on suidness */
-		s = strtok(cp, " \t");
+		s = strtok(cp, " \t\"'");
 		do {
 		  argv[n++] = s;
-		  s = strtok(NULL, " \t");
+		  s = strtok(NULL, " \t\"'");
 		} while (s != NULL && n < 30);
 		argv[n] = NULL;
 		execv(path, argv);
diff -u -r zmailer-2.99.33/configure zmailer-2.99.33a2/configure
--- zmailer-2.99.33/configure	Thu Aug  1 14:05:10 1996
+++ zmailer-2.99.33a2/configure	Thu Aug  1 22:36:42 1996
@@ -1916,7 +1916,7 @@
 
 else
   echo "$ac_t""no" 1>&6
-{ echo "configure: error: bizzare -- the system does not have dup2!" 1>&2; exit 1; }
+{ echo "configure: error: bizzare -- the system does not have dup2!  Is your C-compiler working ? (See config.log)" 1>&2; exit 1; }
 fi
 
 
diff -u -r zmailer-2.99.33/configure.in zmailer-2.99.33a2/configure.in
--- zmailer-2.99.33/configure.in	Thu Aug  1 12:12:48 1996
+++ zmailer-2.99.33a2/configure.in	Thu Aug  1 21:58:15 1996
@@ -239,7 +239,7 @@
 
 
 # things get pretty tought, if the dup2() is not available ...
-AC_CHECK_FUNC(dup2, AC_DEFINE(HAVE_DUP2), AC_MSG_ERROR(bizzare -- the system does not have dup2!))
+AC_CHECK_FUNC(dup2, AC_DEFINE(HAVE_DUP2), AC_MSG_ERROR([bizzare -- the system does not have dup2!  Is your C-compiler working ? (See config.log)]))
 
 #
 #  Study shared library generation
diff -u -r zmailer-2.99.33/smtpserver/smtpserver.c zmailer-2.99.33a2/smtpserver/smtpserver.c
--- zmailer-2.99.33/smtpserver/smtpserver.c	Thu Aug  1 14:16:52 1996
+++ zmailer-2.99.33a2/smtpserver/smtpserver.c	Thu Aug  1 22:41:47 1996
@@ -1727,7 +1727,7 @@
 #endif	/* LOG_MAIL */
 
 #ifdef HAVE_TCPD_H /* TCP-Wrapper code */
-	if (wantconn(msgfd, "smtp-input") == 0) {
+	if (wantconn(s_inputfd, "smtp-input") == 0) {
 	  syslog(LOG_WARNING, "refusing connection from %s/%s",
 		 rhostname, ident_username);
 	  type(421, "%s ZMailer Server %s WILL NOT TALK TO YOU at %s",