Update for version 6.1.5.

1 files changed, 253 insertions, 117 deletions

diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index fce7f07..e1dc8ef 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -3,15 +3,6 @@
  *
  * portions derived from
  *      $NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $
- *
- */
-
-/*
- * Start of am-utils-6.x config.h file.
- * Erez Zadok <ezk @ cs.sunysb.edu>
- *
- * DO NOT EDIT BY HAND.
- * Note: generated by autoheader from configure.in.
  */
 
 #ifndef _CONFIG_H
@@ -27,15 +18,7 @@
 #define AUTH_CREATE_GIDLIST_TYPE gid_t
 
 /* Define configuration date */
-/* #define CONFIG_DATE "Sat Jun 26 15:53:09 CEST 2004" */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
+/* #define CONFIG_DATE "Tue Dec 4 21:39:00 PST 2007" */
 
 /* Turn off general debugging by default */
 /* #undef DEBUG */
@@ -43,6 +26,10 @@
 /* Turn off memory debugging by default */
 /* #undef DEBUG_MEM */
 
+/* Define name of host OS's distribution name (eg. debian, redhat, suse, etc.)
+   */
+#define DISTRO_NAME "The FreeBSD Project"
+
 /* Define to the type of elements in the array set by `getgroups'. Usually
    this is either `int' or `gid_t'. */
 #define GETGROUPS_T gid_t
@@ -50,13 +37,6 @@
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 #define GETPGRP_VOID 1
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
 /* Define if have automount filesystem */
 #define HAVE_AMU_FS_AUTO 1
 
@@ -69,9 +49,6 @@
 /* Define if have NFS host-tree filesystem */
 #define HAVE_AMU_FS_HOST 1
 
-/* Define if have inheritance filesystem */
-#define HAVE_AMU_FS_INHERIT 1
-
 /* Define if have symbolic-link filesystem */
 #define HAVE_AMU_FS_LINK 1
 
@@ -102,6 +79,12 @@
 /* Define to 1 if you have the <assert.h> header file. */
 #define HAVE_ASSERT_H 1
 
+/* Define to 1 if `addr' is member of `autofs_args_t'. */
+/* #undef HAVE_AUTOFS_ARGS_T_ADDR */
+
+/* define if have a bad version of hasmntopt() */
+/* #undef HAVE_BAD_HASMNTOPT */
+
 /* define if have a bad version of memcmp() */
 /* #undef HAVE_BAD_MEMCMP */
 
@@ -120,22 +103,25 @@
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
 
-/* Define if `flags' is member of `cdfs_args_t'. */
+/* System supports C99-style variable-length argument macros */
+#define HAVE_C99_VARARGS_MACROS 1
+
+/* Define to 1 if `flags' is member of `cdfs_args_t'. */
 #define HAVE_CDFS_ARGS_T_FLAGS 1
 
-/* Define if `fspec' is member of `cdfs_args_t'. */
+/* Define to 1 if `fspec' is member of `cdfs_args_t'. */
 #define HAVE_CDFS_ARGS_T_FSPEC 1
 
-/* Define if `iso_flags' is member of `cdfs_args_t'. */
+/* Define to 1 if `iso_flags' is member of `cdfs_args_t'. */
 /* #undef HAVE_CDFS_ARGS_T_ISO_FLAGS */
 
-/* Define if `iso_pgthresh' is member of `cdfs_args_t'. */
+/* Define to 1 if `iso_pgthresh' is member of `cdfs_args_t'. */
 /* #undef HAVE_CDFS_ARGS_T_ISO_PGTHRESH */
 
-/* Define if `norrip' is member of `cdfs_args_t'. */
+/* Define to 1 if `norrip' is member of `cdfs_args_t'. */
 /* #undef HAVE_CDFS_ARGS_T_NORRIP */
 
-/* Define if `ssector' is member of `cdfs_args_t'. */
+/* Define to 1 if `ssector' is member of `cdfs_args_t'. */
 #define HAVE_CDFS_ARGS_T_SSECTOR 1
 
 /* Define to 1 if you have the <cdfs/cdfsmount.h> header file. */
@@ -147,8 +133,11 @@
 /* Define to 1 if you have the `clnt_create' function. */
 #define HAVE_CLNT_CREATE 1
 
