[src/trunk]: src/usr.sbin/amd Adjust to new am-utils.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/amd Adjust to new am-utils.
From: christos <christos%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 17:08:46 +0000
details:   https://anonhg.NetBSD.org/src/rev/e842b46d6511
branches:  trunk
changeset: 580419:e842b46d6511
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 23 18:41:43 2005 +0000

description:
Adjust to new am-utils.

diffstat:

 usr.sbin/amd/amd/Makefile           |    6 +-
 usr.sbin/amd/include/amu_nfs_prot.h |    4 +-
 usr.sbin/amd/include/aux_conf.h     |    2 +
 usr.sbin/amd/include/config.h       |  169 +++++++++++++++++++++--------------
 4 files changed, 106 insertions(+), 75 deletions(-)

diffs (truncated from 551 to 300 lines):

diff -r 3336ace9e1d0 -r e842b46d6511 usr.sbin/amd/amd/Makefile
--- a/usr.sbin/amd/amd/Makefile Sat Apr 23 18:41:04 2005 +0000
+++ b/usr.sbin/amd/amd/Makefile Sat Apr 23 18:41:43 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2004/11/28 00:07:15 lukem Exp $
+#      $NetBSD: Makefile,v 1.26 2005/04/23 18:41:43 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -9,9 +9,9 @@
 
 SRCS=  am_ops.c amd.c amfs_auto.c amfs_generic.c amfs_direct.c \
        amfs_error.c amfs_host.c \
-       amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c amfs_nfsx.c \
+       amfs_link.c amfs_linkx.c amfs_nfsl.c amfs_nfsx.c \
        amfs_program.c amfs_root.c amfs_toplvl.c amfs_union.c amq_subr.c \
-       amq_svc.c autil.c clock.c conf.c get_args.c info_file.c \
+       amq_svc.c autil.c clock.c conf.c get_args.c info_exec.c info_file.c \
        info_ndbm.c info_passwd.c \
        info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c \
        nfs_subr.c ops_cdfs.c \
diff -r 3336ace9e1d0 -r e842b46d6511 usr.sbin/amd/include/amu_nfs_prot.h
--- a/usr.sbin/amd/include/amu_nfs_prot.h       Sat Apr 23 18:41:04 2005 +0000
+++ b/usr.sbin/amd/include/amu_nfs_prot.h       Sat Apr 23 18:41:43 2005 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2004 Erez Zadok
+ * 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.
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: amu_nfs_prot.h,v 1.14 2004/11/27 01:39:23 christos Exp $
+ * Id: nfs_prot_netbsd1_4.h,v 1.12 2005/01/03 20:56:45 ezk Exp 
  *
  */
 
diff -r 3336ace9e1d0 -r e842b46d6511 usr.sbin/amd/include/aux_conf.h
--- a/usr.sbin/amd/include/aux_conf.h   Sat Apr 23 18:41:04 2005 +0000
+++ b/usr.sbin/amd/include/aux_conf.h   Sat Apr 23 18:41:43 2005 +0000
@@ -27,6 +27,8 @@
  */
 #define UNMOUNT_TRAP(mnt)      unmount(mnt->mnt_dir)
 /* End of replaced UNMOUNT_TRAP macro definition */
+/* umount(8) executable path, for type:=program */
+#define UNMOUNT_PROGRAM                "/sbin/umount"
 
 /*
  * The next line is a literal inclusion of a file which includes a
diff -r 3336ace9e1d0 -r e842b46d6511 usr.sbin/amd/include/config.h
--- a/usr.sbin/amd/include/config.h     Sat Apr 23 18:41:04 2005 +0000
+++ b/usr.sbin/amd/include/config.h     Sat Apr 23 18:41:43 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.33 2004/11/27 01:39:24 christos Exp $ */
+/* $NetBSD: config.h,v 1.34 2005/04/23 18:41:43 christos Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
@@ -24,7 +24,7 @@
 
 #ifndef __NetBSD__
 /* Define configuration date */
-#define CONFIG_DATE "Fri Nov 26 18:49:49 EST 2004"
+#define CONFIG_DATE "Sat Apr 23 13:37:24 EDT 2005"
 #endif
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
@@ -41,6 +41,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 "none"
+
 /* 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
@@ -67,9 +71,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
 
@@ -100,7 +101,7 @@
 /* Define to 1 if you have the <assert.h> header file. */
 #define HAVE_ASSERT_H 1
 
