From e925d4a747df4a349c2baac436a71f606945baa5 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Wed, 28 Jan 2015 22:55:06 +0000 Subject: [PATCH] amd: flatten the tree --- contrib/amd/AUTHORS => AUTHORS | 0 contrib/amd/BUGS => BUGS | 0 contrib/amd/COPYING => COPYING | 0 contrib/amd/ChangeLog => ChangeLog | 0 contrib/amd/FAQ => FAQ | 0 contrib/amd/INSTALL => INSTALL | 0 contrib/amd/MIRRORS.html => MIRRORS.html | 0 contrib/amd/MIRRORS.txt => MIRRORS.txt | 0 contrib/amd/NEWS => NEWS | 0 contrib/amd/README => README | 0 contrib/amd/README.attrcache => README.attrcache | 0 contrib/amd/README.ldap => README.ldap | 0 contrib/amd/README.y2k => README.y2k | 0 contrib/amd/TODO => TODO | 0 {contrib/amd/amd => amd}/am_ops.c | 0 {contrib/amd/amd => amd}/amd.8 | 0 {contrib/amd/amd => amd}/amd.c | 0 {contrib/amd/amd => amd}/amd.h | 0 {contrib/amd/amd => amd}/amfs_auto.c | 0 {contrib/amd/amd => amd}/amfs_direct.c | 0 {contrib/amd/amd => amd}/amfs_error.c | 0 {contrib/amd/amd => amd}/amfs_generic.c | 0 {contrib/amd/amd => amd}/amfs_host.c | 0 {contrib/amd/amd => amd}/amfs_link.c | 0 {contrib/amd/amd => amd}/amfs_linkx.c | 0 {contrib/amd/amd => amd}/amfs_nfsl.c | 0 {contrib/amd/amd => amd}/amfs_nfsx.c | 0 {contrib/amd/amd => amd}/amfs_program.c | 0 {contrib/amd/amd => amd}/amfs_root.c | 0 {contrib/amd/amd => amd}/amfs_toplvl.c | 0 {contrib/amd/amd => amd}/amfs_union.c | 0 {contrib/amd/amd => amd}/amq_subr.c | 0 {contrib/amd/amd => amd}/amq_svc.c | 0 {contrib/amd/amd => amd}/autil.c | 0 {contrib/amd/amd => amd}/clock.c | 0 {contrib/amd/amd => amd}/conf.c | 0 {contrib/amd/amd => amd}/conf_parse.y | 0 {contrib/amd/amd => amd}/conf_tok.l | 0 {contrib/amd/amd => amd}/get_args.c | 0 {contrib/amd/amd => amd}/info_exec.c | 0 {contrib/amd/amd => amd}/info_file.c | 0 {contrib/amd/amd => amd}/info_hesiod.c | 0 {contrib/amd/amd => amd}/info_ldap.c | 0 {contrib/amd/amd => amd}/info_ndbm.c | 0 {contrib/amd/amd => amd}/info_nis.c | 0 {contrib/amd/amd => amd}/info_nisplus.c | 0 {contrib/amd/amd => amd}/info_passwd.c | 0 {contrib/amd/amd => amd}/info_union.c | 0 {contrib/amd/amd => amd}/map.c | 0 {contrib/amd/amd => amd}/mapc.c | 0 {contrib/amd/amd => amd}/mntfs.c | 0 {contrib/amd/amd => amd}/nfs_prot_svc.c | 0 {contrib/amd/amd => amd}/nfs_start.c | 0 {contrib/amd/amd => amd}/nfs_subr.c | 0 {contrib/amd/amd => amd}/ops_TEMPLATE.c | 0 {contrib/amd/amd => amd}/ops_autofs.c | 0 {contrib/amd/amd => amd}/ops_cachefs.c | 0 {contrib/amd/amd => amd}/ops_cdfs.c | 0 {contrib/amd/amd => amd}/ops_efs.c | 0 {contrib/amd/amd => amd}/ops_lofs.c | 0 {contrib/amd/amd => amd}/ops_mfs.c | 0 {contrib/amd/amd => amd}/ops_nfs.c | 0 {contrib/amd/amd => amd}/ops_nfs3.c | 0 {contrib/amd/amd => amd}/ops_nullfs.c | 0 {contrib/amd/amd => amd}/ops_pcfs.c | 0 {contrib/amd/amd => amd}/ops_tfs.c | 0 {contrib/amd/amd => amd}/ops_tmpfs.c | 0 {contrib/amd/amd => amd}/ops_ufs.c | 0 {contrib/amd/amd => amd}/ops_umapfs.c | 0 {contrib/amd/amd => amd}/ops_unionfs.c | 0 {contrib/amd/amd => amd}/ops_xfs.c | 0 {contrib/amd/amd => amd}/opts.c | 0 {contrib/amd/amd => amd}/readdir.c | 0 {contrib/amd/amd => amd}/restart.c | 0 {contrib/amd/amd => amd}/rpc_fwd.c | 0 {contrib/amd/amd => amd}/sched.c | 0 {contrib/amd/amd => amd}/srvr_amfs_auto.c | 0 {contrib/amd/amd => amd}/srvr_nfs.c | 0 {contrib/amd/amq => amq}/amq.8 | 0 {contrib/amd/amq => amq}/amq.c | 0 {contrib/amd/amq => amq}/amq.h | 0 {contrib/amd/amq => amq}/amq_clnt.c | 0 {contrib/amd/amq => amq}/amq_xdr.c | 0 {contrib/amd/amq => amq}/pawd.1 | 0 {contrib/amd/amq => amq}/pawd.c | 0 contrib/amd/aux_conf.h.in => aux_conf.h.in | 0 contrib/amd/bootstrap => bootstrap | 0 {contrib/amd/conf => conf}/checkmount/checkmount_bsd44.c | 0 {contrib/amd/conf => conf}/fh_dref/fh_dref_freebsd22.h | 0 {contrib/amd/conf => conf}/hn_dref/hn_dref_default.h | 0 {contrib/amd/conf => conf}/mount/mount_default.c | 0 {contrib/amd/conf => conf}/mount/mount_freebsd3.c | 0 {contrib/amd/conf => conf}/mtab/mtab_bsd.c | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_aix5_1.h | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_darwin.h | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_freebsd2.h | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_freebsd3.h | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_osf5.h | 0 {contrib/amd/conf => conf}/nfs_prot/nfs_prot_sunos5_8.h | 0 {contrib/amd/conf => conf}/sa_dref/sa_dref_bsd44.h | 0 {contrib/amd/conf => conf}/transp/transp_sockets.c | 0 {contrib/amd/conf => conf}/trap/trap_default.h | 0 {contrib/amd/conf => conf}/trap/trap_freebsd3.h | 0 {contrib/amd/conf => conf}/umount/umount_bsd44.c | 0 contrib/amd/cvs-server.txt => cvs-server.txt | 0 {contrib/amd/doc => doc}/am-utils.texi | 0 {contrib/amd/doc => doc}/stamp-vti | 0 {contrib/amd/doc => doc}/texinfo.tex | 0 {contrib/amd/doc => doc}/version.texi | 0 {contrib/amd/fixmount => fixmount}/fixmount.8 | 0 {contrib/amd/fixmount => fixmount}/fixmount.c | 0 {contrib/amd/fsinfo => fsinfo}/fsi_analyze.c | 0 {contrib/amd/fsinfo => fsinfo}/fsi_data.h | 0 {contrib/amd/fsinfo => fsinfo}/fsi_dict.c | 0 {contrib/amd/fsinfo => fsinfo}/fsi_gram.y | 0 {contrib/amd/fsinfo => fsinfo}/fsi_lex.l | 0 {contrib/amd/fsinfo => fsinfo}/fsi_util.c | 0 {contrib/amd/fsinfo => fsinfo}/fsinfo.8 | 0 {contrib/amd/fsinfo => fsinfo}/fsinfo.c | 0 {contrib/amd/fsinfo => fsinfo}/fsinfo.h | 0 {contrib/amd/fsinfo => fsinfo}/wr_atab.c | 0 {contrib/amd/fsinfo => fsinfo}/wr_bparam.c | 0 {contrib/amd/fsinfo => fsinfo}/wr_dumpset.c | 0 {contrib/amd/fsinfo => fsinfo}/wr_exportfs.c | 0 {contrib/amd/fsinfo => fsinfo}/wr_fstab.c | 0 {contrib/amd/hlfsd => hlfsd}/hlfsd.8 | 0 {contrib/amd/hlfsd => hlfsd}/hlfsd.c | 0 {contrib/amd/hlfsd => hlfsd}/hlfsd.h | 0 {contrib/amd/hlfsd => hlfsd}/homedir.c | 0 {contrib/amd/hlfsd => hlfsd}/nfs_prot_svc.c | 0 {contrib/amd/hlfsd => hlfsd}/stubs.c | 0 {contrib/amd/include => include}/am_compat.h | 0 {contrib/amd/include => include}/am_defs.h | 0 {contrib/amd/include => include}/am_utils.h | 0 {contrib/amd/include => include}/am_xdr_func.h | 0 {contrib/amd/include => include}/amq_defs.h | 0 {contrib/amd/include => include}/mount_headers1.h | 0 {contrib/amd/include => include}/mount_headers2.h | 0 contrib/amd/ldap-id.ms => ldap-id.ms | 0 contrib/amd/ldap-id.txt => ldap-id.txt | 0 contrib/amd/ldap.schema => ldap.schema | 0 {contrib/amd/libamu => libamu}/alloca.c | 0 {contrib/amd/libamu => libamu}/amu.h | 0 {contrib/amd/libamu => libamu}/clnt_sperrno.c | 0 {contrib/amd/libamu => libamu}/hasmntopt.c | 0 {contrib/amd/libamu => libamu}/misc_rpc.c | 0 {contrib/amd/libamu => libamu}/mount_fs.c | 0 {contrib/amd/libamu => libamu}/mtab.c | 0 {contrib/amd/libamu => libamu}/nfs_prot_xdr.c | 0 {contrib/amd/libamu => libamu}/strerror.c | 0 {contrib/amd/libamu => libamu}/strutil.c | 0 {contrib/amd/libamu => libamu}/wire.c | 0 {contrib/amd/libamu => libamu}/xdr_func.c | 0 {contrib/amd/libamu => libamu}/xutil.c | 0 {contrib/amd/mk-amd-map => mk-amd-map}/mk-amd-map.8 | 0 {contrib/amd/mk-amd-map => mk-amd-map}/mk-amd-map.c | 0 {contrib/amd/scripts => scripts}/Makefile.am | 0 {contrib/amd/scripts => scripts}/Makefile.in | 0 {contrib/amd/scripts => scripts}/am-eject.in | 0 {contrib/amd/scripts => scripts}/amd.conf-sample | 0 {contrib/amd/scripts => scripts}/amd.conf.5 | 0 {contrib/amd/scripts => scripts}/amd2ldif.in | 0 {contrib/amd/scripts => scripts}/amd2sun.in | 0 {contrib/amd/scripts => scripts}/automount2amd.8 | 0 {contrib/amd/scripts => scripts}/automount2amd.in | 0 {contrib/amd/scripts => scripts}/ctl-amd.in | 0 {contrib/amd/scripts => scripts}/ctl-hlfsd.in | 0 {contrib/amd/scripts => scripts}/expn.1 | 0 {contrib/amd/scripts => scripts}/expn.in | 0 {contrib/amd/scripts => scripts}/fix-amd-map.in | 0 {contrib/amd/scripts => scripts}/fixrmtab | 0 {contrib/amd/scripts => scripts}/fixrmtab.in | 0 {contrib/amd/scripts => scripts}/lostaltmail.conf-sample | 0 {contrib/amd/scripts => scripts}/lostaltmail.in | 0 {contrib/amd/scripts => scripts}/redhat-ctl-amd.in | 0 {contrib/amd/scripts => scripts}/test-attrcache.in | 0 {contrib/amd/scripts => scripts}/wait4amd.in | 0 {contrib/amd/scripts => scripts}/wait4amd2die.in | 0 contrib/amd/tasks => tasks | 0 contrib/amd/vers.m4 => vers.m4 | 0 {contrib/amd/wire-test => wire-test}/wire-test.8 | 0 {contrib/amd/wire-test => wire-test}/wire-test.c | 0 182 files changed, 0 insertions(+), 0 deletions(-) rename contrib/amd/AUTHORS => AUTHORS (100%) rename contrib/amd/BUGS => BUGS (100%) rename contrib/amd/COPYING => COPYING (100%) rename contrib/amd/ChangeLog => ChangeLog (100%) rename contrib/amd/FAQ => FAQ (100%) rename contrib/amd/INSTALL => INSTALL (100%) rename contrib/amd/MIRRORS.html => MIRRORS.html (100%) rename contrib/amd/MIRRORS.txt => MIRRORS.txt (100%) rename contrib/amd/NEWS => NEWS (100%) rename contrib/amd/README => README (100%) rename contrib/amd/README.attrcache => README.attrcache (100%) rename contrib/amd/README.ldap => README.ldap (100%) rename contrib/amd/README.y2k => README.y2k (100%) rename contrib/amd/TODO => TODO (100%) rename {contrib/amd/amd => amd}/am_ops.c (100%) rename {contrib/amd/amd => amd}/amd.8 (100%) rename {contrib/amd/amd => amd}/amd.c (100%) rename {contrib/amd/amd => amd}/amd.h (100%) rename {contrib/amd/amd => amd}/amfs_auto.c (100%) rename {contrib/amd/amd => amd}/amfs_direct.c (100%) rename {contrib/amd/amd => amd}/amfs_error.c (100%) rename {contrib/amd/amd => amd}/amfs_generic.c (100%) rename {contrib/amd/amd => amd}/amfs_host.c (100%) rename {contrib/amd/amd => amd}/amfs_link.c (100%) rename {contrib/amd/amd => amd}/amfs_linkx.c (100%) rename {contrib/amd/amd => amd}/amfs_nfsl.c (100%) rename {contrib/amd/amd => amd}/amfs_nfsx.c (100%) rename {contrib/amd/amd => amd}/amfs_program.c (100%) rename {contrib/amd/amd => amd}/amfs_root.c (100%) rename {contrib/amd/amd => amd}/amfs_toplvl.c (100%) rename {contrib/amd/amd => amd}/amfs_union.c (100%) rename {contrib/amd/amd => amd}/amq_subr.c (100%) rename {contrib/amd/amd => amd}/amq_svc.c (100%) rename {contrib/amd/amd => amd}/autil.c (100%) rename {contrib/amd/amd => amd}/clock.c (100%) rename {contrib/amd/amd => amd}/conf.c (100%) rename {contrib/amd/amd => amd}/conf_parse.y (100%) rename {contrib/amd/amd => amd}/conf_tok.l (100%) rename {contrib/amd/amd => amd}/get_args.c (100%) rename {contrib/amd/amd => amd}/info_exec.c (100%) rename {contrib/amd/amd => amd}/info_file.c (100%) rename {contrib/amd/amd => amd}/info_hesiod.c (100%) rename {contrib/amd/amd => amd}/info_ldap.c (100%) rename {contrib/amd/amd => amd}/info_ndbm.c (100%) rename {contrib/amd/amd => amd}/info_nis.c (100%) rename {contrib/amd/amd => amd}/info_nisplus.c (100%) rename {contrib/amd/amd => amd}/info_passwd.c (100%) rename {contrib/amd/amd => amd}/info_union.c (100%) rename {contrib/amd/amd => amd}/map.c (100%) rename {contrib/amd/amd => amd}/mapc.c (100%) rename {contrib/amd/amd => amd}/mntfs.c (100%) rename {contrib/amd/amd => amd}/nfs_prot_svc.c (100%) rename {contrib/amd/amd => amd}/nfs_start.c (100%) rename {contrib/amd/amd => amd}/nfs_subr.c (100%) rename {contrib/amd/amd => amd}/ops_TEMPLATE.c (100%) rename {contrib/amd/amd => amd}/ops_autofs.c (100%) rename {contrib/amd/amd => amd}/ops_cachefs.c (100%) rename {contrib/amd/amd => amd}/ops_cdfs.c (100%) rename {contrib/amd/amd => amd}/ops_efs.c (100%) rename {contrib/amd/amd => amd}/ops_lofs.c (100%) rename {contrib/amd/amd => amd}/ops_mfs.c (100%) rename {contrib/amd/amd => amd}/ops_nfs.c (100%) rename {contrib/amd/amd => amd}/ops_nfs3.c (100%) rename {contrib/amd/amd => amd}/ops_nullfs.c (100%) rename {contrib/amd/amd => amd}/ops_pcfs.c (100%) rename {contrib/amd/amd => amd}/ops_tfs.c (100%) rename {contrib/amd/amd => amd}/ops_tmpfs.c (100%) rename {contrib/amd/amd => amd}/ops_ufs.c (100%) rename {contrib/amd/amd => amd}/ops_umapfs.c (100%) rename {contrib/amd/amd => amd}/ops_unionfs.c (100%) rename {contrib/amd/amd => amd}/ops_xfs.c (100%) rename {contrib/amd/amd => amd}/opts.c (100%) rename {contrib/amd/amd => amd}/readdir.c (100%) rename {contrib/amd/amd => amd}/restart.c (100%) rename {contrib/amd/amd => amd}/rpc_fwd.c (100%) rename {contrib/amd/amd => amd}/sched.c (100%) rename {contrib/amd/amd => amd}/srvr_amfs_auto.c (100%) rename {contrib/amd/amd => amd}/srvr_nfs.c (100%) rename {contrib/amd/amq => amq}/amq.8 (100%) rename {contrib/amd/amq => amq}/amq.c (100%) rename {contrib/amd/amq => amq}/amq.h (100%) rename {contrib/amd/amq => amq}/amq_clnt.c (100%) rename {contrib/amd/amq => amq}/amq_xdr.c (100%) rename {contrib/amd/amq => amq}/pawd.1 (100%) rename {contrib/amd/amq => amq}/pawd.c (100%) rename contrib/amd/aux_conf.h.in => aux_conf.h.in (100%) rename contrib/amd/bootstrap => bootstrap (100%) rename {contrib/amd/conf => conf}/checkmount/checkmount_bsd44.c (100%) rename {contrib/amd/conf => conf}/fh_dref/fh_dref_freebsd22.h (100%) rename {contrib/amd/conf => conf}/hn_dref/hn_dref_default.h (100%) rename {contrib/amd/conf => conf}/mount/mount_default.c (100%) rename {contrib/amd/conf => conf}/mount/mount_freebsd3.c (100%) rename {contrib/amd/conf => conf}/mtab/mtab_bsd.c (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_aix5_1.h (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_darwin.h (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_freebsd2.h (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_freebsd3.h (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_osf5.h (100%) rename {contrib/amd/conf => conf}/nfs_prot/nfs_prot_sunos5_8.h (100%) rename {contrib/amd/conf => conf}/sa_dref/sa_dref_bsd44.h (100%) rename {contrib/amd/conf => conf}/transp/transp_sockets.c (100%) rename {contrib/amd/conf => conf}/trap/trap_default.h (100%) rename {contrib/amd/conf => conf}/trap/trap_freebsd3.h (100%) rename {contrib/amd/conf => conf}/umount/umount_bsd44.c (100%) rename contrib/amd/cvs-server.txt => cvs-server.txt (100%) rename {contrib/amd/doc => doc}/am-utils.texi (100%) rename {contrib/amd/doc => doc}/stamp-vti (100%) rename {contrib/amd/doc => doc}/texinfo.tex (100%) rename {contrib/amd/doc => doc}/version.texi (100%) rename {contrib/amd/fixmount => fixmount}/fixmount.8 (100%) rename {contrib/amd/fixmount => fixmount}/fixmount.c (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_analyze.c (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_data.h (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_dict.c (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_gram.y (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_lex.l (100%) rename {contrib/amd/fsinfo => fsinfo}/fsi_util.c (100%) rename {contrib/amd/fsinfo => fsinfo}/fsinfo.8 (100%) rename {contrib/amd/fsinfo => fsinfo}/fsinfo.c (100%) rename {contrib/amd/fsinfo => fsinfo}/fsinfo.h (100%) rename {contrib/amd/fsinfo => fsinfo}/wr_atab.c (100%) rename {contrib/amd/fsinfo => fsinfo}/wr_bparam.c (100%) rename {contrib/amd/fsinfo => fsinfo}/wr_dumpset.c (100%) rename {contrib/amd/fsinfo => fsinfo}/wr_exportfs.c (100%) rename {contrib/amd/fsinfo => fsinfo}/wr_fstab.c (100%) rename {contrib/amd/hlfsd => hlfsd}/hlfsd.8 (100%) rename {contrib/amd/hlfsd => hlfsd}/hlfsd.c (100%) rename {contrib/amd/hlfsd => hlfsd}/hlfsd.h (100%) rename {contrib/amd/hlfsd => hlfsd}/homedir.c (100%) rename {contrib/amd/hlfsd => hlfsd}/nfs_prot_svc.c (100%) rename {contrib/amd/hlfsd => hlfsd}/stubs.c (100%) rename {contrib/amd/include => include}/am_compat.h (100%) rename {contrib/amd/include => include}/am_defs.h (100%) rename {contrib/amd/include => include}/am_utils.h (100%) rename {contrib/amd/include => include}/am_xdr_func.h (100%) rename {contrib/amd/include => include}/amq_defs.h (100%) rename {contrib/amd/include => include}/mount_headers1.h (100%) rename {contrib/amd/include => include}/mount_headers2.h (100%) rename contrib/amd/ldap-id.ms => ldap-id.ms (100%) rename contrib/amd/ldap-id.txt => ldap-id.txt (100%) rename contrib/amd/ldap.schema => ldap.schema (100%) rename {contrib/amd/libamu => libamu}/alloca.c (100%) rename {contrib/amd/libamu => libamu}/amu.h (100%) rename {contrib/amd/libamu => libamu}/clnt_sperrno.c (100%) rename {contrib/amd/libamu => libamu}/hasmntopt.c (100%) rename {contrib/amd/libamu => libamu}/misc_rpc.c (100%) rename {contrib/amd/libamu => libamu}/mount_fs.c (100%) rename {contrib/amd/libamu => libamu}/mtab.c (100%) rename {contrib/amd/libamu => libamu}/nfs_prot_xdr.c (100%) rename {contrib/amd/libamu => libamu}/strerror.c (100%) rename {contrib/amd/libamu => libamu}/strutil.c (100%) rename {contrib/amd/libamu => libamu}/wire.c (100%) rename {contrib/amd/libamu => libamu}/xdr_func.c (100%) rename {contrib/amd/libamu => libamu}/xutil.c (100%) rename {contrib/amd/mk-amd-map => mk-amd-map}/mk-amd-map.8 (100%) rename {contrib/amd/mk-amd-map => mk-amd-map}/mk-amd-map.c (100%) rename {contrib/amd/scripts => scripts}/Makefile.am (100%) rename {contrib/amd/scripts => scripts}/Makefile.in (100%) rename {contrib/amd/scripts => scripts}/am-eject.in (100%) rename {contrib/amd/scripts => scripts}/amd.conf-sample (100%) rename {contrib/amd/scripts => scripts}/amd.conf.5 (100%) rename {contrib/amd/scripts => scripts}/amd2ldif.in (100%) rename {contrib/amd/scripts => scripts}/amd2sun.in (100%) rename {contrib/amd/scripts => scripts}/automount2amd.8 (100%) rename {contrib/amd/scripts => scripts}/automount2amd.in (100%) rename {contrib/amd/scripts => scripts}/ctl-amd.in (100%) rename {contrib/amd/scripts => scripts}/ctl-hlfsd.in (100%) rename {contrib/amd/scripts => scripts}/expn.1 (100%) rename {contrib/amd/scripts => scripts}/expn.in (100%) rename {contrib/amd/scripts => scripts}/fix-amd-map.in (100%) rename {contrib/amd/scripts => scripts}/fixrmtab (100%) rename {contrib/amd/scripts => scripts}/fixrmtab.in (100%) rename {contrib/amd/scripts => scripts}/lostaltmail.conf-sample (100%) rename {contrib/amd/scripts => scripts}/lostaltmail.in (100%) rename {contrib/amd/scripts => scripts}/redhat-ctl-amd.in (100%) rename {contrib/amd/scripts => scripts}/test-attrcache.in (100%) rename {contrib/amd/scripts => scripts}/wait4amd.in (100%) rename {contrib/amd/scripts => scripts}/wait4amd2die.in (100%) rename contrib/amd/tasks => tasks (100%) rename contrib/amd/vers.m4 => vers.m4 (100%) rename {contrib/amd/wire-test => wire-test}/wire-test.8 (100%) rename {contrib/amd/wire-test => wire-test}/wire-test.c (100%) diff --git a/contrib/amd/AUTHORS b/AUTHORS similarity index 100% rename from contrib/amd/AUTHORS rename to AUTHORS diff --git a/contrib/amd/BUGS b/BUGS similarity index 100% rename from contrib/amd/BUGS rename to BUGS diff --git a/contrib/amd/COPYING b/COPYING similarity index 100% rename from contrib/amd/COPYING rename to COPYING diff --git a/contrib/amd/ChangeLog b/ChangeLog similarity index 100% rename from contrib/amd/ChangeLog rename to ChangeLog diff --git a/contrib/amd/FAQ b/FAQ similarity index 100% rename from contrib/amd/FAQ rename to FAQ diff --git a/contrib/amd/INSTALL b/INSTALL similarity index 100% rename from contrib/amd/INSTALL rename to INSTALL diff --git a/contrib/amd/MIRRORS.html b/MIRRORS.html similarity index 100% rename from contrib/amd/MIRRORS.html rename to MIRRORS.html diff --git a/contrib/amd/MIRRORS.txt b/MIRRORS.txt similarity index 100% rename from contrib/amd/MIRRORS.txt rename to MIRRORS.txt diff --git a/contrib/amd/NEWS b/NEWS similarity index 100% rename from contrib/amd/NEWS rename to NEWS diff --git a/contrib/amd/README b/README similarity index 100% rename from contrib/amd/README rename to README diff --git a/contrib/amd/README.attrcache b/README.attrcache similarity index 100% rename from contrib/amd/README.attrcache rename to README.attrcache diff --git a/contrib/amd/README.ldap b/README.ldap similarity index 100% rename from contrib/amd/README.ldap rename to README.ldap diff --git a/contrib/amd/README.y2k b/README.y2k similarity index 100% rename from contrib/amd/README.y2k rename to README.y2k diff --git a/contrib/amd/TODO b/TODO similarity index 100% rename from contrib/amd/TODO rename to TODO diff --git a/contrib/amd/amd/am_ops.c b/amd/am_ops.c similarity index 100% rename from contrib/amd/amd/am_ops.c rename to amd/am_ops.c diff --git a/contrib/amd/amd/amd.8 b/amd/amd.8 similarity index 100% rename from contrib/amd/amd/amd.8 rename to amd/amd.8 diff --git a/contrib/amd/amd/amd.c b/amd/amd.c similarity index 100% rename from contrib/amd/amd/amd.c rename to amd/amd.c diff --git a/contrib/amd/amd/amd.h b/amd/amd.h similarity index 100% rename from contrib/amd/amd/amd.h rename to amd/amd.h diff --git a/contrib/amd/amd/amfs_auto.c b/amd/amfs_auto.c similarity index 100% rename from contrib/amd/amd/amfs_auto.c rename to amd/amfs_auto.c diff --git a/contrib/amd/amd/amfs_direct.c b/amd/amfs_direct.c similarity index 100% rename from contrib/amd/amd/amfs_direct.c rename to amd/amfs_direct.c diff --git a/contrib/amd/amd/amfs_error.c b/amd/amfs_error.c similarity index 100% rename from contrib/amd/amd/amfs_error.c rename to amd/amfs_error.c diff --git a/contrib/amd/amd/amfs_generic.c b/amd/amfs_generic.c similarity index 100% rename from contrib/amd/amd/amfs_generic.c rename to amd/amfs_generic.c diff --git a/contrib/amd/amd/amfs_host.c b/amd/amfs_host.c similarity index 100% rename from contrib/amd/amd/amfs_host.c rename to amd/amfs_host.c diff --git a/contrib/amd/amd/amfs_link.c b/amd/amfs_link.c similarity index 100% rename from contrib/amd/amd/amfs_link.c rename to amd/amfs_link.c diff --git a/contrib/amd/amd/amfs_linkx.c b/amd/amfs_linkx.c similarity index 100% rename from contrib/amd/amd/amfs_linkx.c rename to amd/amfs_linkx.c diff --git a/contrib/amd/amd/amfs_nfsl.c b/amd/amfs_nfsl.c similarity index 100% rename from contrib/amd/amd/amfs_nfsl.c rename to amd/amfs_nfsl.c diff --git a/contrib/amd/amd/amfs_nfsx.c b/amd/amfs_nfsx.c similarity index 100% rename from contrib/amd/amd/amfs_nfsx.c rename to amd/amfs_nfsx.c diff --git a/contrib/amd/amd/amfs_program.c b/amd/amfs_program.c similarity index 100% rename from contrib/amd/amd/amfs_program.c rename to amd/amfs_program.c diff --git a/contrib/amd/amd/amfs_root.c b/amd/amfs_root.c similarity index 100% rename from contrib/amd/amd/amfs_root.c rename to amd/amfs_root.c diff --git a/contrib/amd/amd/amfs_toplvl.c b/amd/amfs_toplvl.c similarity index 100% rename from contrib/amd/amd/amfs_toplvl.c rename to amd/amfs_toplvl.c diff --git a/contrib/amd/amd/amfs_union.c b/amd/amfs_union.c similarity index 100% rename from contrib/amd/amd/amfs_union.c rename to amd/amfs_union.c diff --git a/contrib/amd/amd/amq_subr.c b/amd/amq_subr.c similarity index 100% rename from contrib/amd/amd/amq_subr.c rename to amd/amq_subr.c diff --git a/contrib/amd/amd/amq_svc.c b/amd/amq_svc.c similarity index 100% rename from contrib/amd/amd/amq_svc.c rename to amd/amq_svc.c diff --git a/contrib/amd/amd/autil.c b/amd/autil.c similarity index 100% rename from contrib/amd/amd/autil.c rename to amd/autil.c diff --git a/contrib/amd/amd/clock.c b/amd/clock.c similarity index 100% rename from contrib/amd/amd/clock.c rename to amd/clock.c diff --git a/contrib/amd/amd/conf.c b/amd/conf.c similarity index 100% rename from contrib/amd/amd/conf.c rename to amd/conf.c diff --git a/contrib/amd/amd/conf_parse.y b/amd/conf_parse.y similarity index 100% rename from contrib/amd/amd/conf_parse.y rename to amd/conf_parse.y diff --git a/contrib/amd/amd/conf_tok.l b/amd/conf_tok.l similarity index 100% rename from contrib/amd/amd/conf_tok.l rename to amd/conf_tok.l diff --git a/contrib/amd/amd/get_args.c b/amd/get_args.c similarity index 100% rename from contrib/amd/amd/get_args.c rename to amd/get_args.c diff --git a/contrib/amd/amd/info_exec.c b/amd/info_exec.c similarity index 100% rename from contrib/amd/amd/info_exec.c rename to amd/info_exec.c diff --git a/contrib/amd/amd/info_file.c b/amd/info_file.c similarity index 100% rename from contrib/amd/amd/info_file.c rename to amd/info_file.c diff --git a/contrib/amd/amd/info_hesiod.c b/amd/info_hesiod.c similarity index 100% rename from contrib/amd/amd/info_hesiod.c rename to amd/info_hesiod.c diff --git a/contrib/amd/amd/info_ldap.c b/amd/info_ldap.c similarity index 100% rename from contrib/amd/amd/info_ldap.c rename to amd/info_ldap.c diff --git a/contrib/amd/amd/info_ndbm.c b/amd/info_ndbm.c similarity index 100% rename from contrib/amd/amd/info_ndbm.c rename to amd/info_ndbm.c diff --git a/contrib/amd/amd/info_nis.c b/amd/info_nis.c similarity index 100% rename from contrib/amd/amd/info_nis.c rename to amd/info_nis.c diff --git a/contrib/amd/amd/info_nisplus.c b/amd/info_nisplus.c similarity index 100% rename from contrib/amd/amd/info_nisplus.c rename to amd/info_nisplus.c diff --git a/contrib/amd/amd/info_passwd.c b/amd/info_passwd.c similarity index 100% rename from contrib/amd/amd/info_passwd.c rename to amd/info_passwd.c diff --git a/contrib/amd/amd/info_union.c b/amd/info_union.c similarity index 100% rename from contrib/amd/amd/info_union.c rename to amd/info_union.c diff --git a/contrib/amd/amd/map.c b/amd/map.c similarity index 100% rename from contrib/amd/amd/map.c rename to amd/map.c diff --git a/contrib/amd/amd/mapc.c b/amd/mapc.c similarity index 100% rename from contrib/amd/amd/mapc.c rename to amd/mapc.c diff --git a/contrib/amd/amd/mntfs.c b/amd/mntfs.c similarity index 100% rename from contrib/amd/amd/mntfs.c rename to amd/mntfs.c diff --git a/contrib/amd/amd/nfs_prot_svc.c b/amd/nfs_prot_svc.c similarity index 100% rename from contrib/amd/amd/nfs_prot_svc.c rename to amd/nfs_prot_svc.c diff --git a/contrib/amd/amd/nfs_start.c b/amd/nfs_start.c similarity index 100% rename from contrib/amd/amd/nfs_start.c rename to amd/nfs_start.c diff --git a/contrib/amd/amd/nfs_subr.c b/amd/nfs_subr.c similarity index 100% rename from contrib/amd/amd/nfs_subr.c rename to amd/nfs_subr.c diff --git a/contrib/amd/amd/ops_TEMPLATE.c b/amd/ops_TEMPLATE.c similarity index 100% rename from contrib/amd/amd/ops_TEMPLATE.c rename to amd/ops_TEMPLATE.c diff --git a/contrib/amd/amd/ops_autofs.c b/amd/ops_autofs.c similarity index 100% rename from contrib/amd/amd/ops_autofs.c rename to amd/ops_autofs.c diff --git a/contrib/amd/amd/ops_cachefs.c b/amd/ops_cachefs.c similarity index 100% rename from contrib/amd/amd/ops_cachefs.c rename to amd/ops_cachefs.c diff --git a/contrib/amd/amd/ops_cdfs.c b/amd/ops_cdfs.c similarity index 100% rename from contrib/amd/amd/ops_cdfs.c rename to amd/ops_cdfs.c diff --git a/contrib/amd/amd/ops_efs.c b/amd/ops_efs.c similarity index 100% rename from contrib/amd/amd/ops_efs.c rename to amd/ops_efs.c diff --git a/contrib/amd/amd/ops_lofs.c b/amd/ops_lofs.c similarity index 100% rename from contrib/amd/amd/ops_lofs.c rename to amd/ops_lofs.c diff --git a/contrib/amd/amd/ops_mfs.c b/amd/ops_mfs.c similarity index 100% rename from contrib/amd/amd/ops_mfs.c rename to amd/ops_mfs.c diff --git a/contrib/amd/amd/ops_nfs.c b/amd/ops_nfs.c similarity index 100% rename from contrib/amd/amd/ops_nfs.c rename to amd/ops_nfs.c diff --git a/contrib/amd/amd/ops_nfs3.c b/amd/ops_nfs3.c similarity index 100% rename from contrib/amd/amd/ops_nfs3.c rename to amd/ops_nfs3.c diff --git a/contrib/amd/amd/ops_nullfs.c b/amd/ops_nullfs.c similarity index 100% rename from contrib/amd/amd/ops_nullfs.c rename to amd/ops_nullfs.c diff --git a/contrib/amd/amd/ops_pcfs.c b/amd/ops_pcfs.c similarity index 100% rename from contrib/amd/amd/ops_pcfs.c rename to amd/ops_pcfs.c diff --git a/contrib/amd/amd/ops_tfs.c b/amd/ops_tfs.c similarity index 100% rename from contrib/amd/amd/ops_tfs.c rename to amd/ops_tfs.c diff --git a/contrib/amd/amd/ops_tmpfs.c b/amd/ops_tmpfs.c similarity index 100% rename from contrib/amd/amd/ops_tmpfs.c rename to amd/ops_tmpfs.c diff --git a/contrib/amd/amd/ops_ufs.c b/amd/ops_ufs.c similarity index 100% rename from contrib/amd/amd/ops_ufs.c rename to amd/ops_ufs.c diff --git a/contrib/amd/amd/ops_umapfs.c b/amd/ops_umapfs.c similarity index 100% rename from contrib/amd/amd/ops_umapfs.c rename to amd/ops_umapfs.c diff --git a/contrib/amd/amd/ops_unionfs.c b/amd/ops_unionfs.c similarity index 100% rename from contrib/amd/amd/ops_unionfs.c rename to amd/ops_unionfs.c diff --git a/contrib/amd/amd/ops_xfs.c b/amd/ops_xfs.c similarity index 100% rename from contrib/amd/amd/ops_xfs.c rename to amd/ops_xfs.c diff --git a/contrib/amd/amd/opts.c b/amd/opts.c similarity index 100% rename from contrib/amd/amd/opts.c rename to amd/opts.c diff --git a/contrib/amd/amd/readdir.c b/amd/readdir.c similarity index 100% rename from contrib/amd/amd/readdir.c rename to amd/readdir.c diff --git a/contrib/amd/amd/restart.c b/amd/restart.c similarity index 100% rename from contrib/amd/amd/restart.c rename to amd/restart.c diff --git a/contrib/amd/amd/rpc_fwd.c b/amd/rpc_fwd.c similarity index 100% rename from contrib/amd/amd/rpc_fwd.c rename to amd/rpc_fwd.c diff --git a/contrib/amd/amd/sched.c b/amd/sched.c similarity index 100% rename from contrib/amd/amd/sched.c rename to amd/sched.c diff --git a/contrib/amd/amd/srvr_amfs_auto.c b/amd/srvr_amfs_auto.c similarity index 100% rename from contrib/amd/amd/srvr_amfs_auto.c rename to amd/srvr_amfs_auto.c diff --git a/contrib/amd/amd/srvr_nfs.c b/amd/srvr_nfs.c similarity index 100% rename from contrib/amd/amd/srvr_nfs.c rename to amd/srvr_nfs.c diff --git a/contrib/amd/amq/amq.8 b/amq/amq.8 similarity index 100% rename from contrib/amd/amq/amq.8 rename to amq/amq.8 diff --git a/contrib/amd/amq/amq.c b/amq/amq.c similarity index 100% rename from contrib/amd/amq/amq.c rename to amq/amq.c diff --git a/contrib/amd/amq/amq.h b/amq/amq.h similarity index 100% rename from contrib/amd/amq/amq.h rename to amq/amq.h diff --git a/contrib/amd/amq/amq_clnt.c b/amq/amq_clnt.c similarity index 100% rename from contrib/amd/amq/amq_clnt.c rename to amq/amq_clnt.c diff --git a/contrib/amd/amq/amq_xdr.c b/amq/amq_xdr.c similarity index 100% rename from contrib/amd/amq/amq_xdr.c rename to amq/amq_xdr.c diff --git a/contrib/amd/amq/pawd.1 b/amq/pawd.1 similarity index 100% rename from contrib/amd/amq/pawd.1 rename to amq/pawd.1 diff --git a/contrib/amd/amq/pawd.c b/amq/pawd.c similarity index 100% rename from contrib/amd/amq/pawd.c rename to amq/pawd.c diff --git a/contrib/amd/aux_conf.h.in b/aux_conf.h.in similarity index 100% rename from contrib/amd/aux_conf.h.in rename to aux_conf.h.in diff --git a/contrib/amd/bootstrap b/bootstrap similarity index 100% rename from contrib/amd/bootstrap rename to bootstrap diff --git a/contrib/amd/conf/checkmount/checkmount_bsd44.c b/conf/checkmount/checkmount_bsd44.c similarity index 100% rename from contrib/amd/conf/checkmount/checkmount_bsd44.c rename to conf/checkmount/checkmount_bsd44.c diff --git a/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h b/conf/fh_dref/fh_dref_freebsd22.h similarity index 100% rename from contrib/amd/conf/fh_dref/fh_dref_freebsd22.h rename to conf/fh_dref/fh_dref_freebsd22.h diff --git a/contrib/amd/conf/hn_dref/hn_dref_default.h b/conf/hn_dref/hn_dref_default.h similarity index 100% rename from contrib/amd/conf/hn_dref/hn_dref_default.h rename to conf/hn_dref/hn_dref_default.h diff --git a/contrib/amd/conf/mount/mount_default.c b/conf/mount/mount_default.c similarity index 100% rename from contrib/amd/conf/mount/mount_default.c rename to conf/mount/mount_default.c diff --git a/contrib/amd/conf/mount/mount_freebsd3.c b/conf/mount/mount_freebsd3.c similarity index 100% rename from contrib/amd/conf/mount/mount_freebsd3.c rename to conf/mount/mount_freebsd3.c diff --git a/contrib/amd/conf/mtab/mtab_bsd.c b/conf/mtab/mtab_bsd.c similarity index 100% rename from contrib/amd/conf/mtab/mtab_bsd.c rename to conf/mtab/mtab_bsd.c diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h b/conf/nfs_prot/nfs_prot_aix5_1.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h rename to conf/nfs_prot/nfs_prot_aix5_1.h diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h b/conf/nfs_prot/nfs_prot_darwin.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_darwin.h rename to conf/nfs_prot/nfs_prot_darwin.h diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/conf/nfs_prot/nfs_prot_freebsd2.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h rename to conf/nfs_prot/nfs_prot_freebsd2.h diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/conf/nfs_prot/nfs_prot_freebsd3.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h rename to conf/nfs_prot/nfs_prot_freebsd3.h diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h b/conf/nfs_prot/nfs_prot_osf5.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_osf5.h rename to conf/nfs_prot/nfs_prot_osf5.h diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h b/conf/nfs_prot/nfs_prot_sunos5_8.h similarity index 100% rename from contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h rename to conf/nfs_prot/nfs_prot_sunos5_8.h diff --git a/contrib/amd/conf/sa_dref/sa_dref_bsd44.h b/conf/sa_dref/sa_dref_bsd44.h similarity index 100% rename from contrib/amd/conf/sa_dref/sa_dref_bsd44.h rename to conf/sa_dref/sa_dref_bsd44.h diff --git a/contrib/amd/conf/transp/transp_sockets.c b/conf/transp/transp_sockets.c similarity index 100% rename from contrib/amd/conf/transp/transp_sockets.c rename to conf/transp/transp_sockets.c diff --git a/contrib/amd/conf/trap/trap_default.h b/conf/trap/trap_default.h similarity index 100% rename from contrib/amd/conf/trap/trap_default.h rename to conf/trap/trap_default.h diff --git a/contrib/amd/conf/trap/trap_freebsd3.h b/conf/trap/trap_freebsd3.h similarity index 100% rename from contrib/amd/conf/trap/trap_freebsd3.h rename to conf/trap/trap_freebsd3.h diff --git a/contrib/amd/conf/umount/umount_bsd44.c b/conf/umount/umount_bsd44.c similarity index 100% rename from contrib/amd/conf/umount/umount_bsd44.c rename to conf/umount/umount_bsd44.c diff --git a/contrib/amd/cvs-server.txt b/cvs-server.txt similarity index 100% rename from contrib/amd/cvs-server.txt rename to cvs-server.txt diff --git a/contrib/amd/doc/am-utils.texi b/doc/am-utils.texi similarity index 100% rename from contrib/amd/doc/am-utils.texi rename to doc/am-utils.texi diff --git a/contrib/amd/doc/stamp-vti b/doc/stamp-vti similarity index 100% rename from contrib/amd/doc/stamp-vti rename to doc/stamp-vti diff --git a/contrib/amd/doc/texinfo.tex b/doc/texinfo.tex similarity index 100% rename from contrib/amd/doc/texinfo.tex rename to doc/texinfo.tex diff --git a/contrib/amd/doc/version.texi b/doc/version.texi similarity index 100% rename from contrib/amd/doc/version.texi rename to doc/version.texi diff --git a/contrib/amd/fixmount/fixmount.8 b/fixmount/fixmount.8 similarity index 100% rename from contrib/amd/fixmount/fixmount.8 rename to fixmount/fixmount.8 diff --git a/contrib/amd/fixmount/fixmount.c b/fixmount/fixmount.c similarity index 100% rename from contrib/amd/fixmount/fixmount.c rename to fixmount/fixmount.c diff --git a/contrib/amd/fsinfo/fsi_analyze.c b/fsinfo/fsi_analyze.c similarity index 100% rename from contrib/amd/fsinfo/fsi_analyze.c rename to fsinfo/fsi_analyze.c diff --git a/contrib/amd/fsinfo/fsi_data.h b/fsinfo/fsi_data.h similarity index 100% rename from contrib/amd/fsinfo/fsi_data.h rename to fsinfo/fsi_data.h diff --git a/contrib/amd/fsinfo/fsi_dict.c b/fsinfo/fsi_dict.c similarity index 100% rename from contrib/amd/fsinfo/fsi_dict.c rename to fsinfo/fsi_dict.c diff --git a/contrib/amd/fsinfo/fsi_gram.y b/fsinfo/fsi_gram.y similarity index 100% rename from contrib/amd/fsinfo/fsi_gram.y rename to fsinfo/fsi_gram.y diff --git a/contrib/amd/fsinfo/fsi_lex.l b/fsinfo/fsi_lex.l similarity index 100% rename from contrib/amd/fsinfo/fsi_lex.l rename to fsinfo/fsi_lex.l diff --git a/contrib/amd/fsinfo/fsi_util.c b/fsinfo/fsi_util.c similarity index 100% rename from contrib/amd/fsinfo/fsi_util.c rename to fsinfo/fsi_util.c diff --git a/contrib/amd/fsinfo/fsinfo.8 b/fsinfo/fsinfo.8 similarity index 100% rename from contrib/amd/fsinfo/fsinfo.8 rename to fsinfo/fsinfo.8 diff --git a/contrib/amd/fsinfo/fsinfo.c b/fsinfo/fsinfo.c similarity index 100% rename from contrib/amd/fsinfo/fsinfo.c rename to fsinfo/fsinfo.c diff --git a/contrib/amd/fsinfo/fsinfo.h b/fsinfo/fsinfo.h similarity index 100% rename from contrib/amd/fsinfo/fsinfo.h rename to fsinfo/fsinfo.h diff --git a/contrib/amd/fsinfo/wr_atab.c b/fsinfo/wr_atab.c similarity index 100% rename from contrib/amd/fsinfo/wr_atab.c rename to fsinfo/wr_atab.c diff --git a/contrib/amd/fsinfo/wr_bparam.c b/fsinfo/wr_bparam.c similarity index 100% rename from contrib/amd/fsinfo/wr_bparam.c rename to fsinfo/wr_bparam.c diff --git a/contrib/amd/fsinfo/wr_dumpset.c b/fsinfo/wr_dumpset.c similarity index 100% rename from contrib/amd/fsinfo/wr_dumpset.c rename to fsinfo/wr_dumpset.c diff --git a/contrib/amd/fsinfo/wr_exportfs.c b/fsinfo/wr_exportfs.c similarity index 100% rename from contrib/amd/fsinfo/wr_exportfs.c rename to fsinfo/wr_exportfs.c diff --git a/contrib/amd/fsinfo/wr_fstab.c b/fsinfo/wr_fstab.c similarity index 100% rename from contrib/amd/fsinfo/wr_fstab.c rename to fsinfo/wr_fstab.c diff --git a/contrib/amd/hlfsd/hlfsd.8 b/hlfsd/hlfsd.8 similarity index 100% rename from contrib/amd/hlfsd/hlfsd.8 rename to hlfsd/hlfsd.8 diff --git a/contrib/amd/hlfsd/hlfsd.c b/hlfsd/hlfsd.c similarity index 100% rename from contrib/amd/hlfsd/hlfsd.c rename to hlfsd/hlfsd.c diff --git a/contrib/amd/hlfsd/hlfsd.h b/hlfsd/hlfsd.h similarity index 100% rename from contrib/amd/hlfsd/hlfsd.h rename to hlfsd/hlfsd.h diff --git a/contrib/amd/hlfsd/homedir.c b/hlfsd/homedir.c similarity index 100% rename from contrib/amd/hlfsd/homedir.c rename to hlfsd/homedir.c diff --git a/contrib/amd/hlfsd/nfs_prot_svc.c b/hlfsd/nfs_prot_svc.c similarity index 100% rename from contrib/amd/hlfsd/nfs_prot_svc.c rename to hlfsd/nfs_prot_svc.c diff --git a/contrib/amd/hlfsd/stubs.c b/hlfsd/stubs.c similarity index 100% rename from contrib/amd/hlfsd/stubs.c rename to hlfsd/stubs.c diff --git a/contrib/amd/include/am_compat.h b/include/am_compat.h similarity index 100% rename from contrib/amd/include/am_compat.h rename to include/am_compat.h diff --git a/contrib/amd/include/am_defs.h b/include/am_defs.h similarity index 100% rename from contrib/amd/include/am_defs.h rename to include/am_defs.h diff --git a/contrib/amd/include/am_utils.h b/include/am_utils.h similarity index 100% rename from contrib/amd/include/am_utils.h rename to include/am_utils.h diff --git a/contrib/amd/include/am_xdr_func.h b/include/am_xdr_func.h similarity index 100% rename from contrib/amd/include/am_xdr_func.h rename to include/am_xdr_func.h diff --git a/contrib/amd/include/amq_defs.h b/include/amq_defs.h similarity index 100% rename from contrib/amd/include/amq_defs.h rename to include/amq_defs.h diff --git a/contrib/amd/include/mount_headers1.h b/include/mount_headers1.h similarity index 100% rename from contrib/amd/include/mount_headers1.h rename to include/mount_headers1.h diff --git a/contrib/amd/include/mount_headers2.h b/include/mount_headers2.h similarity index 100% rename from contrib/amd/include/mount_headers2.h rename to include/mount_headers2.h diff --git a/contrib/amd/ldap-id.ms b/ldap-id.ms similarity index 100% rename from contrib/amd/ldap-id.ms rename to ldap-id.ms diff --git a/contrib/amd/ldap-id.txt b/ldap-id.txt similarity index 100% rename from contrib/amd/ldap-id.txt rename to ldap-id.txt diff --git a/contrib/amd/ldap.schema b/ldap.schema similarity index 100% rename from contrib/amd/ldap.schema rename to ldap.schema diff --git a/contrib/amd/libamu/alloca.c b/libamu/alloca.c similarity index 100% rename from contrib/amd/libamu/alloca.c rename to libamu/alloca.c diff --git a/contrib/amd/libamu/amu.h b/libamu/amu.h similarity index 100% rename from contrib/amd/libamu/amu.h rename to libamu/amu.h diff --git a/contrib/amd/libamu/clnt_sperrno.c b/libamu/clnt_sperrno.c similarity index 100% rename from contrib/amd/libamu/clnt_sperrno.c rename to libamu/clnt_sperrno.c diff --git a/contrib/amd/libamu/hasmntopt.c b/libamu/hasmntopt.c similarity index 100% rename from contrib/amd/libamu/hasmntopt.c rename to libamu/hasmntopt.c diff --git a/contrib/amd/libamu/misc_rpc.c b/libamu/misc_rpc.c similarity index 100% rename from contrib/amd/libamu/misc_rpc.c rename to libamu/misc_rpc.c diff --git a/contrib/amd/libamu/mount_fs.c b/libamu/mount_fs.c similarity index 100% rename from contrib/amd/libamu/mount_fs.c rename to libamu/mount_fs.c diff --git a/contrib/amd/libamu/mtab.c b/libamu/mtab.c similarity index 100% rename from contrib/amd/libamu/mtab.c rename to libamu/mtab.c diff --git a/contrib/amd/libamu/nfs_prot_xdr.c b/libamu/nfs_prot_xdr.c similarity index 100% rename from contrib/amd/libamu/nfs_prot_xdr.c rename to libamu/nfs_prot_xdr.c diff --git a/contrib/amd/libamu/strerror.c b/libamu/strerror.c similarity index 100% rename from contrib/amd/libamu/strerror.c rename to libamu/strerror.c diff --git a/contrib/amd/libamu/strutil.c b/libamu/strutil.c similarity index 100% rename from contrib/amd/libamu/strutil.c rename to libamu/strutil.c diff --git a/contrib/amd/libamu/wire.c b/libamu/wire.c similarity index 100% rename from contrib/amd/libamu/wire.c rename to libamu/wire.c diff --git a/contrib/amd/libamu/xdr_func.c b/libamu/xdr_func.c similarity index 100% rename from contrib/amd/libamu/xdr_func.c rename to libamu/xdr_func.c diff --git a/contrib/amd/libamu/xutil.c b/libamu/xutil.c similarity index 100% rename from contrib/amd/libamu/xutil.c rename to libamu/xutil.c diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/mk-amd-map/mk-amd-map.8 similarity index 100% rename from contrib/amd/mk-amd-map/mk-amd-map.8 rename to mk-amd-map/mk-amd-map.8 diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/mk-amd-map/mk-amd-map.c similarity index 100% rename from contrib/amd/mk-amd-map/mk-amd-map.c rename to mk-amd-map/mk-amd-map.c diff --git a/contrib/amd/scripts/Makefile.am b/scripts/Makefile.am similarity index 100% rename from contrib/amd/scripts/Makefile.am rename to scripts/Makefile.am diff --git a/contrib/amd/scripts/Makefile.in b/scripts/Makefile.in similarity index 100% rename from contrib/amd/scripts/Makefile.in rename to scripts/Makefile.in diff --git a/contrib/amd/scripts/am-eject.in b/scripts/am-eject.in similarity index 100% rename from contrib/amd/scripts/am-eject.in rename to scripts/am-eject.in diff --git a/contrib/amd/scripts/amd.conf-sample b/scripts/amd.conf-sample similarity index 100% rename from contrib/amd/scripts/amd.conf-sample rename to scripts/amd.conf-sample diff --git a/contrib/amd/scripts/amd.conf.5 b/scripts/amd.conf.5 similarity index 100% rename from contrib/amd/scripts/amd.conf.5 rename to scripts/amd.conf.5 diff --git a/contrib/amd/scripts/amd2ldif.in b/scripts/amd2ldif.in similarity index 100% rename from contrib/amd/scripts/amd2ldif.in rename to scripts/amd2ldif.in diff --git a/contrib/amd/scripts/amd2sun.in b/scripts/amd2sun.in similarity index 100% rename from contrib/amd/scripts/amd2sun.in rename to scripts/amd2sun.in diff --git a/contrib/amd/scripts/automount2amd.8 b/scripts/automount2amd.8 similarity index 100% rename from contrib/amd/scripts/automount2amd.8 rename to scripts/automount2amd.8 diff --git a/contrib/amd/scripts/automount2amd.in b/scripts/automount2amd.in similarity index 100% rename from contrib/amd/scripts/automount2amd.in rename to scripts/automount2amd.in diff --git a/contrib/amd/scripts/ctl-amd.in b/scripts/ctl-amd.in similarity index 100% rename from contrib/amd/scripts/ctl-amd.in rename to scripts/ctl-amd.in diff --git a/contrib/amd/scripts/ctl-hlfsd.in b/scripts/ctl-hlfsd.in similarity index 100% rename from contrib/amd/scripts/ctl-hlfsd.in rename to scripts/ctl-hlfsd.in diff --git a/contrib/amd/scripts/expn.1 b/scripts/expn.1 similarity index 100% rename from contrib/amd/scripts/expn.1 rename to scripts/expn.1 diff --git a/contrib/amd/scripts/expn.in b/scripts/expn.in similarity index 100% rename from contrib/amd/scripts/expn.in rename to scripts/expn.in diff --git a/contrib/amd/scripts/fix-amd-map.in b/scripts/fix-amd-map.in similarity index 100% rename from contrib/amd/scripts/fix-amd-map.in rename to scripts/fix-amd-map.in diff --git a/contrib/amd/scripts/fixrmtab b/scripts/fixrmtab similarity index 100% rename from contrib/amd/scripts/fixrmtab rename to scripts/fixrmtab diff --git a/contrib/amd/scripts/fixrmtab.in b/scripts/fixrmtab.in similarity index 100% rename from contrib/amd/scripts/fixrmtab.in rename to scripts/fixrmtab.in diff --git a/contrib/amd/scripts/lostaltmail.conf-sample b/scripts/lostaltmail.conf-sample similarity index 100% rename from contrib/amd/scripts/lostaltmail.conf-sample rename to scripts/lostaltmail.conf-sample diff --git a/contrib/amd/scripts/lostaltmail.in b/scripts/lostaltmail.in similarity index 100% rename from contrib/amd/scripts/lostaltmail.in rename to scripts/lostaltmail.in diff --git a/contrib/amd/scripts/redhat-ctl-amd.in b/scripts/redhat-ctl-amd.in similarity index 100% rename from contrib/amd/scripts/redhat-ctl-amd.in rename to scripts/redhat-ctl-amd.in diff --git a/contrib/amd/scripts/test-attrcache.in b/scripts/test-attrcache.in similarity index 100% rename from contrib/amd/scripts/test-attrcache.in rename to scripts/test-attrcache.in diff --git a/contrib/amd/scripts/wait4amd.in b/scripts/wait4amd.in similarity index 100% rename from contrib/amd/scripts/wait4amd.in rename to scripts/wait4amd.in diff --git a/contrib/amd/scripts/wait4amd2die.in b/scripts/wait4amd2die.in similarity index 100% rename from contrib/amd/scripts/wait4amd2die.in rename to scripts/wait4amd2die.in diff --git a/contrib/amd/tasks b/tasks similarity index 100% rename from contrib/amd/tasks rename to tasks diff --git a/contrib/amd/vers.m4 b/vers.m4 similarity index 100% rename from contrib/amd/vers.m4 rename to vers.m4 diff --git a/contrib/amd/wire-test/wire-test.8 b/wire-test/wire-test.8 similarity index 100% rename from contrib/amd/wire-test/wire-test.8 rename to wire-test/wire-test.8 diff --git a/contrib/amd/wire-test/wire-test.c b/wire-test/wire-test.c similarity index 100% rename from contrib/amd/wire-test/wire-test.c rename to wire-test/wire-test.c