sync with private code:

fix a 5.x'ism that 4.x needs protection from.
make this code compile standalone.

11 files changed, 17 insertions, 12 deletions

diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 7b69c96..744bc63 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2004/08/31 16:26:24 bright Exp $
+# $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $
 # $FreeBSD$
 
 LIB=	autofs
diff --git a/lib/libautofs/libautofs.3 b/lib/libautofs/libautofs.3
index 2875c06..0c92af2 100644
--- a/lib/libautofs/libautofs.3
+++ b/lib/libautofs/libautofs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: libautofs.3,v 1.3 2004/08/31 15:58:40 bright Exp $
+.\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $
 .\" $FreeBSD$
 .Dd August 30, 2004
 .Dt LIBAUTOFS 3
diff --git a/lib/libautofs/libautofs.c b/lib/libautofs/libautofs.c
index 7d2e26a..88bad16 100644
--- a/lib/libautofs/libautofs.c
+++ b/lib/libautofs/libautofs.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- * $Id: libautofs.c,v 1.3 2004/08/31 08:49:56 bright Exp $
+ * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $
  */
 #include <err.h>
 #include <ctype.h>
@@ -43,7 +43,11 @@
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
+#ifdef AUTOFSSTANDALONE
+#include "../autofs/autofs.h"
+#else
 #include <fs/autofs/autofs.h>
+#endif
 
 #include "libautofs.h"
 
diff --git a/lib/libautofs/libautofs.h b/lib/libautofs/libautofs.h
index 98da2f8..5fb29a9 100644
--- a/lib/libautofs/libautofs.h
+++ b/lib/libautofs/libautofs.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- * $Id: libautofs.h,v 1.3 2004/08/31 08:49:56 bright Exp $
+ * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $
  */
 #ifndef _LIBAUTOFS_H
 #define _LIBAUTOFS_H
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index a234944..e7d040d 100644
--- a/sbin/mount_autofs/Makefile
+++ b/sbin/mount_autofs/Makefile
@@ -1,8 +1,8 @@
-# $Id: Makefile,v 1.4 2004/08/31 16:27:40 bright Exp $
+# $Id: Makefile,v 1.6 2004/09/08 08:27:12 bright Exp $
 # $FreeBSD$
 
 PROG=mount_autofs
 MAN=mount_autofs.8
-BINDIR?=/usr/sbin
+BINDIR?=/sbin
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_autofs/mount_autofs.8 b/sbin/mount_autofs/mount_autofs.8
index b4f0c84..8d9e25e 100644
--- a/sbin/mount_autofs/mount_autofs.8
+++ b/sbin/mount_autofs/mount_autofs.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: mount_autofs.8,v 1.2 2004/08/31 08:49:56 bright Exp $
+.\" $Id: mount_autofs.8,v 1.3 2004/09/08 08:12:21 bright Exp $
 .\" $FreeBSD$
 .Dd August 30, 2004
 .Dt MOUNT_AUTOFS 8
diff --git a/sbin/mount_autofs/mount_autofs.c b/sbin/mount_autofs/mount_autofs.c
index 393ff06..d01f840 100644
--- a/sbin/mount_autofs/mount_autofs.c
+++ b/sbin/mount_autofs/mount_autofs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: mount_autofs.c,v 1.4 2004/08/31 16:28:22 bright Exp $
+ * $Id: mount_autofs.c,v 1.5 2004/09/08 08:12:21 bright Exp $
  * $FreeBSD$
  */
 #include <sys/param.h>
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index 51791bb..fb7d051 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/07/17 11:26:51 bright Exp $
+# $Id: Makefile,v 1.5 2004/09/08 08:27:12 bright Exp $
 # $FreeBSD$
 
 PROG=autodriver
@@ -8,6 +8,7 @@ NOMAN=		YES
 WERROR=		YES
 WARNS=		4
 CFLAGS+=	-g
+BINDIR?=	/sbin
 
 DPADD+=		${.OBJDIR}/../libautofs/libautofs.a
 #LDADD+=		-lautofs
diff --git a/share/examples/autofs/driver/autodriver.c b/share/examples/autofs/driver/autodriver.c
index e2c9b05..10ccbb0 100644
--- a/share/examples/autofs/driver/autodriver.c
+++ b/share/examples/autofs/driver/autodriver.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: autodriver.c,v 1.8 2004/08/31 08:49:56 bright Exp $
+ * $Id: autodriver.c,v 1.9 2004/09/08 08:12:21 bright Exp $
  * $FreeBSD$
  */
 #include <ctype.h>
diff --git a/share/examples/autofs/driver/autotab b/share/examples/autofs/driver/autotab
index e2f8569..c56e072 100644
--- a/share/examples/autofs/driver/autotab
+++ b/share/examples/autofs/driver/autotab
@@ -1,4 +1,4 @@
-# $Id: autotab,v 1.7 2004/08/31 15:59:44 bright Exp $
+# $Id: autotab,v 1.8 2004/09/08 08:12:21 bright Exp $
 # $FreeBSD$
 # autofs, directory, fstype, opts, path
 /auto	share	nfs	ro,-R=1	big:/vol/share direct
diff --git a/sys/modules/autofs/Makefile b/sys/modules/autofs/Makefile
index 1dba335..6d0a752 100644
--- a/sys/modules/autofs/Makefile
+++ b/sys/modules/autofs/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $Id: Makefile,v 1.10 2004/09/01 07:03:32 bright Exp $
+# $Id: Makefile,v 1.11 2004/09/08 08:12:21 bright Exp $
 
 
 SRCDIR=        ${.CURDIR}/../../fs/autofs