fix the System 5 compatilibility to be compatible with the rest

of the world.

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.6
SCCS-vsn: usr.sbin/sendmail/src/main.c 6.13
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 6.5
SCCS-vsn: usr.sbin/sendmail/src/version.c 6.17
SCCS-vsn: usr.sbin/sendmail/src/queue.c 6.8
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.6
SCCS-vsn: usr.sbin/sendmail/src/udb.c 6.4
SCCS-vsn: usr.sbin/sendmail/src/map.c 6.4

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index bad967c..b045834 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -10,11 +10,8 @@
 # include <sys/stat.h>
 # include <signal.h>
 # include "sendmail.h"
 # include <sys/stat.h>
 # include <signal.h>
 # include "sendmail.h"

-# include <sys/file.h>
-# include <pwd.h>
-# ifdef LOCKF

 # include <fcntl.h>
 # include <fcntl.h>

-# endif
+# include <pwd.h>

 
 # ifdef DBM
 ERROR: DBM is no longer supported -- use NDBM instead.
 
 # ifdef DBM
 ERROR: DBM is no longer supported -- use NDBM instead.


@@ -31,15 +28,15 @@ ERROR: DBM is no longer supported -- use NDBM instead.
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NEWDB and NDBM)";
+static char sccsid[] = "@(#)alias.c    6.6 (Berkeley) %G% (with NEWDB and NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NEWDB)";
+static char sccsid[] = "@(#)alias.c    6.6 (Berkeley) %G% (with NEWDB)";

 #endif
 #else
 #ifdef NDBM
 #endif
 #else
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NDBM)";
+static char sccsid[] = "@(#)alias.c    6.6 (Berkeley) %G% (with NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (without NEWDB or NDBM)";
+static char sccsid[] = "@(#)alias.c    6.6 (Berkeley) %G% (without NEWDB or NDBM)";

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

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index e88d7a0..e2dff64 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -7,15 +7,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)envelope.c 6.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)envelope.c 6.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <pwd.h>

-#include <sys/file.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>

 #include "sendmail.h"
 
 /*
 #include "sendmail.h"
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 4cfafe6..9ec75bf 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,14 +13,13 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     6.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     6.13 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 
 #include <unistd.h>
 #endif /* not lint */
 
 #define        _DEFINE
 
 #include <unistd.h>

-#include <sys/file.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>

 #include <sys/stat.h>
 #include <signal.h>
 #include <sgtty.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <sgtty.h>

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 866746b..f0ab32e 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -7,12 +7,11 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)map.c      6.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)map.c      6.4 (Berkeley) %G%";

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

-#include <sys/file.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>

 
 #ifdef DBM_MAP
 #include <ndbm.h>
 
 #ifdef DBM_MAP
 #include <ndbm.h>

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index 257e31f..160ae2a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -10,21 +10,18 @@
 
 #ifndef lint
 #ifdef QUEUE
 
 #ifndef lint
 #ifdef QUEUE

-static char sccsid[] = "@(#)queue.c    6.7 (Berkeley) %G% (with queueing)";
+static char sccsid[] = "@(#)queue.c    6.8 (Berkeley) %G% (with queueing)";

 #else
 #else

-static char sccsid[] = "@(#)queue.c    6.7 (Berkeley) %G% (without queueing)";
+static char sccsid[] = "@(#)queue.c    6.8 (Berkeley) %G% (without queueing)";

 #endif
 #endif /* not lint */
 
 # include <sys/stat.h>
 # include <sys/dir.h>
 #endif
 #endif /* not lint */
 
 # include <sys/stat.h>
 # include <sys/dir.h>

-# include <sys/file.h>

 # include <signal.h>
 # include <errno.h>
 # include <pwd.h>
 # include <signal.h>
 # include <errno.h>
 # include <pwd.h>

-# ifdef LOCKF

 # include <fcntl.h>
 # include <fcntl.h>

-# endif

 # ifdef SYSTEM5
 # include <dirent.h>
 # endif
 # ifdef SYSTEM5
 # include <dirent.h>
 # endif

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 646d7b6..84fcbe6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,13 +7,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        6.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        6.6 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <sys/types.h>
 # include <sys/stat.h>
 #endif /* not lint */
 
 # include <sys/types.h>
 # include <sys/stat.h>

-# include <sys/file.h>
-# include <sys/fcntl.h>
+# include <fcntl.h>

 # include <pwd.h>
 # include "sendmail.h"
 
 # include <pwd.h>
 # include "sendmail.h"
 

diff --git a/usr/src/usr.sbin/sendmail/src/udb.c b/usr/src/usr.sbin/sendmail/src/udb.c
index 3e367f2..0ff13df 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/udb.c
+++ b/usr/src/usr.sbin/sendmail/src/udb.c
@@ -8,9 +8,9 @@
 
 #ifndef lint
 #ifdef USERDB
 
 #ifndef lint
 #ifdef USERDB

-static char sccsid [] = "@(#)udb.c     6.3 (Berkeley) %G% (with USERDB)";
+static char sccsid [] = "@(#)udb.c     6.4 (Berkeley) %G% (with USERDB)";

 #else
 #else

-static char sccsid [] = "@(#)udb.c     6.3 (Berkeley) %G% (without USERDB)";
+static char sccsid [] = "@(#)udb.c     6.4 (Berkeley) %G% (without USERDB)";

 #endif
 #endif
 
 #endif
 #endif
 


@@ -18,7 +18,6 @@ static char sccsid [] = "@(#)udb.c    6.3 (Berkeley) %G% (without USERDB)";
 
 #ifdef USERDB
 
 
 #ifdef USERDB
 

-#include <sys/file.h>

 #include <sys/time.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 1f73838..20518d5 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)version.c  6.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)version.c  6.17 (Berkeley) %G%";

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

-char   Version[] = "ALPHA-6.16";
+char   Version[] = "ALPHA-6.17";