-/* Define to 1 if you have the `clnt_create_timed' function. */
-#define HAVE_CLNT_CREATE_TIMED 1
+/* Define to 1 if you have the `clnt_create_vers' function. */
+#define HAVE_CLNT_CREATE_VERS 1
+
+/* Define to 1 if you have the `clnt_create_vers_timed' function. */
+#define HAVE_CLNT_CREATE_VERS_TIMED 1
 
 /* Define to 1 if you have the `clnt_spcreateerror' function. */
 #define HAVE_CLNT_SPCREATEERROR 1
@@ -184,10 +173,10 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
-/* Define if `flags' is member of `efs_args_t'. */
+/* Define to 1 if `flags' is member of `efs_args_t'. */
 /* #undef HAVE_EFS_ARGS_T_FLAGS */
 
-/* Define if `fspec' is member of `efs_args_t'. */
+/* Define to 1 if `fspec' is member of `efs_args_t'. */
 /* #undef HAVE_EFS_ARGS_T_FSPEC */
 
 /* Define to 1 if you have the <errno.h> header file. */
@@ -208,6 +197,9 @@
 /* does extern definition for getdomainname() exist? */
 #define HAVE_EXTERN_GETDOMAINNAME 1
 
+/* does extern definition for getdtablesize() exist? */
+#define HAVE_EXTERN_GETDTABLESIZE 1
+
 /* does extern definition for gethostname() exist? */
 #define HAVE_EXTERN_GETHOSTNAME 1
 
@@ -220,15 +212,27 @@
 /* does extern definition for gettablesize() exist? */
 /* #undef HAVE_EXTERN_GETTABLESIZE */
 
+/* does extern definition for getwd() exist? */
+#define HAVE_EXTERN_GETWD 1
+
 /* does extern definition for get_myaddress() exist? */
 #define HAVE_EXTERN_GET_MYADDRESS 1
 
+/* does extern definition for hosts_ctl() exist? */
+/* #undef HAVE_EXTERN_HOSTS_CTL */
+
 /* does extern definition for innetgr() exist? */
 #define HAVE_EXTERN_INNETGR 1
 
+/* does extern definition for ldap_enable_cache() exist? */
+/* #undef HAVE_EXTERN_LDAP_ENABLE_CACHE */
+
 /* does extern definition for mkstemp() exist? */
 #define HAVE_EXTERN_MKSTEMP 1
 
+/* does extern definition for mntctl() exist? */
+/* #undef HAVE_EXTERN_MNTCTL */
+
 /* does extern definition for optarg exist? */
 #define HAVE_EXTERN_OPTARG 1
 
@@ -241,18 +245,30 @@
 /* does extern definition for setitimer() exist? */
 #define HAVE_EXTERN_SETITIMER 1
 
+/* does extern definition for sleep() exist? */
+#define HAVE_EXTERN_SLEEP 1
+
 /* does extern definition for strcasecmp() exist? */
 #define HAVE_EXTERN_STRCASECMP 1
 
 /* does extern definition for strdup() exist? */
 #define HAVE_EXTERN_STRDUP 1
 
+/* does extern definition for strlcat() exist? */
+#define HAVE_EXTERN_STRLCAT 1
+
+/* does extern definition for strlcpy() exist? */
+#define HAVE_EXTERN_STRLCPY 1
+
 /* does extern definition for strstr() exist? */
 #define HAVE_EXTERN_STRSTR 1
 
 /* does extern definition for sys_errlist[] exist? */
 #define HAVE_EXTERN_SYS_ERRLIST 1
 
+/* does extern definition for ualarm() exist? */
+#define HAVE_EXTERN_UALARM 1
+
 /* does extern definition for usleep() exist? */
 #define HAVE_EXTERN_USLEEP 1
 
@@ -271,6 +287,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if `fds_bits' is member of `fd_set'. */
+#define HAVE_FD_SET_FDS_BITS 1
+
 /* Define to 1 if you have the `fgets' function. */
 #define HAVE_FGETS 1
 
@@ -301,6 +320,9 @@
 /* Define if have EFS filesystem (irix) */
 /* #undef HAVE_FS_EFS */
 
+/* Define if have FFS filesystem */
+/* #undef HAVE_FS_FFS */
+
 /* Define if have HSFS filesystem */
 /* #undef HAVE_FS_HSFS */
 
@@ -340,7 +362,10 @@
 /* Define if have XFS filesystem (irix) */
 /* #undef HAVE_FS_XFS */
 
