file reorg, pathnames.h, paths.h

[unix-history] / usr / src / usr.sbin / sendmail / src / conf.c

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 2b1bb95..f9fca2f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -1,28 +1,28 @@
 /*
 /*

+ * Copyright (c) 1983 Eric P. Allman

  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- *
- *  Sendmail
- *  Copyright (c) 1983  Eric P. Allman
- *  Berkeley, California
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     5.19 (Berkeley) %G%";

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

-# include <pwd.h>

 # include <sys/ioctl.h>
 # include <sys/ioctl.h>

-# ifdef sun

 # include <sys/param.h>
 # include <sys/param.h>

-# endif sun
+# include <pwd.h>

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


@@ -113,8 +113,8 @@ char        Arpa_Usrerr[] =         "554";  /* some (fatal) user error */
 **  Location of system files/databases/etc.
 */
 
 **  Location of system files/databases/etc.
 */
 

-char   *ConfFile =     "/usr/lib/sendmail.cf"; /* runtime configuration */
-char   *FreezeFile =   "/usr/lib/sendmail.fc"; /* frozen version of above */
+char   *ConfFile =     "/etc/sendmail.cf";     /* runtime configuration */
+char   *FreezeFile =   "/etc/sendmail.fc";     /* frozen version of above */