diff options
| author | christos <christos@NetBSD.org> | 2006-02-05 16:29:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2006-02-05 16:29:00 +0000 |
| commit | a04e4149929a53df4d53daee42d66faacbd0d42c (patch) | |
| tree | 0187f96a975d96b30c90c35859b41505ede3b201 /usr.sbin/amd/include | |
| parent | a58881f52e7c05fcb88c53c9f4809a0b722afeda (diff) | |
update to 6.1.3; bump library version
Diffstat (limited to 'usr.sbin/amd/include')
| -rw-r--r-- | usr.sbin/amd/include/amu_autofs_prot.h | 48 | ||||
| -rw-r--r-- | usr.sbin/amd/include/amu_nfs_prot.h | 3 | ||||
| -rw-r--r-- | usr.sbin/amd/include/config.h | 93 |
3 files changed, 113 insertions, 31 deletions
diff --git a/usr.sbin/amd/include/amu_autofs_prot.h b/usr.sbin/amd/include/amu_autofs_prot.h index ddd117f6ed4..79c2ec3bbf8 100644 --- a/usr.sbin/amd/include/amu_autofs_prot.h +++ b/usr.sbin/amd/include/amu_autofs_prot.h @@ -1,4 +1,52 @@ /* + * Copyright (c) 1999-2003 Ion Badulescu + * Copyright (c) 1997-2005 Erez Zadok + * Copyright (c) 1990 Jan-Simon Pendry + * Copyright (c) 1990 Imperial College of Science, Technology & Medicine + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Jan-Simon Pendry at Imperial College, London. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * + * File: am-utils/conf/autofs/autofs_default.h + * + */ + +/* + * Default automounter filesystem + */ + +/* * Autofs is not supported on this platform, * so disable it if it gets detected. */ diff --git a/usr.sbin/amd/include/amu_nfs_prot.h b/usr.sbin/amd/include/amu_nfs_prot.h index 396e723fa8b..01e19f47cb9 100644 --- a/usr.sbin/amd/include/amu_nfs_prot.h +++ b/usr.sbin/amd/include/amu_nfs_prot.h @@ -79,6 +79,9 @@ typedef int (*ypall_callback_fxn_t)(u_long, char *, int, char *, int, void *); typedef int (*ypall_callback_fxn_t)(int, char *, int, char *, int, char *); #endif /* DEFINED_YPALL_CALLBACK_FXN_T */ +#ifdef HAVE_STATVFS +# define statfs statvfs +#endif /* HAVE_STATVFS */ /* * MACROS: diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index 08a02a04849..a7eb4745ba2 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -1,5 +1,3 @@ -/* $NetBSD: config.h,v 1.39 2005/09/28 12:41:49 rpaulo Exp $ */ - /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -22,9 +20,9 @@ /* Type of the 5rd argument to authunix_create() */ #define AUTH_CREATE_GIDLIST_TYPE gid_t -#ifndef __NetBSD__ /* Define configuration date */ -#define CONFIG_DATE "Tue Sep 20 14:58:12 WEST 2005" +#ifndef __NetBSD__ +#define CONFIG_DATE "Sun Feb 5 10:50:02 EST 2006" #endif /* Turn off general debugging by default */ @@ -110,6 +108,12 @@ /* Define to 1 if you have the `bzero' function. */ #define HAVE_BZERO 1 +/* System supports C99-style variable-length argument macros */ +#ifndef __NetBSD__ +/* Grr VAX */ +#define HAVE_C99_VARARGS_MACROS 1 +#endif + /* Define to 1 if `flags' is member of `cdfs_args_t'. */ #define HAVE_CDFS_ARGS_T_FLAGS 1 @@ -201,6 +205,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 @@ -213,6 +220,9 @@ /* 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 @@ -264,6 +274,9 @@ /* 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 @@ -315,6 +328,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 */ @@ -342,11 +358,8 @@ /* Define if have TFS filesystem */ /* #undef HAVE_FS_TFS */ -#ifdef notyet -/* not yet implemented */ /* Define if have TMPFS filesystem */ #define HAVE_FS_TMPFS 1 -#endif /* Define if have UFS filesystem */ #define HAVE_FS_UFS 1 @@ -360,6 +373,9 @@ /* Define if have XFS filesystem (irix) */ /* #undef HAVE_FS_XFS */ +/* 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 */ @@ -874,6 +890,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 @@ -1024,6 +1046,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 @@ -1084,6 +1109,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 @@ -1367,19 +1395,19 @@ #define HOST_CPU "i386" /* Define the header version of (linux) hosts (eg. 2.2.10) */ -#define HOST_HEADER_VERSION "3.99.9" +#define HOST_HEADER_VERSION "3.99.15" /* Define name of host */ -#define HOST_NAME "proton.internal.fnop.net" +#define HOST_NAME "quasar.astron.com" /* Define name and version of host machine (eg. solaris2.5.1) */ -#define HOST_OS "netbsd3.99.9" +#define HOST_OS "netbsd3.99.15" /* Define only name of host machine OS (eg. solaris2) */ #define HOST_OS_NAME "netbsd" /* Define only version of host machine (eg. 2.5.1) */ -#define HOST_OS_VERSION "3.99.9" +#define HOST_OS_VERSION "3.99.15" /* Define name of host machine's vendor (eg. sun) */ #define HOST_VENDOR "unknown" @@ -1575,7 +1603,7 @@ #define MNT2_NFS_OPT_NFSV3 0x200 /* don't cache attributes */ -#define MNT2_NFS_OPT_NOAC 0x80000 +#define MNT2_NFS_OPT_NOAC 0x80000 /* Don't Connect the socket */ #define MNT2_NFS_OPT_NOCONN 0x80 @@ -1854,7 +1882,7 @@ /* #undef MNTTAB_TYPE_CACHEFS */ /* Mount-table entry name for CDFS filesystem */ -#define MNTTAB_TYPE_CDFS "cdfs" +#define MNTTAB_TYPE_CDFS "cd9660" /* Mount-table entry name for CFS (crypto) filesystem */ /* #undef MNTTAB_TYPE_CFS */ @@ -1862,6 +1890,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 */ @@ -1872,31 +1903,28 @@ #define MNTTAB_TYPE_NFS "nfs" /* Mount-table entry name for NFS3 filesystem */ -#define MNTTAB_TYPE_NFS3 "nfs3" +#define MNTTAB_TYPE_NFS3 "nfs" /* Mount-table entry name for NULLFS (loopback on bsd44) filesystem */ -#define MNTTAB_TYPE_NULLFS "nullfs" +#define MNTTAB_TYPE_NULLFS "null" /* Mount-table entry name for PCFS filesystem */ -#define MNTTAB_TYPE_PCFS "pcfs" +#define MNTTAB_TYPE_PCFS "msdos" /* Mount-table entry name for TFS filesystem */ /* #undef MNTTAB_TYPE_TFS */ -#ifdef notyet -/* not yet implemented */ /* Mount-table entry name for TMPFS filesystem */ #define MNTTAB_TYPE_TMPFS "tmpfs" -#endif /* Mount-table entry name for UFS filesystem */ -#define MNTTAB_TYPE_UFS "ufs" +#define MNTTAB_TYPE_UFS "ffs" /* Mount-table entry name for UMAPFS (uid/gid mapping) filesystem */ -#define MNTTAB_TYPE_UMAPFS "umapfs" +#define MNTTAB_TYPE_UMAPFS "umap" /* Mount-table entry name for UNIONFS filesystem */ -#define MNTTAB_TYPE_UNIONFS "unionfs" +#define MNTTAB_TYPE_UNIONFS "union" /* Mount-table entry name for XFS filesystem (irix) */ /* #undef MNTTAB_TYPE_XFS */ @@ -1919,6 +1947,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 @@ -1944,14 +1975,11 @@ /* Mount(2) type/name for TFS filesystem */ /* #undef MOUNT_TYPE_TFS */ -#ifdef notyet -/* not yet implemented */ /* Mount(2) type/name for TMPFS filesystem */ #define MOUNT_TYPE_TMPFS MOUNT_TMPFS -#endif /* Mount(2) type/name for UFS filesystem */ -#define MOUNT_TYPE_UFS MOUNT_UFS +#define MOUNT_TYPE_UFS MOUNT_FFS /* Mount(2) type/name for UMAPFS (uid/gid mapping) filesystem */ #define MOUNT_TYPE_UMAPFS MOUNT_UMAP @@ -1991,13 +2019,13 @@ #define PACKAGE_NAME "am-utils" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "am-utils 6.1.2.1" +#define PACKAGE_STRING "am-utils 6.1.3" /* 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.1.2.1" +#define PACKAGE_VERSION "6.1.3" /* Type of the 6th argument to recvfrom() */ #define RECVFROM_FROMLEN_TYPE int @@ -2026,9 +2054,9 @@ /* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ -#ifndef __NetBSD__ /* Define user name */ -#define USER_NAME "rpaulo" +#ifndef __NetBSD__ +#define USER_NAME "christos" #endif /* define if must NOT use NFS "noconn" option */ @@ -2038,7 +2066,7 @@ /* #undef USE_UNCONNECTED_NFS_SOCKETS */ /* Version number of package */ -#define VERSION "6.1.2.1" +#define VERSION "6.1.3" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ @@ -2109,6 +2137,9 @@ /* 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 */ |