-/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
+/* System supports GCC-style variable-length argument macros */
+/* #undef HAVE_GCC_VARARGS_MACROS */
+
+/* Define to 1 if you have the <gdbm-ndbm.h> header file. */
 /* #undef HAVE_GDBM_NDBM_H */
 
 /* Define to 1 if you have the `getccent' function. */
@@ -403,28 +428,20 @@
 
 /* Define to 1 if you have the `hes_init' function. */
 #define HAVE_HES_INIT 1
-
-#else /* YES_HESIOD */
-/* Define to 1 if you have the <hesiod.h> header file. */
-#undef HAVE_HESIOD_H 
-
-/* Define to 1 if you have the `hesiod_init' function. */
-#undef HAVE_HESIOD_INIT 
-
-/* Define to 1 if you have the `hesiod_reload' function. */
-/* #undef HAVE_HESIOD_RELOAD */
-
-/* Define to 1 if you have the `hesiod_to_bind' function. */
-#undef HAVE_HESIOD_TO_BIND 
-
-/* Define to 1 if you have the `hes_init' function. */
-#undef HAVE_HES_INIT 
-
+#else
+#undef HAVE_HESIOD_H
+#undef HAVE_HESIOD_INIT
+#undef HAVE_HESIOD_RELOAD
+#undef HAVE_HESIOD_TO_BIND
+#undef HAVE_HES_INIT
 #endif
 
 /* Define to 1 if you have the <hsfs/hsfs.h> header file. */
 /* #undef HAVE_HSFS_HSFS_H */
 
+/* Define to 1 if you have the `hstrerror' function. */
+#define HAVE_HSTRERROR 1
+
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #define HAVE_IFADDRS_H 1
 
@@ -464,6 +481,9 @@
 /* Define to 1 if you have the `posix4' library (-lposix4). */
 /* #undef HAVE_LIBPOSIX4 */
 
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+/* #undef HAVE_LIBRESOLV */
+
 /* Define to 1 if you have the `rpc' library (-lrpc). */
 /* #undef HAVE_LIBRPC */
 
@@ -473,6 +493,12 @@
 /* Define to 1 if you have the `rt' library (-lrt). */
 /* #undef HAVE_LIBRT */
 
+/* does libwrap exist? */
+#define HAVE_LIBWRAP 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
 /* Define to 1 if you have the <linux/auto_fs4.h> header file. */
 /* #undef HAVE_LINUX_AUTO_FS4_H */
 
@@ -491,6 +517,9 @@
 /* Define to 1 if you have the <linux/loop.h> header file. */
 /* #undef HAVE_LINUX_LOOP_H */
 
+/* Define to 1 if you have the <linux/nfs2.h> header file. */
+/* #undef HAVE_LINUX_NFS2_H */
+
 /* Define to 1 if you have the <linux/nfs.h> header file. */
 /* #undef HAVE_LINUX_NFS_H */
 
@@ -500,18 +529,27 @@
 /* Define to 1 if you have the <linux/posix_types.h> header file. */
 /* #undef HAVE_LINUX_POSIX_TYPES_H */
 
+/* Define to 1 if you have the <linux/socket.h> header file. */
+/* #undef HAVE_LINUX_SOCKET_H */
+
 /* Define to 1 if you support file names longer than 14 characters. */
 #define HAVE_LONG_FILE_NAMES 1
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #define HAVE_MACHINE_ENDIAN_H 1
 
+/* Define to 1 if you have the `madvise' function. */
+#define HAVE_MADVISE 1
+
 /* Define to 1 if you have the <malloc.h> header file. */
 /* #undef HAVE_MALLOC_H */
 
 /* Define if have DBM maps */
 /* #undef HAVE_MAP_DBM */
 
+/* Define if have executable maps */
+#define HAVE_MAP_EXEC 1
+
 /* Define if have file maps (everyone should have it!) */
 #define HAVE_MAP_FILE 1
 
@@ -570,13 +608,13 @@
 /* Define to 1 if you have the <mntent.h> header file. */
 /* #undef HAVE_MNTENT_H */
 
-/* Define if `mnt_cnode' is member of `mntent_t'. */
+/* Define to 1 if `mnt_cnode' is member of `mntent_t'. */
 /* #undef HAVE_MNTENT_T_MNT_CNODE */
 
