sendmail/sendmail-8.17.2-aliases_dir.patch

diff --git a/cf/m4/cfhead.m4 b/cf/m4/cfhead.m4
index c30fad0..492882e 100644
--- a/cf/m4/cfhead.m4
+++ b/cf/m4/cfhead.m4
@@ -275,7 +275,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MAIL_SETTINGS_DIR', `/etc/mail/')')
 define(`DATABASE_MAP_TYPE', `hash')
 
 # set up default values for options
-define(`ALIAS_FILE', `MAIL_SETTINGS_DIR`'aliases')
+define(`ALIAS_FILE', `/etc/aliases')
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
 define(`confFROM_LINE', `From $g $d')
 define(`confOPERATORS', `.:%@!^/[]+')
diff --git a/sendmail/aliases.0 b/sendmail/aliases.0
index f54635e..82d63c2 100644
--- a/sendmail/aliases.0
+++ b/sendmail/aliases.0
@@ -63,7 +63,7 @@ ALIASES(5)                    File Formats Manual                   ALIASES(5)
        the list of users defined in that file.
 
        This  is  only  the  raw  data file; the actual aliasing information is
-       placed into a binary format in the file /etc/mail/aliases.db using  the
+       placed into a binary format in the file /etc/aliases.db using  the
        program  newaliases(1).   A  newaliases command should be executed each
        time the aliases file is changed for the change to take effect.
 
diff --git a/sendmail/aliases.5 b/sendmail/aliases.5
index cb67508..52e5124 100644
--- a/sendmail/aliases.5
+++ b/sendmail/aliases.5
@@ -23,7 +23,7 @@ ID
 aliases used by
 sendmail.
 The file resides in
-/etc/mail
+/etc
 and
 is formatted as a series of lines of the form
 .IP
@@ -96,7 +96,7 @@ list of users defined in that file.
 .PP
 This is only the raw data file; the actual aliasing information is
 placed into a binary format in the file
-/etc/mail/aliases.db
+/etc/aliases.db
 using the program
 newaliases(1).
 A
diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0
index 8c40726..e90f009 100644
--- a/sendmail/newaliases.0
+++ b/sendmail/newaliases.0
@@ -10,7 +10,7 @@ NEWALIASES(1)               General Commands Manual              NEWALIASES(1)
 
 DESCRIPTION
        Newaliases  rebuilds  the  random access data base for the mail aliases
-       file /etc/mail/aliases.  It must be run each time this file is  changed
+       file /etc/aliases.  It must be run each time this file is  changed
        in order for the change to take effect.
 
        Newaliases is identical to ``sendmail -bi''.
@@ -22,7 +22,7 @@ NEWALIASES(1)               General Commands Manual              NEWALIASES(1)
        sendmail.
 
 FILES
-       /etc/mail/aliases   The mail aliases file
+       /etc/aliases   The mail aliases file
 
 SEE ALSO
        aliases(5), sendmail(8)
diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1
index 59dc0de..9ba8752 100644
--- a/sendmail/newaliases.1
+++ b/sendmail/newaliases.1
@@ -20,7 +20,7 @@ newaliases
 .SH DESCRIPTION
 .B Newaliases
 rebuilds the random access data base for the mail aliases file
-/etc/mail/aliases.  It must be run each time this file is changed
+/etc/aliases.  It must be run each time this file is changed
 in order for the change to take effect.
 .PP
 .B Newaliases
@@ -40,7 +40,7 @@ puts a special token into the data base that is required by
 .B sendmail.
 .SH FILES
 .TP 2i
-/etc/mail/aliases
+/etc/aliases
 The mail aliases file
 .SH SEE ALSO
 aliases(5), sendmail(8)
diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0
--- a/sendmail/sendmail.0
+++ b/sendmail/sendmail.0
@@ -433,10 +433,11 @@ SENDMAIL(8)                 System Manager's Manual                SENDMAIL(8)
        names are all specified in /etc/mail/sendmail.cf.  Thus,  these  values
        are only approximations.
 
-        /etc/mail/aliases
+        /etc/aliases
               raw data for alias names
 
-        /etc/mail/aliases.db
+        /etc/aliases.db
+        /etc/aliases.cdb
               data base of alias names
 
         /etc/mail/sendmail.cf
diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8
--- a/sendmail/sendmail.8
+++ b/sendmail/sendmail.8
@@ -716,10 +716,11 @@ Thus,
 these values are only approximations.
 .PP
 .TP
- /etc/mail/aliases
+ /etc/aliases
 raw data for alias names
 .TP
- /etc/mail/aliases.db
+ /etc/aliases.db
+ /etc/aliases.cdb
 data base of alias names
 .TP
  /etc/mail/sendmail.cf