Module Name:	src
Committed By:	christos
Date:		Sun Feb  5 16:28:57 UTC 2006

Modified Files:
	src/dist/am-utils/amd: am_ops.c amd.c amd.h amfs_auto.c amfs_generic.c
	    amfs_host.c amfs_toplvl.c amq_subr.c amq_svc.c autil.c get_args.c
	    info_exec.c info_hesiod.c info_ldap.c info_ndbm.c info_nisplus.c
	    info_passwd.c info_union.c map.c mapc.c nfs_prot_svc.c nfs_start.c
	    nfs_subr.c ops_cachefs.c ops_nfs.c opts.c rpc_fwd.c
	src/dist/am-utils/amq: amq.c amq.h amq_clnt.c pawd.c
	src/dist/am-utils/conf/autofs: autofs_linux.c autofs_solaris_v1.c
	    autofs_solaris_v1.h autofs_solaris_v2_v3.c
	src/dist/am-utils/conf/mount: mount_linux.c
	src/dist/am-utils/conf/mtab: mtab_file.c mtab_linux.c mtab_mach3.c
	    mtab_osf.c mtab_svr4.c
	src/dist/am-utils/conf/nfs_prot: nfs_prot_netbsd1_4.h
	src/dist/am-utils/conf/transp: transp_sockets.c transp_tli.c
	src/dist/am-utils/fixmount: fixmount.c
	src/dist/am-utils/fsinfo: fsi_analyze.c fsi_util.c fsinfo.c fsinfo.h
	    wr_atab.c
	src/dist/am-utils/hlfsd: hlfsd.c hlfsd.h homedir.c stubs.c
	src/dist/am-utils/include: am_compat.h am_defs.h am_utils.h amq_defs.h
	src/dist/am-utils/libamu: hasmntopt.c mount_fs.c strcasecmp.c
	    strerror.c strutil.c wire.c xutil.c
	src/dist/am-utils/mk-amd-map: mk-amd-map.c
Removed Files:
	src/dist/am-utils/libamu: util.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/amd/am_ops.c \
    src/dist/am-utils/amd/autil.c src/dist/am-utils/amd/info_hesiod.c \
    src/dist/am-utils/amd/map.c src/dist/am-utils/amd/mapc.c \
    src/dist/am-utils/amd/ops_nfs.c
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/amd/amd.c \
    src/dist/am-utils/amd/opts.c
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/amd/amd.h
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/amd/amfs_auto.c \
    src/dist/am-utils/amd/amfs_host.c src/dist/am-utils/amd/get_args.c
cvs rdiff -r1.1.1.4 -r1.2 src/dist/am-utils/amd/amfs_generic.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/amd/amfs_toplvl.c \
    src/dist/am-utils/amd/info_ldap.c src/dist/am-utils/amd/info_ndbm.c \
    src/dist/am-utils/amd/info_passwd.c src/dist/am-utils/amd/info_union.c \
    src/dist/am-utils/amd/nfs_subr.c src/dist/am-utils/amd/ops_cachefs.c
cvs rdiff -r1.11 -r1.12 src/dist/am-utils/amd/amq_subr.c
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/amd/amq_svc.c \
    src/dist/am-utils/amd/info_nisplus.c src/dist/am-utils/amd/nfs_prot_svc.c \
    src/dist/am-utils/amd/rpc_fwd.c
cvs rdiff -r1.1.1.3 -r1.2 src/dist/am-utils/amd/info_exec.c
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/amd/nfs_start.c
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/amq/amq.c
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/amq/amq.h \
    src/dist/am-utils/amq/amq_clnt.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/amq/pawd.c
cvs rdiff -r1.1.1.6 -r1.2 src/dist/am-utils/conf/autofs/autofs_linux.c \
    src/dist/am-utils/conf/autofs/autofs_solaris_v1.c \
    src/dist/am-utils/conf/autofs/autofs_solaris_v2_v3.c
cvs rdiff -r1.1.1.5 -r1.2 src/dist/am-utils/conf/autofs/autofs_solaris_v1.h
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/conf/mount/mount_linux.c
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/conf/mtab/mtab_file.c \
    src/dist/am-utils/conf/mtab/mtab_mach3.c \
    src/dist/am-utils/conf/mtab/mtab_osf.c \
    src/dist/am-utils/conf/mtab/mtab_svr4.c
cvs rdiff -r1.1.1.2 -r1.2 src/dist/am-utils/conf/mtab/mtab_linux.c
cvs rdiff -r1.1.1.10 -r1.2 \
    src/dist/am-utils/conf/nfs_prot/nfs_prot_netbsd1_4.h
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/conf/transp/transp_sockets.c
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/conf/transp/transp_tli.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/fixmount/fixmount.c
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/fsinfo/fsi_analyze.c
cvs rdiff -r1.11 -r1.12 src/dist/am-utils/fsinfo/fsi_util.c
cvs rdiff -r1.12 -r1.13 src/dist/am-utils/fsinfo/fsinfo.c
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/fsinfo/fsinfo.h
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/fsinfo/wr_atab.c
cvs rdiff -r1.10 -r1.11 src/dist/am-utils/hlfsd/hlfsd.c
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/hlfsd/hlfsd.h
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/hlfsd/homedir.c
cvs rdiff -r1.1.1.10 -r1.2 src/dist/am-utils/hlfsd/stubs.c
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/include/am_compat.h
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/include/am_defs.h
cvs rdiff -r1.13 -r1.14 src/dist/am-utils/include/am_utils.h
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/include/amq_defs.h
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/libamu/hasmntopt.c
cvs rdiff -r1.13 -r1.14 src/dist/am-utils/libamu/mount_fs.c
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/libamu/strcasecmp.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/libamu/strerror.c
cvs rdiff -r1.1.1.1 -r1.2 src/dist/am-utils/libamu/strutil.c
cvs rdiff -r1.3 -r0 src/dist/am-utils/libamu/util.c
cvs rdiff -r1.10 -r1.11 src/dist/am-utils/libamu/wire.c
cvs rdiff -r1.15 -r1.16 src/dist/am-utils/libamu/xutil.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/mk-amd-map/mk-amd-map.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.