-/* Define if `mnt_ro' is member of `mntent_t'. */
+/* Define to 1 if `mnt_ro' is member of `mntent_t'. */
 /* #undef HAVE_MNTENT_T_MNT_RO */
 
-/* Define if `mnt_time' is member of `mntent_t'. */
+/* Define to 1 if `mnt_time' is member of `mntent_t'. */
 /* #undef HAVE_MNTENT_T_MNT_TIME */
 
 /* does mntent_t have mnt_time field and is of type "char *" ? */
@@ -588,6 +626,9 @@
 /* Define to 1 if you have the `mount' function. */
 #define HAVE_MOUNT 1
 
+/* Define to 1 if `optptr' is member of `mounta'. */
+/* #undef HAVE_MOUNTA_OPTPTR */
+
 /* Define to 1 if you have the `mountsyscall' function. */
 /* #undef HAVE_MOUNTSYSCALL */
 
@@ -636,37 +677,46 @@
 /* Define to 1 if you have the <nfsclient/nfsargs.h> header file. */
 #define HAVE_NFSCLIENT_NFSARGS_H 1
 
-/* Define if `acdirmin' is member of `nfs_args_t'. */
+/* Define to 1 if `acdirmax' is member of `nfs_args_t'. */
+#define HAVE_NFS_ARGS_T_ACDIRMAX 1
+
+/* Define to 1 if `acdirmin' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_ACDIRMIN 1
 
-/* Define if `acregmin' is member of `nfs_args_t'. */
+/* Define to 1 if `acregmax' is member of `nfs_args_t'. */
+#define HAVE_NFS_ARGS_T_ACREGMAX 1
+
+/* Define to 1 if `acregmin' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_ACREGMIN 1
 
-/* Define if `bsize' is member of `nfs_args_t'. */
+/* Define to 1 if `addrlen' is member of `nfs_args_t'. */
+#define HAVE_NFS_ARGS_T_ADDRLEN 1
+
+/* Define to 1 if `bsize' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_BSIZE */
 
-/* Define if `fhsize' is member of `nfs_args_t'. */
+/* Define to 1 if `fhsize' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_FHSIZE 1
 
-/* Define if `fh_len' is member of `nfs_args_t'. */
+/* Define to 1 if `fh_len' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_FH_LEN */
 
-/* Define if `gfs_flags' is member of `nfs_args_t'. */
+/* Define to 1 if `gfs_flags' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_GFS_FLAGS */
 
-/* Define if `namlen' is member of `nfs_args_t'. */
+/* Define to 1 if `namlen' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_NAMLEN */
 
-/* Define if `optstr' is member of `nfs_args_t'. */
+/* Define to 1 if `optstr' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_OPTSTR */
 
-/* Define if `proto' is member of `nfs_args_t'. */
+/* Define to 1 if `proto' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_PROTO 1
 
-/* Define if `sotype' is member of `nfs_args_t'. */
+/* Define to 1 if `sotype' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_SOTYPE 1
 
-/* Define if `version' is member of `nfs_args_t'. */
+/* Define to 1 if `version' is member of `nfs_args_t'. */
 #define HAVE_NFS_ARGS_T_VERSION 1
 
 /* Define to 1 if you have the <nfs/export.h> header file. */
@@ -713,26 +763,25 @@
 
 /* Define to 1 if you have the `opendir' function. */
 #define HAVE_OPENDIR 1
-
-/* Define if `dsttime' is member of `pcfs_args_t'. */
+/* Define to 1 if `dsttime' is member of `pcfs_args_t'. */
 /* #undef HAVE_PCFS_ARGS_T_DSTTIME */
 
-/* Define if `fspec' is member of `pcfs_args_t'. */
+/* Define to 1 if `fspec' is member of `pcfs_args_t'. */
 #define HAVE_PCFS_ARGS_T_FSPEC 1
 
-/* Define if `gid' is member of `pcfs_args_t'. */
+/* Define to 1 if `gid' is member of `pcfs_args_t'. */
 #define HAVE_PCFS_ARGS_T_GID 1
 
-/* Define if `mask' is member of `pcfs_args_t'. */
+/* Define to 1 if `mask' is member of `pcfs_args_t'. */
 #define HAVE_PCFS_ARGS_T_MASK 1
 
