define USERDB if either NEWDB or HESIOD are defined

SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.148

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 59877a7..98d08e4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      8.147 (Berkeley) %G%
+ *     @(#)conf.h      8.148 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -61,8 +61,8 @@
 # define NETINET       1       /* include internet support */
 # define MATCHGECOS    1       /* match user names from gecos field */
 # define XDEBUG                1       /* enable extended debugging */
 # define NETINET       1       /* include internet support */
 # define MATCHGECOS    1       /* match user names from gecos field */
 # define XDEBUG                1       /* enable extended debugging */

-# ifdef NEWDB
-# define USERDB                1       /* look in user database (requires NEWDB) */
+# if (defined(NEWDB) || defined(HESIOD)) && !defined(USERDB)
+# define USERDB                1       /* look in user database */

 # endif
 
 /**********************************************************************
 # endif
 
 /**********************************************************************