clean up confUSERDB_SPEC

SCCS-vsn: usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4 6.4
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.24
SCCS-vsn: usr.sbin/sendmail/cf/README 6.15

diff --git a/usr/src/usr.sbin/sendmail/cf/README b/usr/src/usr.sbin/sendmail/cf/README
index 0356c9d..5c9a2a1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/README
+++ b/usr/src/usr.sbin/sendmail/cf/README
@@ -4,7 +4,7 @@
 
                Eric Allman <eric@CS.Berkeley.EDU>
 
 
                Eric Allman <eric@CS.Berkeley.EDU>
 

-               @(#)README      6.14 (Berkeley) %G%
+               @(#)README      6.15 (Berkeley) %G%

 
 
 This document describes the sendmail configuration files being used
 
 
 This document describes the sendmail configuration files being used


@@ -640,10 +640,6 @@ confTIME_ZONE              USE_SYSTEM      Oz      Time zone info -- can be
                                                else to force that value.
 confDEF_USER_ID                1               Ou      Default user id.
 confUSERDB_SPEC                (undefined)     OU      User database specification.
                                                else to force that value.
 confDEF_USER_ID                1               Ou      Default user id.
 confUSERDB_SPEC                (undefined)     OU      User database specification.

-                                               If it has commas it should be
-                                               double quoted (e.g.,
-                                               ``file1,file2'') to prevent
-                                               m4 from chomping on it.

 confNO_WILDCARD_MX     False           Ow      No wildcard MX records matches
                                                our domain.
 confQUEUE_LA           8               Ox      Load average at which queue-only
 confNO_WILDCARD_MX     False           Ow      No wildcard MX records matches
                                                our domain.
 confQUEUE_LA           8               Ox      Load average at which queue-only

diff --git a/usr/src/usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4 b/usr/src/usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4
index c0aa051..91d6007 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4
+++ b/usr/src/usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4
@@ -7,7 +7,8 @@ divert(-1)
 # %sccs.include.redist.sh%
 #
 divert(0)
 # %sccs.include.redist.sh%
 #
 divert(0)

-VERSIONID(`@(#)CS.Berkeley.EDU.m4      6.3 (Berkeley) %G%')
+VERSIONID(`@(#)CS.Berkeley.EDU.m4      6.4 (Berkeley) %G%')

 DOMAIN(Berkeley)dnl
 HACK(cssubdomain)dnl
 DOMAIN(Berkeley)dnl
 HACK(cssubdomain)dnl

-define(`USERDB_SPEC', ``/usr/sww/share/lib/users.cs.db,/usr/sww/share/lib/users.eecs.db'')dnl
+define(`confUSERDB_SPEC',
+       `/usr/sww/share/lib/users.cs.db,/usr/sww/share/lib/users.eecs.db')dnl

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 8aae686..f07e33a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
@@ -8,7 +8,7 @@ divert(-1)
 #
 divert(0)
 
 #
 divert(0)
 

-VERSIONID(`@(#)proto.m4        6.23 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.24 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -228,7 +228,7 @@ ifelse(confTIME_ZONE, `USE_SYSTEM', `#Ot',
 CONCAT(Ou, confDEF_USER_ID)
 
 # list of locations of user database file (null means no lookup)
 CONCAT(Ou, confDEF_USER_ID)
 
 # list of locations of user database file (null means no lookup)

-CONCAT(OU, ifdef(`USERDB_SPEC', `USERDB_SPEC'))
+OU`'ifdef(`confUSERDB_SPEC', `confUSERDB_SPEC')

 
 # load average at which we just queue messages
 CONCAT(Ox, confQUEUE_LA)
 
 # load average at which we just queue messages
 CONCAT(Ox, confQUEUE_LA)