-/* Define if `dirmask' is member of `pcfs_args_t'. */
+/* Define to 1 if `dirmask' is member of `pcfs_args_t'. */
 #define HAVE_PCFS_ARGS_T_DIRMASK 1
 
-/* Define if `secondswest' is member of `pcfs_args_t'. */
+/* Define to 1 if `secondswest' is member of `pcfs_args_t'. */
 /* #undef HAVE_PCFS_ARGS_T_SECONDSWEST */
 
-/* Define if `uid' is member of `pcfs_args_t'. */
+/* Define to 1 if `uid' is member of `pcfs_args_t'. */
 #define HAVE_PCFS_ARGS_T_UID 1
 
 /* Define to 1 if you have the `plock' function. */
@@ -760,6 +809,9 @@
 /* Define to 1 if you have the `rmdir' function. */
 #define HAVE_RMDIR 1
 
+/* Define to 1 if you have the <rpcsvc/autofs_prot.h> header file. */
+/* #undef HAVE_RPCSVC_AUTOFS_PROT_H */
+
 /* Define to 1 if you have the <rpcsvc/mountv3.h> header file. */
 /* #undef HAVE_RPCSVC_MOUNTV3_H */
 
@@ -823,6 +875,9 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
+/* Define to 1 if you have the `sigsuspend' function. */
+#define HAVE_SIGSUSPEND 1
+
 /* Define to 1 if you have the `socket' function. */
 #define HAVE_SOCKET 1
 
@@ -832,6 +887,12 @@
 /* Define to 1 if you have the <statbuf.h> header file. */
 /* #undef HAVE_STATBUF_H */
 
+/* Define to 1 if you have the `statfs' function. */
+#define HAVE_STATFS 1
+
+/* Define to 1 if you have the `statvfs' function. */
+#define HAVE_STATVFS 1
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #define HAVE_STDARG_H 1
 
@@ -865,19 +926,25 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strlcat' function. */
+#define HAVE_STRLCAT 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
 /* Define to 1 if you have the `strspn' function. */
 #define HAVE_STRSPN 1
 
 /* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
-/* Define if `fhs_fh' is member of `struct fhstatus'. */
+/* Define to 1 if `fhs_fh' is member of `struct fhstatus'. */
 /* #undef HAVE_STRUCT_FHSTATUS_FHS_FH */
 
-/* Define if `ifa_next' is member of `struct ifaddrs'. */
+/* Define to 1 if `ifa_next' is member of `struct ifaddrs'. */
 #define HAVE_STRUCT_IFADDRS_IFA_NEXT 1
 
-/* Define if `ifr_addr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
 #define HAVE_STRUCT_IFREQ_IFR_ADDR 1
 
 /* Define if have struct mntent in one of the standard headers */
@@ -892,12 +959,15 @@
 /* Define if have struct nfs_gfs_mount in one of the standard nfs headers */
 /* #undef HAVE_STRUCT_NFS_GFS_MOUNT */
 
-/* Define if `sa_len' is member of `struct sockaddr'. */
+/* Define to 1 if `sa_len' is member of `struct sockaddr'. */
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
 
-/* Define if `f_fstypename' is member of `struct statfs'. */
+/* Define to 1 if `f_fstypename' is member of `struct statfs'. */
 #define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
 
+/* Define to 1 if `devid' is member of `struct umntrequest'. */
+/* #undef HAVE_STRUCT_UMNTREQUEST_DEVID */
+
 /* Define to 1 if you have the `svc_getreq' function. */
 #define HAVE_SVC_GETREQ 1
 
@@ -934,6 +1004,12 @@
 /* Define to 1 if you have the <sys/fstyp.h> header file. */
 /* #undef HAVE_SYS_FSTYP_H */
 
+/* Define to 1 if you have the <sys/fs/autofs.h> header file. */
+/* #undef HAVE_SYS_FS_AUTOFS_H */
+
+/* Define to 1 if you have the <sys/fs/autofs_prot.h> header file. */
+/* #undef HAVE_SYS_FS_AUTOFS_PROT_H */
+
 /* Define to 1 if you have the <sys/fs/cachefs_fs.h> header file. */
 /* #undef HAVE_SYS_FS_CACHEFS_FS_H */
 
@@ -967,6 +1043,9 @@
 /* Define to 1 if you have the <sys/fs/xfs_clnt.h> header file. */
 /* #undef HAVE_SYS_FS_XFS_CLNT_H */
 