-/* Define if `addr' is member of `autofs_args_t'. */
+/* 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() */
@@ -124,22 +125,22 @@
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
 
-/* Define if `flags' is member of `cdfs_args_t'. */
+/* 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'. */
 /* #undef HAVE_CDFS_ARGS_T_SSECTOR */
 
 /* Define to 1 if you have the <cdfs/cdfsmount.h> header file. */
@@ -177,7 +178,6 @@
 
 /* Define to 1 if you have the <db1/ndbm.h> header file. */
 /* #undef HAVE_DB1_NDBM_H */
-#define NEW_DBM_H <ndbm.h>
 
 /* Define to 1 if you have the `dbm_open' function. */
 #define HAVE_DBM_OPEN 1
@@ -192,10 +192,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. */
@@ -261,6 +261,9 @@
 /* does extern definition for strdup() exist? */
 #define HAVE_EXTERN_STRDUP 1
 
+/* does extern definition for strlcpy() exist? */
+#define HAVE_EXTERN_STRLCPY 1
+
 /* does extern definition for strstr() exist? */
 #define HAVE_EXTERN_STRSTR 1
 
@@ -285,7 +288,7 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if `fds_bits' is member of `fd_set'. */
+/* 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. */
@@ -408,8 +411,11 @@
 /* Define to 1 if you have the `hasmntopt' function. */
 /* #undef HAVE_HASMNTOPT */
 
+#ifdef notdef
+/* set by a command line switch */
 /* Define to 1 if you have the <hesiod.h> header file. */
 #define HAVE_HESIOD_H 1
+#endif
 
 /* Define to 1 if you have the `hesiod_init' function. */
 #define HAVE_HESIOD_INIT 1
@@ -426,6 +432,9 @@
 /* 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
 
@@ -465,6 +474,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 */
 
@@ -477,6 +489,9 @@
 /* does libwrap exist? */
 /* #undef HAVE_LIBWRAP */
 
+/* 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 */
 
@@ -510,20 +525,23 @@
 /* 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. */
 #define HAVE_MALLOC_H 1
 
 /* 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
 
-#ifdef notdef
-/* set by a command line switch */
 /* Define if have HESIOD maps */
 #define HAVE_MAP_HESIOD 1
-#endif
 
 /* Define if have LDAP maps */
 /* #undef HAVE_MAP_LDAP */
@@ -531,11 +549,8 @@
 /* Define if have NDBM maps */
 #define HAVE_MAP_NDBM 1
 
-#ifdef notdef
-/* set by a command line switch */
 /* Define if have NIS maps */
 #define HAVE_MAP_NIS 1
-#endif
 
 /* Define if have NIS+ maps */
 /* #undef HAVE_MAP_NISPLUS */
@@ -576,13 +591,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 *" ? */
@@ -594,7 +609,7 @@
 /* Define to 1 if you have the `mount' function. */
 #define HAVE_MOUNT 1
 
-/* Define if `optptr' is member of `mounta'. */
+/* Define to 1 if `optptr' is member of `mounta'. */
 /* #undef HAVE_MOUNTA_OPTPTR */
 
 /* Define to 1 if you have the `mountsyscall' function. */
@@ -642,37 +657,37 @@
 /* Define to 1 if you have the <nfsclient/nfsargs.h> header file. */
 /* #undef HAVE_NFSCLIENT_NFSARGS_H */
 
-/* Define if `acdirmin' is member of `nfs_args_t'. */
+/* Define to 1 if `acdirmin' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_ACDIRMIN */
 
-/* Define if `acregmin' is member of `nfs_args_t'. */
+/* Define to 1 if `acregmin' is member of `nfs_args_t'. */
 /* #undef HAVE_NFS_ARGS_T_ACREGMIN */
 
-/* Define if `bsize' is member of `nfs_args_t'. */
+/* 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 */
Prev by Date: [src/trunk]: src/dist/am-utils from ftp.am-utils.org
Next by Date: [src/trunk]: src/dist/am-utils/amq Don't take into account zero length mountp...
Previous by Thread: [src/trunk]: src/dist/am-utils from ftp.am-utils.org
Next by Thread: [src/trunk]: src/dist/am-utils/amq Don't take into account zero length mountp...
Indexes:
Home | Main Index | Thread Index | Old Index