always compile IDENTPROTO in; just default the timeout to zero if

it doesn't normally work on some system.  This is to avoid having
to recompile sendmail when a kernel patch comes out.

SCCS-vsn: usr.sbin/sendmail/src/daemon.c 8.66
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 8.59

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index d22f8ff..7d47821 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -12,9 +12,9 @@
 
 #ifndef lint
 #ifdef DAEMON
 
 #ifndef lint
 #ifdef DAEMON

-static char sccsid[] = "@(#)daemon.c   8.65 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.66 (Berkeley) %G% (with daemon mode)";

 #else
 #else

-static char sccsid[] = "@(#)daemon.c   8.65 (Berkeley) %G% (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.66 (Berkeley) %G% (without daemon mode)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -552,8 +552,6 @@ myhostname(hostbuf, size)
 **             The user@host information associated with this descriptor.
 */
 
 **             The user@host information associated with this descriptor.
 */
 

-#if IDENTPROTO
-

 static jmp_buf CtxAuthTimeout;
 
 static
 static jmp_buf CtxAuthTimeout;
 
 static


@@ -562,22 +560,18 @@ authtimeout()
        longjmp(CtxAuthTimeout, 1);
 }
 
        longjmp(CtxAuthTimeout, 1);
 }
 

-#endif
-

 char *
 getauthinfo(fd)
        int fd;
 {
        int falen;
        register char *p;
 char *
 getauthinfo(fd)
        int fd;
 {
        int falen;
        register char *p;

-#if IDENTPROTO

        SOCKADDR la;
        int lalen;
        register struct servent *sp;
        int s;
        int i;
        EVENT *ev;
        SOCKADDR la;
        int lalen;
        register struct servent *sp;
        int s;
        int i;
        EVENT *ev;

-#endif

        static char hbuf[MAXNAME * 2 + 2];
        extern char *hostnamebyanyaddr();
        extern char RealUserName[];                     /* main.c */
        static char hbuf[MAXNAME * 2 + 2];
        extern char *hostnamebyanyaddr();
        extern char RealUserName[];                     /* main.c */


@@ -598,7 +592,6 @@ getauthinfo(fd)
                RealHostName = newstr(hostnamebyanyaddr(&RealHostAddr));
        }
 
                RealHostName = newstr(hostnamebyanyaddr(&RealHostAddr));
        }
 

-#if IDENTPROTO

        if (TimeOuts.to_ident == 0)
                goto noident;
 
        if (TimeOuts.to_ident == 0)
                goto noident;
 


@@ -719,8 +712,6 @@ closeident:
        (void) close(s);
        clrevent(ev);
 
        (void) close(s);
        clrevent(ev);
 

-#endif /* IDENTPROTO */
-

 noident:
        if (RealHostName == NULL)
        {
 noident:
        if (RealHostName == NULL)
        {

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 0b6623d..113769b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   8.58 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   8.59 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -2054,7 +2054,11 @@ inittimeouts(val)
                TimeOuts.to_quit = (time_t) 2 MINUTES;
                TimeOuts.to_nextcommand = (time_t) 1 HOUR;
                TimeOuts.to_miscshort = (time_t) 2 MINUTES;
                TimeOuts.to_quit = (time_t) 2 MINUTES;
                TimeOuts.to_nextcommand = (time_t) 1 HOUR;
                TimeOuts.to_miscshort = (time_t) 2 MINUTES;

+#if IDENTPROTO

                TimeOuts.to_ident = (time_t) 30 SECONDS;
                TimeOuts.to_ident = (time_t) 30 SECONDS;

+#else
+               TimeOuts.to_ident = (time_t) 0 SECONDS;
+#endif

                TimeOuts.to_fileopen = (time_t) 60 SECONDS;
                return;
        }
                TimeOuts.to_fileopen = (time_t) 60 SECONDS;
                return;
        }