+/* Define to 1 if you have the <sys/immu.h> header file. */
+/* #undef HAVE_SYS_IMMU_H */
+
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #define HAVE_SYS_IOCTL_H 1
 
@@ -1027,6 +1106,9 @@
 /* Define to 1 if you have the <sys/statfs.h> header file. */
 /* #undef HAVE_SYS_STATFS_H */
 
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#define HAVE_SYS_STATVFS_H 1
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -1069,6 +1151,9 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #define HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if you have the <tcpd.h> header file. */
+#define HAVE_TCPD_H 1
+
 /* Define to 1 if you have the <time.h> header file. */
 #define HAVE_TIME_H 1
 
@@ -1084,18 +1169,21 @@
 /* Define to 1 if you have the `ualarm' function. */
 #define HAVE_UALARM 1
 
-/* Define if `flags' is member of `ufs_args_t'. */
+/* Define to 1 if `flags' is member of `ufs_args_t'. */
 /* #undef HAVE_UFS_ARGS_T_FLAGS */
 
-/* Define if `fspec' is member of `ufs_args_t'. */
+/* Define to 1 if `fspec' is member of `ufs_args_t'. */
 #define HAVE_UFS_ARGS_T_FSPEC 1
 
-/* Define if `ufs_flags' is member of `ufs_args_t'. */
+/* Define to 1 if `ufs_flags' is member of `ufs_args_t'. */
 /* #undef HAVE_UFS_ARGS_T_UFS_FLAGS */
 
-/* Define if `ufs_pgthresh' is member of `ufs_args_t'. */
+/* Define to 1 if `ufs_pgthresh' is member of `ufs_args_t'. */
 /* #undef HAVE_UFS_ARGS_T_UFS_PGTHRESH */
 
+/* Define to 1 if you have the <ufs/ufs/extattr.h> header file. */
+#define HAVE_UFS_UFS_EXTATTR_H 1
+
 /* Define to 1 if you have the <ufs/ufs_mount.h> header file. */
 /* #undef HAVE_UFS_UFS_MOUNT_H */
 
@@ -1105,6 +1193,9 @@
 /* Define to 1 if you have the `umount' function. */
 /* #undef HAVE_UMOUNT */
 
+/* Define to 1 if you have the `umount2' function. */
+/* #undef HAVE_UMOUNT2 */
+
 /* Define to 1 if you have the `uname' function. */
 #define HAVE_UNAME 1
 
@@ -1118,7 +1209,7 @@
 /* #undef HAVE_UVMOUNT */
 
 /* Define to 1 if you have the <varargs.h> header file. */
-#define HAVE_VARARGS_H 1
+/* #undef HAVE_VARARGS_H */
 
 /* Define to 1 if you have the `vfork' function. */
 #define HAVE_VFORK 1
@@ -1207,9 +1298,6 @@
 /* Define to 1 if you have the `xdr_mountlist' function. */
 #define HAVE_XDR_MOUNTLIST 1
 
-/* Define to 1 if you have the `xdr_mountres3' function. */
-/* #undef HAVE_XDR_MOUNTRES3 */
-
 /* Define to 1 if you have the `xdr_name' function. */
 #define HAVE_XDR_NAME 1
 
@@ -1270,10 +1358,10 @@
 /* Define to 1 if you have the `xdr_writeargs' function. */
 #define HAVE_XDR_WRITEARGS 1
 
-/* Define if `flags' is member of `xfs_args_t'. */
+/* Define to 1 if `flags' is member of `xfs_args_t'. */
 /* #undef HAVE_XFS_ARGS_T_FLAGS */
 
-/* Define if `fspec' is member of `xfs_args_t'. */
+/* Define to 1 if `fspec' is member of `xfs_args_t'. */
 /* #undef HAVE_XFS_ARGS_T_FSPEC */
 
 /* Define to 1 if you have the `yp_all' function. */
@@ -1285,6 +1373,9 @@
 /* Define to 1 if you have the `_seterr_reply' function. */
 #define HAVE__SETERR_REPLY 1
 
+/* Define to 1 if you have the `__rpc_get_local_uid' function. */
+#define HAVE___RPC_GET_LOCAL_UID 1
+
 /* Define to 1 if you have the `__seterr_reply' function. */
 /* #undef HAVE___SETERR_REPLY */
 
