From owner-cvs-src@FreeBSD.ORG Tue Sep 2 08:42:59 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1560016A4BF; Tue, 2 Sep 2003 08:42:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 689ED43FE3; Tue, 2 Sep 2003 08:42:58 -0700 (PDT) (envelope-from mbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82Fgw0U078605; Tue, 2 Sep 2003 08:42:58 -0700 (PDT) (envelope-from mbr@repoman.freebsd.org) Received: (from mbr@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82Fgwlf078604; Tue, 2 Sep 2003 08:42:58 -0700 (PDT) Message-Id: <200309021542.h82Fgwlf078604@repoman.freebsd.org> From: Martin Blapp Date: Tue, 2 Sep 2003 08:42:58 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/contrib/amd/amd amd.8 amd.c amq_subr.c get_args.c ops_autofs.c srvr_nfs.c src/contrib/amd/amq amq.8 amq.c pawd.1 nfs_prot_freebsd3.h src/contrib/amd/doc stamp-vti version.texi ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2003 15:42:59 -0000 mbr 2003/09/02 08:42:57 PDT FreeBSD src repository Modified files: contrib/amd/amd amd.8 amd.c amq_subr.c get_args.c srvr_nfs.c contrib/amd/amq amq.8 amq.c pawd.1 contrib/amd/conf/nfs_prot nfs_prot_freebsd2.h nfs_prot_freebsd3.h contrib/amd/fixmount fixmount.8 fixmount.c contrib/amd/fsinfo fsinfo.8 fsinfo.c contrib/amd/hlfsd hlfsd.8 hlfsd.c hlfsd.h homedir.c contrib/amd/include am_defs.h contrib/amd/libamu mount_fs.c contrib/amd/mk-amd-map mk-amd-map.8 mk-amd-map.c contrib/amd/scripts amd.conf.5 contrib/amd/wire-test wire-test.8 wire-test.c Removed files: contrib/amd/amd ops_autofs.c contrib/amd/doc stamp-vti version.texi Log: Resolve conflicts. Revision Changes Path 1.18 +3 -3 src/contrib/amd/amd/amd.8 1.9 +3 -3 src/contrib/amd/amd/amd.c 1.7 +3 -3 src/contrib/amd/amd/amq_subr.c 1.7 +13 -5 src/contrib/amd/amd/get_args.c 1.2 +0 -1275 src/contrib/amd/amd/ops_autofs.c (dead) 1.6 +32 -19 src/contrib/amd/amd/srvr_nfs.c 1.10 +2 -1 src/contrib/amd/amq/amq.8 1.8 +4 -4 src/contrib/amd/amq/amq.c 1.5 +2 -2 src/contrib/amd/amq/pawd.1 1.6 +3 -3 src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h 1.12 +10 -4 src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h 1.2 +0 -3 src/contrib/amd/doc/stamp-vti (dead) 1.2 +0 -3 src/contrib/amd/doc/version.texi (dead) 1.9 +2 -2 src/contrib/amd/fixmount/fixmount.8 1.7 +3 -3 src/contrib/amd/fixmount/fixmount.c 1.8 +6 -5 src/contrib/amd/fsinfo/fsinfo.8 1.5 +4 -3 src/contrib/amd/fsinfo/fsinfo.c 1.12 +3 -3 src/contrib/amd/hlfsd/hlfsd.8 1.7 +18 -27 src/contrib/amd/hlfsd/hlfsd.c 1.3 +4 -4 src/contrib/amd/hlfsd/hlfsd.h 1.6 +97 -26 src/contrib/amd/hlfsd/homedir.c 1.13 +7 -21 src/contrib/amd/include/am_defs.h 1.6 +67 -78 src/contrib/amd/libamu/mount_fs.c 1.5 +3 -3 src/contrib/amd/mk-amd-map/mk-amd-map.8 1.9 +19 -4 src/contrib/amd/mk-amd-map/mk-amd-map.c 1.14 +138 -122 src/contrib/amd/scripts/amd.conf.5 1.4 +2 -2 src/contrib/amd/wire-test/wire-test.8 1.7 +3 -3 src/contrib/amd/wire-test/wire-test.c