change some defaults inside amd itself, so that the rc scripts no longer

have to pass those options.  this makes amd much easier to restart by
hand (though it still remains a nasty daemon do that with)
ok millert

4 files changed, 9 insertions, 9 deletions

diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8
index ad8a0eced09..bbef6996647 100644
--- a/usr.sbin/amd/amd/amd.8
+++ b/usr.sbin/amd/amd/amd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: amd.8,v 1.20 2007/05/31 19:20:21 jmc Exp $
+.\"	$OpenBSD: amd.8,v 1.21 2009/08/12 13:21:17 deraadt Exp $
 .\"
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)amd.8	5.10 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 12 2009 $
 .Dt AMD 8
 .Os
 .Sh NAME
@@ -85,7 +85,7 @@ The options are as follows:
 .It Fl a Ar mount_point
 Specify an alternative location for the real mount points.
 The default is
-.Pa /a .
+.Pa /tmp_mnt .
 .It Fl C Ar cluster
 Specify an alternative
 .Ar cluster
diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c
index 25bbc506b6f..dc2c76e5ccf 100644
--- a/usr.sbin/amd/amd/amd.c
+++ b/usr.sbin/amd/amd/amd.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amd.c	8.1 (Berkeley) 6/6/93
- *	$Id: amd.c,v 1.14 2004/10/21 20:57:08 millert Exp $
+ *	$Id: amd.c,v 1.15 2009/08/12 13:21:17 deraadt Exp $
  */
 
 #ifndef lint
@@ -63,7 +63,7 @@ char pid_fsname[16 + MAXHOSTNAMELEN];	/* "kiska.southseas.nz:(pid%d)" */
 char *host_helper;
 #endif /* HOST_EXEC */
 #endif /* HAS_HOST */
-char *auto_dir = "/a";
+char *auto_dir = "/tmp_mnt";
 char *hostdomain = "unknown.domain";
 char hostname[MAXHOSTNAMELEN] = "localhost"; /* Hostname */
 char hostd[2*MAXHOSTNAMELEN];		/* Host+domain */
diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c
index 6831f89ab94..2df447d92e8 100644
--- a/usr.sbin/amd/amd/get_args.c
+++ b/usr.sbin/amd/amd/get_args.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)get_args.c	8.1 (Berkeley) 6/6/93
- *	$Id: get_args.c,v 1.10 2007/02/18 20:26:38 jmc Exp $
+ *	$Id: get_args.c,v 1.11 2009/08/12 13:21:17 deraadt Exp $
  */
 
 /*
@@ -103,7 +103,7 @@ get_args(int c, char *v[])
 {
 	int opt_ch;
 	int usage = 0;
-	char *logfile = 0;
+	char *logfile = "syslog";
 	char *sub_domain = 0;
 
 	while ((opt_ch = getopt(c, v, "mnprva:c:d:h:k:l:t:w:x:y:C:D:")) != -1)
diff --git a/usr.sbin/amd/amd/xutil.c b/usr.sbin/amd/amd/xutil.c
index 7f39fc2cb1f..c61a3a87fa2 100644
--- a/usr.sbin/amd/amd/xutil.c
+++ b/usr.sbin/amd/amd/xutil.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)xutil.c	8.1 (Berkeley) 6/6/93
- *	$Id: xutil.c,v 1.11 2003/06/02 23:36:51 millert Exp $
+ *	$Id: xutil.c,v 1.12 2009/08/12 13:21:17 deraadt Exp $
  */
 
 #include "config.h"
@@ -52,7 +52,7 @@ FILE *logfp = stderr;		/* Log errors to stderr initially */
 #ifdef HAS_SYSLOG
 int syslogging;
 #endif /* HAS_SYSLOG */
-int xlog_level = XLOG_ALL & ~XLOG_MAP & ~XLOG_STATS;
+int xlog_level = XLOG_ALL & ~XLOG_MAP & ~XLOG_STATS & ~XLOG_INFO;
 int xlog_level_init = ~0;
 
 /*