@@ -1298,19 +1389,22 @@
 /* #define HOST_CPU "i386" */
 
 /* Define the header version of (linux) hosts (eg. 2.2.10) */
-/* #define HOST_HEADER_VERSION "5.2" */
+// #undef define HOST_HEADER_VERSION */
+
+/* Define name of host */
+/* #define HOST_NAME "trang.nuxi.org" */
 
 /* Define name and version of host machine (eg. solaris2.5.1) */
-/* #define HOST_OS "freebsd5.2" */
+/* #define HOST_OS "freebsd8.0" */
 
 /* Define only name of host machine OS (eg. solaris2) */
-/* #define HOST_OS_NAME "freebsd5" */
+/* #define HOST_OS_NAME "freebsd8" */
 
 /* Define only version of host machine (eg. 2.5.1) */
-/* #define HOST_OS_VERSION "5.2" */
+/* #define HOST_OS_VERSION "8.0" */
 
 /* Define name of host machine's vendor (eg. sun) */
-#define HOST_VENDOR "unknown"
+#define HOST_VENDOR "undermydesk"
 
 /* Ignore permission bits */
 /* #undef MNT2_CDFS_OPT_DEFPERM */
@@ -1342,6 +1436,12 @@
 /* 6-argument mount */
 /* #undef MNT2_GEN_OPT_DATA */
 
+/* Use a lazy unmount (detach) */
+/* #undef MNT2_GEN_OPT_DETACH */
+
+/* Use a forced unmount */
+#define MNT2_GEN_OPT_FORCE 0x80000
+
 /* old (4-argument) mount (compatibility) */
 /* #undef MNT2_GEN_OPT_FSS */
 
@@ -1367,7 +1467,7 @@
 /* #undef MNT2_GEN_OPT_NOCACHE */
 
 /* do not interpret special device files */
-#define MNT2_GEN_OPT_NODEV 0x10
+#define MNT2_GEN_OPT_NODEV 0x0
 
 /* no exec calls allowed */
 #define MNT2_GEN_OPT_NOEXEC 0x4
@@ -1414,9 +1514,6 @@
 /* Union mount */
 /* #undef MNT2_GEN_OPT_UNION */
 
-/* Use Readdirplus for NFSv3 */
-/* #undef MNT2_NFS_OPTS_RDIRPLUS */
-
 /* set max secs for dir attr cache */
 #define MNT2_NFS_OPT_ACDIRMAX 0x200000
 
@@ -1525,6 +1622,9 @@
 /* static pathconf kludge info */
 /* #undef MNT2_NFS_OPT_POSIX */
 
+/* Use local locking */
+/* #undef MNT2_NFS_OPT_PRIVATE */
+
 /* allow property list operations (ACLs over NFS) */
 /* #undef MNT2_NFS_OPT_PROPLIST */
 
@@ -1534,6 +1634,9 @@
 /* Do lookup with readdir (nqnfs) */
 /* #undef MNT2_NFS_OPT_RDIRALOOK */
 
+/* Use Readdirplus for NFSv3 */
+#define MNT2_NFS_OPT_RDIRPLUS 0x10000
+
 /* set read ahead */
 #define MNT2_NFS_OPT_READAHEAD 0x2000
 
@@ -1597,6 +1700,15 @@
 /* 32<->64 dir cookie translation */
 /* #undef MNT2_NFS_OPT_XLATECOOKIE */
 
+/* Force Win95 long names */
+#define MNT2_PCFS_OPT_LONGNAME 0x2
+
+/* Completely ignore Win95 entries */
+#define MNT2_PCFS_OPT_NOWIN95 0x4
+
+/* Force old DOS short names only */
+#define MNT2_PCFS_OPT_SHORTNAME 0x1
+
 /* Name of mount table file name */
 /* #undef MNTTAB_FILE_NAME */
 
@@ -1654,6 +1766,9 @@
 /* Mount Table option string: Local locking (no lock manager) */
 /* #undef MNTTAB_OPT_LLOCK */
 
+/* Force Win95 long names */
+/* #undef MNTTAB_OPT_LONGNAME */
+
 /* Mount Table option string: Automount map */
 /* #undef MNTTAB_OPT_MAP */
 
