break some configuration into conf.h -- simplifies makefile changes

on different machines.  But there are still conditional libraries, so
this may not be a good idea.....

SCCS-vsn: usr.sbin/sendmail/src/arpadate.c 3.6.1.1
SCCS-vsn: usr.sbin/sendmail/src/conf.c 3.31.1.1
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.44.1.1
SCCS-vsn: usr.sbin/sendmail/src/util.c 3.8.1.1
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.38.1.1
SCCS-vsn: usr.sbin/sendmail/src/macro.c 3.4.1.1
SCCS-vsn: bin/rmail/rmail.c 3.3.1.1

diff --git a/usr/src/bin/rmail/rmail.c b/usr/src/bin/rmail/rmail.c
index b9d081c..087d118 100644 (file)
--- a/usr/src/bin/rmail/rmail.c
+++ b/usr/src/bin/rmail/rmail.c
@@ -14,11 +14,12 @@
  * If you don't run uucp you don't even need any rmail.
  */
 
  * If you don't run uucp you don't even need any rmail.
  */
 

-static char    SccsId[] =      "@(#)rmail.c    3.3     %G%";
+static char    SccsId[] =      "@(#)rmail.c    3.3.1.1 %G%";

 
 # include <stdio.h>
 # include <sysexits.h>
 # include "useful.h"
 
 # include <stdio.h>
 # include <sysexits.h>
 # include "useful.h"

+# include "conf.h"

 
 extern FILE *popen();
 extern char *index();
 
 extern FILE *popen();
 extern char *index();

diff --git a/usr/src/usr.sbin/sendmail/src/arpadate.c b/usr/src/usr.sbin/sendmail/src/arpadate.c
index 19ef202..38a6e65 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/arpadate.c
+++ b/usr/src/usr.sbin/sendmail/src/arpadate.c
@@ -1,10 +1,11 @@
+# include "conf.h"

 # include <time.h>
 # ifndef V6
 # include <sys/types.h>
 # include <sys/timeb.h>
 # endif
 
 # include <time.h>
 # ifndef V6
 # include <sys/types.h>
 # include <sys/timeb.h>
 # endif
 

-static char SccsId[] = "@(#)arpadate.c 3.6     %G%";
+static char SccsId[] = "@(#)arpadate.c 3.6.1.1 %G%";

 
 /*
 **  ARPADATE -- Create date in ARPANET format
 
 /*
 **  ARPADATE -- Create date in ARPANET format

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 3193ca0..c461672 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -36,13 +36,8 @@
 
 
 
 
 
 

-static char SccsId[] = "@(#)conf.c     3.31    %G%";
-
-
-# include <whoami.h>           /* definitions of machine id's at berkeley */
-
-
-/*
+static char SccsId[] = "@(#)conf.c     3.31.1.1        %G%";
+\f/*

 **  Header info table
 **     Final (null) entry contains the flags used for any other field.
 **
 **  Header info table
 **     Final (null) entry contains the flags used for any other field.
 **

diff --git a/usr/src/usr.sbin/sendmail/src/macro.c b/usr/src/usr.sbin/sendmail/src/macro.c
index aba808a..350da0d 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/macro.c
+++ b/usr/src/usr.sbin/sendmail/src/macro.c
@@ -1,6 +1,7 @@
 # include "useful.h"
 # include "useful.h"

+# include "conf.h"

 
 

-static char SccsId[] = "@(#)macro.c    3.4     %G%";
+static char SccsId[] = "@(#)macro.c    3.4.1.1 %G%";

 
 char   *Macro[128];
 extern int     Debug;
 
 char   *Macro[128];
 extern int     Debug;

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index d744c3a..9482470 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -1,7 +1,7 @@
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **

-**     @(#)sendmail.h  3.44    %G%
+**     @(#)sendmail.h  3.44.1.1        %G%

 */
 
 
 */
 
 


@@ -14,6 +14,7 @@
 
 # include <stdio.h>
 # include <ctype.h>
 
 # include <stdio.h>
 # include <ctype.h>

+# include "conf.h"

 # include "useful.h"
 
 /*
 # include "useful.h"
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c
index 0ee1bed..0fc5563 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/util.c
+++ b/usr/src/usr.sbin/sendmail/src/util.c
@@ -2,8 +2,9 @@
 # include <sysexits.h>
 # include "useful.h"
 # include <ctype.h>
 # include <sysexits.h>
 # include "useful.h"
 # include <ctype.h>

+# include "conf.h"

 
 

-static char    SccsId[] = "@(#)util.c  3.8     %G%";
+static char    SccsId[] = "@(#)util.c  3.8.1.1 %G%";

 
 /*
 **  STRIPQUOTES -- Strip quotes & quote bits from a string.
 
 /*
 **  STRIPQUOTES -- Strip quotes & quote bits from a string.

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 3d64db2..4f6d625 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,3 +1,3 @@
-static char    SccsId[] = "@(#)SendMail version 3.38 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.38.1.1 of %G%";

 
 

-char   Version[] = "3.38 [%G%]";
+char   Version[] = "3.38.1.1 [%G%]";