IDENTPROTO is a #if not a #ifdef to make it easier to turn it off

SCCS-vsn: usr.sbin/sendmail/src/daemon.c 8.25

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 32fdb2a..4f01b16 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.24 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.25 (Berkeley) %G% (with daemon mode)";

 #else
 #else

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

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


@@ -542,7 +542,7 @@ myhostname(hostbuf, size)
 **             Sets RealHostName to the name of the host at the other end.
 */
 
 **             Sets RealHostName to the name of the host at the other end.
 */
 

-#ifdef IDENTPROTO
+#if IDENTPROTO

 
 static jmp_buf CtxAuthTimeout;
 
 
 static jmp_buf CtxAuthTimeout;
 


@@ -561,7 +561,7 @@ getauthinfo(fd)
        SOCKADDR fa;
        int falen;
        register char *p;
        SOCKADDR fa;
        int falen;
        register char *p;

-#ifdef IDENTPROTO
+#if IDENTPROTO

        SOCKADDR la;
        int lalen;
        register struct servent *sp;
        SOCKADDR la;
        int lalen;
        register struct servent *sp;


@@ -588,7 +588,7 @@ getauthinfo(fd)
        RealHostName = newstr(p);
        RealHostAddr = fa;
 
        RealHostName = newstr(p);
        RealHostAddr = fa;
 

-#ifdef IDENTPROTO
+#if IDENTPROTO

        lalen = sizeof la;
        if (fa.sa.sa_family != AF_INET ||
            getsockname(fd, &la.sa, &lalen) < 0 || lalen <= 0 ||
        lalen = sizeof la;
        if (fa.sa.sa_family != AF_INET ||
            getsockname(fd, &la.sa, &lalen) < 0 || lalen <= 0 ||