@@ -1690,6 +1805,9 @@
 /* Mount Table option string: Set uid not allowed */
 /* #undef MNTTAB_OPT_NOSUID */
 
+/* Completely ignore Win95 entries */
+/* #undef MNTTAB_OPT_NOWIN95 */
+
 /* Mount Table option string: action to taken on error */
 /* #undef MNTTAB_OPT_ONERROR */
 
@@ -1702,6 +1820,9 @@
 /* Mount Table option string: Get static pathconf for mount */
 /* #undef MNTTAB_OPT_POSIX */
 
+/* Mount Table option string: Use local locking */
+/* #undef MNTTAB_OPT_PRIVATE */
+
 /* Mount Table option string: support property lists (ACLs) */
 /* #undef MNTTAB_OPT_PROPLIST */
 
@@ -1735,6 +1856,9 @@
 /* Mount Table option string: Secure (AUTH_DES) mounting */
 /* #undef MNTTAB_OPT_SECURE */
 
+/* Force old DOS short names only */
+/* #undef MNTTAB_OPT_SHORTNAME */
+
 /* Mount Table option string: Soft mount */
 /* #undef MNTTAB_OPT_SOFT */
 
@@ -1777,6 +1901,9 @@
 /* Mount-table entry name for EFS filesystem (irix) */
 /* #undef MNTTAB_TYPE_EFS */
 
+/* Mount-table entry name for FFS filesystem */
+/* #undef MNTTAB_TYPE_FFS */
+
 /* Mount-table entry name for LOFS filesystem */
 /* #undef MNTTAB_TYPE_LOFS */
 
@@ -1831,6 +1958,9 @@
 /* Mount(2) type/name for EFS filesystem (irix) */
 /* #undef MOUNT_TYPE_EFS */
 
+/* Mount(2) type/name for FFS filesystem */
+/* #undef MOUNT_TYPE_FFS */
+
 /* Mount(2) type/name for IGNORE filesystem (not real just ignore for df) */
 #define MOUNT_TYPE_IGNORE MNT_IGNORE
 
@@ -1877,6 +2007,10 @@
 /* Type of the mount-type field in the mount() system call */
 #define MTYPE_TYPE char *
 
+/* does libwrap expect caller to define the variables allow_severity and
+   deny_severity */
+/* #undef NEED_LIBWRAP_SEVERITY_VARIABLES */
+
 /* Defined to the header file containing ndbm-compatible definitions */
 #define NEW_DBM_H <ndbm.h>
 
@@ -1890,19 +2024,19 @@
 #define PACKAGE "am-utils"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "am-utils@am-utils.org"
+#define PACKAGE_BUGREPORT "https://bugzilla.am-utils.org/ or am-utils@am-utils.org"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "am-utils"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "am-utils 6.0.10-20040513"
+#define PACKAGE_STRING "am-utils 6.1.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "am-utils"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.0.10-20040513"
+#define PACKAGE_VERSION "6.1.5"
 
 /* Type of the 6th argument to recvfrom() */
 #define RECVFROM_FROMLEN_TYPE int
@@ -1916,14 +2050,6 @@
 /* Define to 1 if the `setpgrp' function takes no argument. */
 /* #undef SETPGRP_VOID */
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 /* #undef STAT_MACROS_BROKEN */
 
@@ -1939,6 +2065,9 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 /* #undef TM_IN_SYS_TIME */
 
+/* Define user name */
+/* #define USER_NAME "obrien" */
+
 /* define if must NOT use NFS "noconn" option */
 #define USE_CONNECTED_NFS_SOCKETS 1
 
@@ -1946,7 +2075,7 @@
 /* #undef USE_UNCONNECTED_NFS_SOCKETS */
 
 /* Version number of package */
-#define VERSION "6.0.10-20040513"
+#define VERSION "6.1.5"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -1993,9 +2122,11 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define a type for the lofs_args structure */
 /* #undef lofs_args_t */
@@ -2015,9 +2146,15 @@
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef pid_t */
 
+/* Check if pte_t is defined in <sys/immu.h> */
+/* #undef pte_t */
+
 /* Define a type for the rfs_args structure */
 /* #undef rfs_args_t */
 
+/* Check if rpcvers_t is defined in <rpc/types.h> */
+/* #undef rpcvers_t */
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
 
@@ -2066,4 +2203,3 @@
  */
 
 /* End of am-utils-6.x config.h file */
-