From 9b16c3abd44ac7adbca380d64a1cde970ad9d72a Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Tue, 6 Jul 2004 12:55:44 +0000 Subject: [PATCH] Virgin import of AMD (am-utils) v6.0.10p1 --- contrib/amd/AUTHORS | 6 +- contrib/amd/BUGS | 2 +- contrib/amd/COPYING | 2 +- contrib/amd/ChangeLog | 100 +++++++++++ contrib/amd/INSTALL | 2 +- contrib/amd/MIRRORS.html | 106 ++++++++++++ contrib/amd/MIRRORS.txt | 60 +++++++ contrib/amd/NEWS | 8 + contrib/amd/README | 4 +- contrib/amd/README.y2k | 6 +- contrib/amd/amd/am_ops.c | 4 +- contrib/amd/amd/amd.8 | 4 +- contrib/amd/amd/amd.c | 4 +- contrib/amd/amd/amd.h | 5 +- contrib/amd/amd/amfs_auto.c | 4 +- contrib/amd/amd/amfs_direct.c | 4 +- contrib/amd/amd/amfs_error.c | 4 +- contrib/amd/amd/amfs_host.c | 4 +- contrib/amd/amd/amfs_inherit.c | 4 +- contrib/amd/amd/amfs_link.c | 4 +- contrib/amd/amd/amfs_linkx.c | 4 +- contrib/amd/amd/amfs_nfsl.c | 4 +- contrib/amd/amd/amfs_nfsx.c | 4 +- contrib/amd/amd/amfs_program.c | 4 +- contrib/amd/amd/amfs_root.c | 4 +- contrib/amd/amd/amfs_toplvl.c | 4 +- contrib/amd/amd/amfs_union.c | 4 +- contrib/amd/amd/amq_subr.c | 12 +- contrib/amd/amd/amq_svc.c | 4 +- contrib/amd/amd/autil.c | 4 +- contrib/amd/amd/clock.c | 4 +- contrib/amd/amd/conf.c | 22 ++- contrib/amd/amd/conf_parse.y | 31 +--- contrib/amd/amd/conf_tok.l | 28 ++-- contrib/amd/amd/get_args.c | 6 +- contrib/amd/amd/info_file.c | 4 +- contrib/amd/amd/info_hesiod.c | 4 +- contrib/amd/amd/info_ldap.c | 4 +- contrib/amd/amd/info_ndbm.c | 4 +- contrib/amd/amd/info_nis.c | 4 +- contrib/amd/amd/info_nisplus.c | 4 +- contrib/amd/amd/info_passwd.c | 4 +- contrib/amd/amd/info_union.c | 4 +- contrib/amd/amd/map.c | 4 +- contrib/amd/amd/mapc.c | 4 +- contrib/amd/amd/mntfs.c | 4 +- contrib/amd/amd/nfs_prot_svc.c | 7 +- contrib/amd/amd/nfs_start.c | 4 +- contrib/amd/amd/nfs_subr.c | 4 +- contrib/amd/amd/ops_TEMPLATE.c | 4 +- contrib/amd/amd/ops_cachefs.c | 4 +- contrib/amd/amd/ops_cdfs.c | 4 +- contrib/amd/amd/ops_efs.c | 4 +- contrib/amd/amd/ops_lofs.c | 4 +- contrib/amd/amd/ops_mfs.c | 4 +- contrib/amd/amd/ops_nfs.c | 4 +- contrib/amd/amd/ops_nfs3.c | 4 +- contrib/amd/amd/ops_nullfs.c | 4 +- contrib/amd/amd/ops_pcfs.c | 4 +- contrib/amd/amd/ops_tfs.c | 4 +- contrib/amd/amd/ops_tmpfs.c | 4 +- contrib/amd/amd/ops_ufs.c | 4 +- contrib/amd/amd/ops_umapfs.c | 4 +- contrib/amd/amd/ops_unionfs.c | 4 +- contrib/amd/amd/ops_xfs.c | 4 +- contrib/amd/amd/opts.c | 4 +- contrib/amd/amd/restart.c | 4 +- contrib/amd/amd/rpc_fwd.c | 4 +- contrib/amd/amd/sched.c | 4 +- contrib/amd/amd/srvr_amfs_auto.c | 4 +- contrib/amd/amd/srvr_nfs.c | 4 +- contrib/amd/amq/amq.8 | 4 +- contrib/amd/amq/amq.c | 8 +- contrib/amd/amq/amq.h | 4 +- contrib/amd/amq/amq_clnt.c | 4 +- contrib/amd/amq/amq_xdr.c | 4 +- contrib/amd/amq/pawd.1 | 4 +- contrib/amd/amq/pawd.c | 4 +- contrib/amd/bootstrap | 2 +- .../amd/conf/checkmount/checkmount_bsd44.c | 4 +- contrib/amd/conf/mtab/mtab_bsd.c | 4 +- contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 4 +- contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 4 +- contrib/amd/conf/transp/transp_sockets.c | 4 +- contrib/amd/conf/umount/umount_bsd44.c | 4 +- contrib/amd/doc/am-utils.texi | 155 +++++++++++++----- contrib/amd/fixmount/fixmount.8 | 4 +- contrib/amd/fixmount/fixmount.c | 4 +- contrib/amd/fsinfo/fsi_analyze.c | 4 +- contrib/amd/fsinfo/fsi_data.h | 4 +- contrib/amd/fsinfo/fsi_dict.c | 4 +- contrib/amd/fsinfo/fsi_gram.y | 4 +- contrib/amd/fsinfo/fsi_lex.l | 28 ++-- contrib/amd/fsinfo/fsi_util.c | 4 +- contrib/amd/fsinfo/fsinfo.8 | 4 +- contrib/amd/fsinfo/fsinfo.c | 7 +- contrib/amd/fsinfo/fsinfo.h | 6 +- contrib/amd/fsinfo/wr_atab.c | 4 +- contrib/amd/fsinfo/wr_bparam.c | 4 +- contrib/amd/fsinfo/wr_dumpset.c | 4 +- contrib/amd/fsinfo/wr_exportfs.c | 4 +- contrib/amd/fsinfo/wr_fstab.c | 4 +- contrib/amd/hlfsd/hlfsd.8 | 4 +- contrib/amd/hlfsd/hlfsd.c | 6 +- contrib/amd/hlfsd/hlfsd.h | 4 +- contrib/amd/hlfsd/homedir.c | 4 +- contrib/amd/hlfsd/nfs_prot_svc.c | 4 +- contrib/amd/hlfsd/stubs.c | 4 +- contrib/amd/include/am_defs.h | 45 +++-- contrib/amd/include/am_utils.h | 4 +- contrib/amd/include/am_xdr_func.h | 4 +- contrib/amd/include/amq_defs.h | 4 +- contrib/amd/libamu/amu.h | 4 +- contrib/amd/libamu/hasmntopt.c | 4 +- contrib/amd/libamu/misc_rpc.c | 4 +- contrib/amd/libamu/mount_fs.c | 4 +- contrib/amd/libamu/mtab.c | 4 +- contrib/amd/libamu/nfs_prot_xdr.c | 4 +- contrib/amd/libamu/strerror.c | 6 +- contrib/amd/libamu/util.c | 4 +- contrib/amd/libamu/wire.c | 4 +- contrib/amd/libamu/xdr_func.c | 4 +- contrib/amd/libamu/xutil.c | 4 +- contrib/amd/mk-amd-map/mk-amd-map.8 | 4 +- contrib/amd/mk-amd-map/mk-amd-map.c | 4 +- contrib/amd/scripts/amd.conf-sample | 2 + contrib/amd/scripts/amd.conf.5 | 16 +- contrib/amd/scripts/automount2amd.8 | 4 +- contrib/amd/scripts/expn.1 | 2 +- contrib/amd/scripts/expn.in | 2 +- contrib/amd/tasks | 2 - contrib/amd/wire-test/wire-test.8 | 4 +- contrib/amd/wire-test/wire-test.c | 4 +- 133 files changed, 738 insertions(+), 364 deletions(-) create mode 100644 contrib/amd/MIRRORS.html create mode 100644 contrib/amd/MIRRORS.txt diff --git a/contrib/amd/AUTHORS b/contrib/amd/AUTHORS index 148b2a008d7d..4cc9b9f1a4e9 100644 --- a/contrib/amd/AUTHORS +++ b/contrib/amd/AUTHORS @@ -6,16 +6,12 @@ This file lists the ones who contributed major code changes, in no particular order, and I thank them all. This is of course not to diminish the smaller contributes of the many others. Thank you all. -* Erez Zadok +* Erez Zadok The most significant changes were made by Erez Zadok in terms of bug fixes, ports, and new features added. Erez Zadok is the current maintainer of am-utils, as of January 1997. -There is a mailing list dedicated to developers of am-utils. To subscribe -to it, send mail to majordomo@majordomo.cs.columbia.edu, with the body of -the message having the single line "subscribe amd-dev". - * Randall S. Winchester May 7, 1997: contributed a special version of upl102 that included NFS V.3 diff --git a/contrib/amd/BUGS b/contrib/amd/BUGS index e1ac81057343..fd52779d8c9e 100644 --- a/contrib/amd/BUGS +++ b/contrib/amd/BUGS @@ -120,7 +120,7 @@ but it is not yet in the glibc-2.0.7-19 RPM. A bug in libc results in an amq binary that doesn't work; amq -v dumps core in xdr_string. There is no known fix (source code or vendor patch) at this -time. (Please let amd-dev know if you know of a fix.) +time. (Please let am-utils@am-utils.org know if you know of a fix.) (7) *-aix4.3.2.0 diff --git a/contrib/amd/COPYING b/contrib/amd/COPYING index c21456d9e774..24476dc841ea 100644 --- a/contrib/amd/COPYING +++ b/contrib/amd/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 1997-2003 Erez Zadok +Copyright (c) 1997-2004 Erez Zadok Copyright (c) 1989 Jan-Simon Pendry Copyright (c) 1989 Imperial College of Science, Technology & Medicine Copyright (c) 1989 The Regents of the University of California. diff --git a/contrib/amd/ChangeLog b/contrib/amd/ChangeLog index ccd26cf73800..329629fbbd20 100644 --- a/contrib/amd/ChangeLog +++ b/contrib/amd/ChangeLog @@ -1,3 +1,103 @@ +2004-05-12 Erez Zadok + + * m4/macros/check_map_funcs.m4: imported bug-fixed version from + 6.1 branch. + + * config.guess, config.sub, ltmain.sh: updates from the latest GNU + distributions. + + * configure.in: don't check for dbm_open unless needed. + + * m4/macros/header_templates.m4: template for NEW_DBM_H header + file. This completes the migration of bison/flex and n/dbm fixes + from 6.1 to to 6.0. + + * include/am_defs.h: Move ALLOCA logic here. + Add new db/ndbm/gdbm logic here. + + * fsinfo/fsinfo.h, fsinfo/fsinfo.c, fsinfo/fsi_lex.l, + amd/conf_tok.l: Fixes to avoid problems with modern yacc/lex + implementations. + + * amd/conf_parse.y: move ALLOCA checks out of yacc code. Fixes to + avoid problems with modern yacc/lex implementations. + + * configure.in: search for gdbm/ndbm.h. Add logic to deal with + db/ndbm/gdbm mess. + +2004-01-20 Ion Badulescu + + * amd/conf.c (gopt_nfs_allow_insecure_port): support function for + the new "nfs_allow_insecure_port" amd.conf directive + + * amd/nfs_prot_svc.c (nfs_program_2): complain about the insecure + port and drop the request only if the "nfs_allow_insecure_port" + option is not set in amd.conf + + * doc/am-utils.texi (Global Parameters): documented the new + amd.conf directive "nfs_allow_insecure_port" + + * scripts/amd.conf.5 (nfs_allow_insecure_port): ditto + + * scripts/amd.conf-sample (nfs_allow_insecure_port): added the + "nfs_allow_insecure_port" directive + +2004-01-20 Erez Zadok + + * doc/am-utils.texi: amd-workers is defunct. + +2004-01-19 Erez Zadok + + * cvs-server.txt: updated instructions + +2004-01-18 Erez Zadok + + * minor new port: i386-unknown-freebsd5.2. + + * hlfsd/hlfsd.c (hlfsd_init), amd/amq_subr.c + (amqproc_mnttree_1_svc, amqproc_stats_1_svc, + amqproc_getmntfs_1_svc, xdr_amq_mount_tree): force double casting + to avoid gcc-3.3 complaints on Solaris 9 about "dereferencing + type-punned pointer will break strict-aliasing rules". + +2004-01-06 Erez Zadok + + * minor new port: i386-unknown-freebsd4.9. + + * include/am_defs.h: Don't include malloc.h if stdlib.h exists, + because modern systems (e.g., BSD) complain if you use malloc.h + instead of stdlib.h. Let's hope there are no systems out + there that need both. + +2004-01-05 Erez Zadok + + * MIRRORS.{txt,html}: verify each mirror site, update to new + locations (if found), and remove stale mirrors URLs. + + * updated copyright year to 2004 on all files. + + * Makefile.am (install-snapshot): new directory to install + snapshots (now that am-utils home page is moved). + + * INSTALL, README.autofs: remove forced text-mode. + + * doc/am-utils.texi: fix Amd book URL. + + * Makefile.am (EXTRA_DIST): include new mirror files in tarball. + + * AUTHORS, BUGS, README, README.y2k, configure.in, + doc/am-utils.texi: revisions to use newer URLs for Web site, FTP, + and mailing lists. + + * MIRRORS.{html,txt}: copied from 6.1 branch. + + * doc/Makefile.am: install mirror lists officially. + +2003-10-21 Ion Badulescu + + * buildall: added support for -i (make install), other fixes from + the trunk + 2003-08-27 Ion Badulescu * conf/nfs_prot/nfs_prot_freebsd3.h (na_uid): freebsd4.5 uses nfs diff --git a/contrib/amd/INSTALL b/contrib/amd/INSTALL index 20ef94a418b7..25f75d711583 100644 --- a/contrib/amd/INSTALL +++ b/contrib/amd/INSTALL @@ -111,7 +111,7 @@ sparc64-unknown-linux-suse7.3 ezk[0] ezk ezk ezk EMAIL ID LEGEND: -bking: Bevis R W King +bking: Bevis R W King dsr: Dan Riley ezk: Erez Zadok finkel: Raphael Finkel diff --git a/contrib/amd/MIRRORS.html b/contrib/amd/MIRRORS.html new file mode 100644 index 000000000000..0deeefe32c77 --- /dev/null +++ b/contrib/amd/MIRRORS.html @@ -0,0 +1,106 @@ + + + + + Am-Utils 6.x Mirror Sites + + + +
+

Am-Utils 6.x Software Mirror Sites

+ +Note: in case of any problems accessing the individual FTP sites, please +contact their respective maintainers. If you wish to be added to the +official mirror list, please send mail to am-utils-developers@am-utils.org with the +full URL, maintainer's email, and geographical location. + +

+ +

North America

+ + +

Europe

+ + +

Asia

+ + +
+ Last updated: Jan 5, 2004 + + + + + diff --git a/contrib/amd/MIRRORS.txt b/contrib/amd/MIRRORS.txt new file mode 100644 index 000000000000..b5093e8f4aa4 --- /dev/null +++ b/contrib/amd/MIRRORS.txt @@ -0,0 +1,60 @@ + AM-UTILS-6.x MIRRORS + +Note: in case of any problems accessing the individual FTP sites, please +contact their respective maintainers. If you wish to be added to the +official mirror list, please send mail to am-utils-developers@am-utils.org +with the full URL, maintainer's email, and geographical location. + +U.S.A: + New York (Stony Brook, Primary Site): + ftp://ftp.am-utils.org/pub/am-utils + Maintainer: ezk@am-utils.org + Minnesota: + ftp://ftp.cs.umn.edu/pub/am-utils + Maintainer: dokas@cs.umn.edu +#Avoid for now: empty directory +# Virginia (Newport News): +# ftp://ftp.ferginc.com/pub/unix/am-utils +# Maintainer: Branson.Matheson@FergInc.com +#server gone? (Jan 5, 2004) +# Ohio (Kent State University): +# ftp://info.mcs.kent.edu/pub/am-utils +# Maintainer: root@mcs.kent.edu + Florida (University of Florida) + ftp://ftp.cise.ufl.edu/pub/mirrors/am-utils + Maintainer: mirror@cise.ufl.edu + +Europe: + Germany: + ftp://ftp.fu-berlin.de/unix/network/am-utils + Maintainer: ftp-adm@ftp.fu-berlin.de + Germany: + ftp://ftp.tu-darmstadt.de/pub/networking/filesystems/am-utils/ + Maintainer: networking@ftp.tu-darmstadt.de + Sweden: + ftp://ftp.sunet.se/pub/unix/admin/am-utils + Maintainer: archive@ftp.sunet.se +# not responding (Jan 5, 2004) +# Sweden (Stockholm University, Math Depat): +# ftp://mirror.matematik.su.se/pub/am-utils +# Maintainer: leifj@matematik.su.se + UK: + ftp://sunsite.org.uk/package/am-utils + Maintainer: lmjm@icparc.ic.ac.uk + +Asia: + Japan: + ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils + Maintainer: ftp-admin@u-aizu.ac.jp + Japan: + ftp://core.ring.gr.jp/pub/net/am-utils/ + Maintainer: ftpadmin@ring.gr.jp + Japan: + ftp://ftp.ring.gr.jp/pub/net/am-utils/ + Maintainer: ftpadmin@ring.gr.jp + +# gone? (Jan 5, 2004) +# Australia: +# Melbourne: +# ftp://ftp.sage-au.org.au/pub/network/filesystem/am-utils +# Maintainer: mirror@ftp.sage-au.org.au diff --git a/contrib/amd/NEWS b/contrib/amd/NEWS index 7439f786500a..60d58a990508 100644 --- a/contrib/amd/NEWS +++ b/contrib/amd/NEWS @@ -4,10 +4,18 @@ ia64-unknown-linux-rh2.1AS (Red Hat Itanium Advanced Server) i386-unknown-freebsd5.0 (5.0-RELEASE) sparc64-unknown-linux-suse7.3 + i386-unknown-freebsd4.9 + i386-unknown-freebsd5.2 (5.2-RELEASE) + +- new amd.conf directive "nfs_allow_insecure_port". Used to work around + bugs in certain kernels, which cause them to try and talk to amd from + unprivileged ports. - bug fixes: rename log() in fsinfo to avoid glibc/gcc-3.3 conflict am_pref free NULL pointer + compiles with modern bison/flex versions + handles sites with various combos of db, n/dbm, and gdbm *** Notes specific to am-utils version 6.0.9: diff --git a/contrib/amd/README b/contrib/amd/README index 2b91b9d339ec..0b3ce46beb63 100644 --- a/contrib/amd/README +++ b/contrib/amd/README @@ -1,5 +1,3 @@ -# -*- text -*- - This is the official version of am-utils. See the file NEWS for news on this and previous releases. @@ -96,7 +94,7 @@ before. Let me know if you are having any problems with them. I fully expect, at least initially, to have to be the sole developers of the M4 macros and let others concentrate on C sources. -[E] Report all bugs to amd-dev@cs.columbia.edu. Avoid reporting to my +[E] Report all bugs to am-utils@am-utils.org. Avoid reporting to my personal email address. It is important to involve the whole list in bug fixes etc. diff --git a/contrib/amd/README.y2k b/contrib/amd/README.y2k index 4a87a180f0d9..e75bd122590e 100644 --- a/contrib/amd/README.y2k +++ b/contrib/amd/README.y2k @@ -1,4 +1,3 @@ -# -*- text -*- AM-UTILS YEAR-2000 COMPLIANCE Most likely am-utils is y2k compliant. @@ -18,12 +17,11 @@ code scanner and manually "eyeballed" the code and could not find any more problems. Paul's patch is included in am-utils-6.0.1s7 and newer versions. Paul also said that other 2-digit years used in am-utils are "harmless." - NOTE: NONE OF THE PERSONS MENTIONED HERE, AUTHOR INCLUDED, ARE WILLING TO CERTIFY AM-UTILS AS Y2K COMPLIANT. USE AT YOUR OWN RISK. --- Erez Zadok. -Maintainer, am-utils package and AMD-DEV list. -Email: amd-dev-owner@majordomo.cs.columbia.edu +Maintainer, am-utils package and am-utils list. +Email: am-utils@am-utils.org WWW: http://www.am-utils.org diff --git a/contrib/amd/amd/am_ops.c b/contrib/amd/amd/am_ops.c index bc975174008f..3097aee67703 100644 --- a/contrib/amd/amd/am_ops.c +++ b/contrib/amd/amd/am_ops.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_ops.c,v 1.6.2.6 2002/12/27 22:44:28 ezk Exp $ + * $Id: am_ops.c,v 1.6.2.7 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8 index ff2bfc23ee90..a3967a67c7b7 100644 --- a/contrib/amd/amd/amd.8 +++ b/contrib/amd/amd/amd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amd.8,v 1.4.2.4 2003/03/16 01:46:59 ezk Exp $ +.\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ .\" .TH AMD 8 "3 November 1989" .SH NAME diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c index 6f0374afc1a8..e2631aed2b68 100644 --- a/contrib/amd/amd/amd.c +++ b/contrib/amd/amd/amd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amd.c,v 1.8.2.5 2002/12/27 22:44:29 ezk Exp $ + * $Id: amd.c,v 1.8.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amd.h b/contrib/amd/amd/amd.h index d8a37524ebce..e5e4e445c790 100644 --- a/contrib/amd/amd/amd.h +++ b/contrib/amd/amd/amd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amd.h,v 1.8.2.6 2002/12/27 22:44:29 ezk Exp $ + * $Id: amd.h,v 1.8.2.8 2004/01/21 04:04:58 ib42 Exp $ * */ @@ -62,6 +62,7 @@ #define CFM_FULLY_QUALIFIED_HOSTS 0x0100 #define CFM_BROWSABLE_DIRS_FULL 0x0200 /* allow '/' in readdir() */ #define CFM_UNMOUNT_ON_EXIT 0x0400 /* when amd finishing */ +#define CFM_NFS_INSECURE_PORT 0x0800 /* some systems (SunOS 4.x) neglect to define the mount null message */ #ifndef MOUNTPROC_NULL diff --git a/contrib/amd/amd/amfs_auto.c b/contrib/amd/amd/amfs_auto.c index 995b83745ec6..ad0539309a79 100644 --- a/contrib/amd/amd/amfs_auto.c +++ b/contrib/amd/amd/amfs_auto.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_auto.c,v 1.9.2.11 2003/07/18 04:50:18 ezk Exp $ + * $Id: amfs_auto.c,v 1.9.2.12 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_direct.c b/contrib/amd/amd/amfs_direct.c index 427c7ae07095..2ea0ae6ce2ca 100644 --- a/contrib/amd/amd/amfs_direct.c +++ b/contrib/amd/amd/amfs_direct.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_direct.c,v 1.3.2.3 2002/12/27 22:44:30 ezk Exp $ + * $Id: amfs_direct.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_error.c b/contrib/amd/amd/amfs_error.c index eab09fe7c299..ca6203390e91 100644 --- a/contrib/amd/amd/amfs_error.c +++ b/contrib/amd/amd/amfs_error.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_error.c,v 1.3.2.4 2002/12/27 22:44:30 ezk Exp $ + * $Id: amfs_error.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_host.c b/contrib/amd/amd/amfs_host.c index ef8b900c18b4..ad0887ccf0c8 100644 --- a/contrib/amd/amd/amfs_host.c +++ b/contrib/amd/amd/amfs_host.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_host.c,v 1.4.2.6 2002/12/27 22:44:30 ezk Exp $ + * $Id: amfs_host.c,v 1.4.2.7 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_inherit.c b/contrib/amd/amd/amfs_inherit.c index d2fbe03718cc..3e86c4d18771 100644 --- a/contrib/amd/amd/amfs_inherit.c +++ b/contrib/amd/amd/amfs_inherit.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_inherit.c,v 1.3.2.3 2002/12/27 22:44:31 ezk Exp $ + * $Id: amfs_inherit.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_link.c b/contrib/amd/amd/amfs_link.c index f0fe5b48ed0e..55552ae91d5d 100644 --- a/contrib/amd/amd/amfs_link.c +++ b/contrib/amd/amd/amfs_link.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_link.c,v 1.3.2.3 2002/12/27 22:44:31 ezk Exp $ + * $Id: amfs_link.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_linkx.c b/contrib/amd/amd/amfs_linkx.c index b6dc540bed85..c7c9b7998ca7 100644 --- a/contrib/amd/amd/amfs_linkx.c +++ b/contrib/amd/amd/amfs_linkx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_linkx.c,v 1.3.2.3 2002/12/27 22:44:31 ezk Exp $ + * $Id: amfs_linkx.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_nfsl.c b/contrib/amd/amd/amfs_nfsl.c index 4299e219f84b..bed6f4db438e 100644 --- a/contrib/amd/amd/amfs_nfsl.c +++ b/contrib/amd/amd/amfs_nfsl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_nfsl.c,v 1.4.2.3 2002/12/27 22:44:31 ezk Exp $ + * $Id: amfs_nfsl.c,v 1.4.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_nfsx.c b/contrib/amd/amd/amfs_nfsx.c index e565542f2f7f..7d8949bcd171 100644 --- a/contrib/amd/amd/amfs_nfsx.c +++ b/contrib/amd/amd/amfs_nfsx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_nfsx.c,v 1.3.2.4 2002/12/27 22:44:32 ezk Exp $ + * $Id: amfs_nfsx.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_program.c b/contrib/amd/amd/amfs_program.c index 95a89c08feac..795c596bef8e 100644 --- a/contrib/amd/amd/amfs_program.c +++ b/contrib/amd/amd/amfs_program.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_program.c,v 1.6.2.3 2002/12/27 22:44:32 ezk Exp $ + * $Id: amfs_program.c,v 1.6.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_root.c b/contrib/amd/amd/amfs_root.c index 0e61f9435bce..9d121bb4662f 100644 --- a/contrib/amd/amd/amfs_root.c +++ b/contrib/amd/amd/amfs_root.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_root.c,v 1.3.2.3 2002/12/27 22:44:32 ezk Exp $ + * $Id: amfs_root.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_toplvl.c b/contrib/amd/amd/amfs_toplvl.c index 301fa004216b..c0e7604b2292 100644 --- a/contrib/amd/amd/amfs_toplvl.c +++ b/contrib/amd/amd/amfs_toplvl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_toplvl.c,v 1.7.2.4 2002/12/27 22:44:32 ezk Exp $ + * $Id: amfs_toplvl.c,v 1.7.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amfs_union.c b/contrib/amd/amd/amfs_union.c index cb3f061392fc..2a74d8cb43d7 100644 --- a/contrib/amd/amd/amfs_union.c +++ b/contrib/amd/amd/amfs_union.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amfs_union.c,v 1.3.2.4 2002/12/27 22:44:33 ezk Exp $ + * $Id: amfs_union.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/amq_subr.c b/contrib/amd/amd/amq_subr.c index 1c4170f39d8e..d0e49bad43a6 100644 --- a/contrib/amd/amd/amq_subr.c +++ b/contrib/amd/amd/amq_subr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_subr.c,v 1.6.2.4 2002/12/27 22:44:33 ezk Exp $ + * $Id: amq_subr.c,v 1.6.2.6 2004/01/19 00:25:55 ezk Exp $ * */ /* @@ -74,7 +74,7 @@ amqproc_mnttree_1_svc(voidp argp, struct svc_req *rqstp) static am_node *mp; mp = find_ap(*(char **) argp); - return (amq_mount_tree_p *) ∓ + return (amq_mount_tree_p *) ((void *)&mp); } @@ -100,7 +100,7 @@ amqproc_umnt_1_svc(voidp argp, struct svc_req *rqstp) amq_mount_stats * amqproc_stats_1_svc(voidp argp, struct svc_req *rqstp) { - return (amq_mount_stats *) &amd_stats; + return (amq_mount_stats *) ((void *)&amd_stats); } @@ -168,7 +168,7 @@ amqproc_setopt_1_svc(voidp argp, struct svc_req *rqstp) amq_mount_info_list * amqproc_getmntfs_1_svc(voidp argp, struct svc_req *rqstp) { - return (amq_mount_info_list *) &mfhead; /* XXX */ + return (amq_mount_info_list *) ((void *)&mfhead); /* XXX */ } @@ -285,7 +285,7 @@ xdr_amq_mount_tree(XDR *xdrs, amq_mount_tree *objp) if (!xdr_amq_mount_tree_node(xdrs, objp)) { return (FALSE); } - if (!xdr_pointer(xdrs, (char **) &mnil, sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { + if (!xdr_pointer(xdrs, (char **) ((void *)&mnil), sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { return (FALSE); } if (!xdr_pointer(xdrs, (char **) &mp->am_child, sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { diff --git a/contrib/amd/amd/amq_svc.c b/contrib/amd/amd/amq_svc.c index f6df24b55a07..84685676fa38 100644 --- a/contrib/amd/amd/amq_svc.c +++ b/contrib/amd/amd/amq_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_svc.c,v 1.4.2.4 2002/12/27 22:44:33 ezk Exp $ + * $Id: amq_svc.c,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/autil.c b/contrib/amd/amd/autil.c index b45f41dd36fc..bb439187bf07 100644 --- a/contrib/amd/amd/autil.c +++ b/contrib/amd/amd/autil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: autil.c,v 1.4.2.5 2003/04/14 01:23:09 ezk Exp $ + * $Id: autil.c,v 1.4.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/clock.c b/contrib/amd/amd/clock.c index c4defc8fee2f..9f1a06820a07 100644 --- a/contrib/amd/amd/clock.c +++ b/contrib/amd/amd/clock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: clock.c,v 1.4.2.3 2002/12/27 22:44:33 ezk Exp $ + * $Id: clock.c,v 1.4.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/conf.c b/contrib/amd/amd/conf.c index 3b1d35c19d27..90bbdda8cbd7 100644 --- a/contrib/amd/amd/conf.c +++ b/contrib/amd/amd/conf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: conf.c,v 1.7.2.6 2002/12/27 22:44:34 ezk Exp $ + * $Id: conf.c,v 1.7.2.8 2004/01/21 04:04:58 ib42 Exp $ * */ @@ -98,6 +98,7 @@ static int gopt_map_type(const char *val); static int gopt_mount_type(const char *val); static int gopt_pid_file(const char *val); static int gopt_portmap_program(const char *val); +static int gopt_nfs_allow_insecure_port(const char *val); static int gopt_nfs_proto(const char *val); static int gopt_nfs_retransmit_counter(const char *val); static int gopt_nfs_retry_interval(const char *val); @@ -156,6 +157,7 @@ static struct _func_map glob_functable[] = { {"mount_type", gopt_mount_type}, {"pid_file", gopt_pid_file}, {"portmap_program", gopt_portmap_program}, + {"nfs_allow_insecure_port", gopt_nfs_allow_insecure_port}, {"nfs_proto", gopt_nfs_proto}, {"nfs_retransmit_counter", gopt_nfs_retransmit_counter}, {"nfs_retry_interval", gopt_nfs_retry_interval}, @@ -599,6 +601,22 @@ gopt_portmap_program(const char *val) } +static int +gopt_nfs_allow_insecure_port(const char *val) +{ + if (STREQ(val, "yes")) { + gopt.flags |= CFM_NFS_INSECURE_PORT; + return 0; + } else if (STREQ(val, "no")) { + gopt.flags &= ~CFM_NFS_INSECURE_PORT; + return 0; + } + + fprintf(stderr, "conf: unknown value to nfs_allow_insecure_port \"%s\"\n", val); + return 1; /* unknown value */ +} + + static int gopt_nfs_proto(const char *val) { diff --git a/contrib/amd/amd/conf_parse.y b/contrib/amd/amd/conf_parse.y index ceee79e8b5fe..992d321f1c54 100644 --- a/contrib/amd/amd/conf_parse.y +++ b/contrib/amd/amd/conf_parse.y @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -36,9 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: conf_parse.y,v 1.4.2.3 2002/12/27 22:44:34 ezk Exp $ + * $Id: conf_parse.y,v 1.4.2.5 2004/05/12 15:54:31 ezk Exp $ * */ @@ -49,24 +48,8 @@ #include #include -/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include -# else /* not HAVE_ALLOCA_H */ -# ifdef _AIX -#pragma alloca -# else /* not _AIX */ -# ifndef alloca - /* predefined by HP cc +Olibcalls */ -voidp alloca(); -# endif /* not alloca */ -# endif /* not _AIX */ -# endif /* not HAVE_ALLOCA_H */ -#endif /* not __GNUC__ */ - extern char *yytext; -extern int yylineno; +extern int ayylineno; extern int yylex(void); static int yyerror(const char *s); @@ -78,12 +61,12 @@ static char *header_section = NULL; /* start with no header section */ #define PARSE_DEBUG 0 #if PARSE_DEBUG -# define dprintf(f,s) fprintf(stderr, (f), yylineno, (s)) +# define dprintf(f,s) fprintf(stderr, (f), ayylineno, (s)) # define amu_return(v) -#else +#else /* not PARSE_DEBUG */ # define dprintf(f,s) # define amu_return(v) return((v)) -#endif /* PARSE_DEBUG */ +#endif /* not PARSE_DEBUG */ %} @@ -168,7 +151,7 @@ static int yyerror(const char *s) { fprintf(stderr, "AMDCONF: %s on line %d (section %s)\n", - s, yylineno, + s, ayylineno, (header_section ? header_section : "null")); exit(1); return 1; /* to full compilers that insist on a return statement */ diff --git a/contrib/amd/amd/conf_tok.l b/contrib/amd/amd/conf_tok.l index 6b41151eb08a..2216993fb844 100644 --- a/contrib/amd/amd/conf_tok.l +++ b/contrib/amd/amd/conf_tok.l @@ -1,6 +1,6 @@ %{ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -37,9 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: conf_tok.l,v 1.3.2.3 2002/12/27 22:44:34 ezk Exp $ + * $Id: conf_tok.l,v 1.3.2.5 2004/05/12 15:54:31 ezk Exp $ * */ @@ -77,9 +76,10 @@ # ifndef ECHO # define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) # endif /* not ECHO */ -int yylineno = 0; #endif /* FLEX_SCANNER */ +int ayylineno = 0; + int yylex(void); /* * some systems such as DU-4.x have a different GNU flex in /usr/bin @@ -93,19 +93,25 @@ int yywrap(void); #define TOK_DEBUG 0 #if TOK_DEBUG -# define dprintf(f,s) fprintf(stderr, (f), yylineno, (s)) +# define dprintf(f,s) fprintf(stderr, (f), ayylineno, (s)) # define amu_return(v) -#else +#else /* not TOK_DEBUG */ # define dprintf(f,s) # define amu_return(v) return((v)) -#endif /* TOK_DEBUG */ +#endif /* not TOK_DEBUG */ -/* no need to use yyunput() or yywrap() */ -#define YY_NO_UNPUT +/* no need to use yywrap() */ #define YY_SKIP_YYWRAP %} +/* This option causes Solaris lex to fail. Use flex. See BUGS file */ +/* no need to use yyunput() */ +%option nounput + +/* allocate more output slots so lex scanners don't run out of mem */ +%o 1024 + DIGIT [0-9] ALPHA [A-Za-z] ALPHANUM [A-Za-z0-9] @@ -119,7 +125,7 @@ NONQUOTE [^\"] %% \n { - yylineno++; + ayylineno++; amu_return(NEWLINE); } @@ -146,7 +152,7 @@ NONQUOTE [^\"] } "#"[^\n]*\n { /* a comment line includes the terminating \n */ - yylineno++; + ayylineno++; yytext[strlen((char *)yytext)-1] = '\0'; dprintf("%8d: Comment \"%s\"\n", yytext); } diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c index c0280f7940b5..df85683ae931 100644 --- a/contrib/amd/amd/get_args.c +++ b/contrib/amd/amd/get_args.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: get_args.c,v 1.7.2.5 2002/12/27 22:44:34 ezk Exp $ + * $Id: get_args.c,v 1.7.2.6 2004/01/06 03:15:16 ezk Exp $ * */ @@ -85,7 +85,7 @@ get_version_string(void) vers = xmalloc(2048 + wire_buf_len); sprintf(vers, "%s\n%s\n%s\n%s\n", - "Copyright (c) 1997-2003 Erez Zadok", + "Copyright (c) 1997-2004 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."); diff --git a/contrib/amd/amd/info_file.c b/contrib/amd/amd/info_file.c index 4cbbe15ca0f2..8f78868d1dce 100644 --- a/contrib/amd/amd/info_file.c +++ b/contrib/amd/amd/info_file.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_file.c,v 1.3.2.4 2002/12/27 22:44:35 ezk Exp $ + * $Id: info_file.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_hesiod.c b/contrib/amd/amd/info_hesiod.c index 9ada82a923ce..fdcdd569209d 100644 --- a/contrib/amd/amd/info_hesiod.c +++ b/contrib/amd/amd/info_hesiod.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_hesiod.c,v 1.6.2.3 2002/12/27 22:44:35 ezk Exp $ + * $Id: info_hesiod.c,v 1.6.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_ldap.c b/contrib/amd/amd/info_ldap.c index 08c7bf991b68..77ae9c4461db 100644 --- a/contrib/amd/amd/info_ldap.c +++ b/contrib/amd/amd/info_ldap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_ldap.c,v 1.9.2.8 2003/08/22 04:47:21 ib42 Exp $ + * $Id: info_ldap.c,v 1.9.2.9 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_ndbm.c b/contrib/amd/amd/info_ndbm.c index ee1e2e86190a..bd92c137f7cf 100644 --- a/contrib/amd/amd/info_ndbm.c +++ b/contrib/amd/amd/info_ndbm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_ndbm.c,v 1.3.2.3 2002/12/27 22:44:37 ezk Exp $ + * $Id: info_ndbm.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_nis.c b/contrib/amd/amd/info_nis.c index 43c80b8ad0d9..b59123f78cfc 100644 --- a/contrib/amd/amd/info_nis.c +++ b/contrib/amd/amd/info_nis.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_nis.c,v 1.6.2.4 2002/12/27 22:44:37 ezk Exp $ + * $Id: info_nis.c,v 1.6.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_nisplus.c b/contrib/amd/amd/info_nisplus.c index d2fbe05bfd77..46018bccd229 100644 --- a/contrib/amd/amd/info_nisplus.c +++ b/contrib/amd/amd/info_nisplus.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_nisplus.c,v 1.3.2.4 2002/12/27 22:44:37 ezk Exp $ + * $Id: info_nisplus.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_passwd.c b/contrib/amd/amd/info_passwd.c index 33eb58d527a0..a14ac120acff 100644 --- a/contrib/amd/amd/info_passwd.c +++ b/contrib/amd/amd/info_passwd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_passwd.c,v 1.3.2.3 2002/12/27 22:44:38 ezk Exp $ + * $Id: info_passwd.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/info_union.c b/contrib/amd/amd/info_union.c index 2ede12ede0c7..8613f6290099 100644 --- a/contrib/amd/amd/info_union.c +++ b/contrib/amd/amd/info_union.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: info_union.c,v 1.3.2.3 2002/12/27 22:44:38 ezk Exp $ + * $Id: info_union.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/map.c b/contrib/amd/amd/map.c index 4e83a08594b9..dfec3a1038ee 100644 --- a/contrib/amd/amd/map.c +++ b/contrib/amd/amd/map.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: map.c,v 1.6.2.7 2002/12/27 22:44:38 ezk Exp $ + * $Id: map.c,v 1.6.2.8 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/mapc.c b/contrib/amd/amd/mapc.c index 3d295f7ff55e..591c4f3cd49f 100644 --- a/contrib/amd/amd/mapc.c +++ b/contrib/amd/amd/mapc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mapc.c,v 1.7.2.6 2002/12/27 22:44:38 ezk Exp $ + * $Id: mapc.c,v 1.7.2.7 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/mntfs.c b/contrib/amd/amd/mntfs.c index 93df74cb1457..02bcae3aa1de 100644 --- a/contrib/amd/amd/mntfs.c +++ b/contrib/amd/amd/mntfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mntfs.c,v 1.5.2.4 2002/12/27 22:44:39 ezk Exp $ + * $Id: mntfs.c,v 1.5.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/nfs_prot_svc.c b/contrib/amd/amd/nfs_prot_svc.c index 9a758c4ae77e..39d1d4562eea 100644 --- a/contrib/amd/amd/nfs_prot_svc.c +++ b/contrib/amd/amd/nfs_prot_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_svc.c,v 1.5.2.4 2002/12/27 22:44:39 ezk Exp $ + * $Id: nfs_prot_svc.c,v 1.5.2.6 2004/01/21 04:04:58 ib42 Exp $ * */ @@ -104,7 +104,8 @@ nfs_program_2(struct svc_req *rqstp, SVCXPRT *transp) sinp = amu_svc_getcaller(rqstp->rq_xprt); #ifdef MNT2_NFS_OPT_RESVPORT /* Verify that the request comes from a reserved port */ - if (ntohs(sinp->sin_port) >= IPPORT_RESERVED) { + if (ntohs(sinp->sin_port) >= IPPORT_RESERVED) && + !(gopt.flags & CFM_NFS_INSECURE_PORT)) { plog(XLOG_WARNING, "ignoring request from %s:%u, port not reserved", inet_dquad(dq, sinp->sin_addr.s_addr), ntohs(sinp->sin_port)); diff --git a/contrib/amd/amd/nfs_start.c b/contrib/amd/amd/nfs_start.c index d48461076da8..1bf6df144e8a 100644 --- a/contrib/amd/amd/nfs_start.c +++ b/contrib/amd/amd/nfs_start.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_start.c,v 1.5.2.6 2002/12/27 22:44:39 ezk Exp $ + * $Id: nfs_start.c,v 1.5.2.7 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/nfs_subr.c b/contrib/amd/amd/nfs_subr.c index ea38a2f650f9..c216b3e524c2 100644 --- a/contrib/amd/amd/nfs_subr.c +++ b/contrib/amd/amd/nfs_subr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_subr.c,v 1.6.2.5 2002/12/27 22:44:39 ezk Exp $ + * $Id: nfs_subr.c,v 1.6.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_TEMPLATE.c b/contrib/amd/amd/ops_TEMPLATE.c index 4c23d5432b7b..dcec2808687a 100644 --- a/contrib/amd/amd/ops_TEMPLATE.c +++ b/contrib/amd/amd/ops_TEMPLATE.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_TEMPLATE.c,v 1.3.2.4 2002/12/27 22:44:40 ezk Exp $ + * $Id: ops_TEMPLATE.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_cachefs.c b/contrib/amd/amd/ops_cachefs.c index 02e5420a51ef..08c48759664e 100644 --- a/contrib/amd/amd/ops_cachefs.c +++ b/contrib/amd/amd/ops_cachefs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_cachefs.c,v 1.3.2.3 2002/12/27 22:44:40 ezk Exp $ + * $Id: ops_cachefs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_cdfs.c b/contrib/amd/amd/ops_cdfs.c index e9206096b650..6487e6d07903 100644 --- a/contrib/amd/amd/ops_cdfs.c +++ b/contrib/amd/amd/ops_cdfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_cdfs.c,v 1.4.2.4 2002/12/27 22:44:40 ezk Exp $ + * $Id: ops_cdfs.c,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_efs.c b/contrib/amd/amd/ops_efs.c index 453bf2535a37..36f47ed8d37f 100644 --- a/contrib/amd/amd/ops_efs.c +++ b/contrib/amd/amd/ops_efs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_efs.c,v 1.3.2.4 2002/12/27 22:44:40 ezk Exp $ + * $Id: ops_efs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_lofs.c b/contrib/amd/amd/ops_lofs.c index 1acf92c575a3..6d27d2c4c974 100644 --- a/contrib/amd/amd/ops_lofs.c +++ b/contrib/amd/amd/ops_lofs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_lofs.c,v 1.3.2.4 2002/12/27 22:44:41 ezk Exp $ + * $Id: ops_lofs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_mfs.c b/contrib/amd/amd/ops_mfs.c index 4c4ae1104251..67d6e98ef8f7 100644 --- a/contrib/amd/amd/ops_mfs.c +++ b/contrib/amd/amd/ops_mfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_mfs.c,v 1.3.2.3 2002/12/27 22:44:41 ezk Exp $ + * $Id: ops_mfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_nfs.c b/contrib/amd/amd/ops_nfs.c index 8a14c27cb0e2..5f6a47454a1e 100644 --- a/contrib/amd/amd/ops_nfs.c +++ b/contrib/amd/amd/ops_nfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_nfs.c,v 1.6.2.5 2002/12/27 22:44:41 ezk Exp $ + * $Id: ops_nfs.c,v 1.6.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_nfs3.c b/contrib/amd/amd/ops_nfs3.c index a9b1170f6a44..8da2cb13cd35 100644 --- a/contrib/amd/amd/ops_nfs3.c +++ b/contrib/amd/amd/ops_nfs3.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_nfs3.c,v 1.3.2.3 2002/12/27 22:44:41 ezk Exp $ + * $Id: ops_nfs3.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_nullfs.c b/contrib/amd/amd/ops_nullfs.c index 7dbf583e698f..0ecb1a9a7073 100644 --- a/contrib/amd/amd/ops_nullfs.c +++ b/contrib/amd/amd/ops_nullfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_nullfs.c,v 1.3.2.3 2002/12/27 22:44:41 ezk Exp $ + * $Id: ops_nullfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_pcfs.c b/contrib/amd/amd/ops_pcfs.c index 95dd31f192b5..f148e6d5e511 100644 --- a/contrib/amd/amd/ops_pcfs.c +++ b/contrib/amd/amd/ops_pcfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_pcfs.c,v 1.3.2.4 2002/12/27 22:44:42 ezk Exp $ + * $Id: ops_pcfs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_tfs.c b/contrib/amd/amd/ops_tfs.c index b6544783ecfd..911c01c4474f 100644 --- a/contrib/amd/amd/ops_tfs.c +++ b/contrib/amd/amd/ops_tfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_tfs.c,v 1.3.2.3 2002/12/27 22:44:42 ezk Exp $ + * $Id: ops_tfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_tmpfs.c b/contrib/amd/amd/ops_tmpfs.c index f2fcdc3e8856..ca2d515f0515 100644 --- a/contrib/amd/amd/ops_tmpfs.c +++ b/contrib/amd/amd/ops_tmpfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_tmpfs.c,v 1.3.2.3 2002/12/27 22:44:42 ezk Exp $ + * $Id: ops_tmpfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_ufs.c b/contrib/amd/amd/ops_ufs.c index f2dbd3d5a8c6..999a66918d4e 100644 --- a/contrib/amd/amd/ops_ufs.c +++ b/contrib/amd/amd/ops_ufs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_ufs.c,v 1.3.2.4 2002/12/27 22:44:42 ezk Exp $ + * $Id: ops_ufs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_umapfs.c b/contrib/amd/amd/ops_umapfs.c index eb37dd731690..65e99cbf9583 100644 --- a/contrib/amd/amd/ops_umapfs.c +++ b/contrib/amd/amd/ops_umapfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_umapfs.c,v 1.3.2.3 2002/12/27 22:44:43 ezk Exp $ + * $Id: ops_umapfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_unionfs.c b/contrib/amd/amd/ops_unionfs.c index 10c12defaa83..52059a017472 100644 --- a/contrib/amd/amd/ops_unionfs.c +++ b/contrib/amd/amd/ops_unionfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_unionfs.c,v 1.3.2.3 2002/12/27 22:44:43 ezk Exp $ + * $Id: ops_unionfs.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/ops_xfs.c b/contrib/amd/amd/ops_xfs.c index 0f522eaf9b50..4c9010bab731 100644 --- a/contrib/amd/amd/ops_xfs.c +++ b/contrib/amd/amd/ops_xfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: ops_xfs.c,v 1.3.2.5 2002/12/27 22:44:43 ezk Exp $ + * $Id: ops_xfs.c,v 1.3.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/opts.c b/contrib/amd/amd/opts.c index 0d41554c0a88..92bceb21804d 100644 --- a/contrib/amd/amd/opts.c +++ b/contrib/amd/amd/opts.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: opts.c,v 1.8.2.6 2002/12/27 22:44:43 ezk Exp $ + * $Id: opts.c,v 1.8.2.7 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/restart.c b/contrib/amd/amd/restart.c index a0af1b9a80be..59902f6a59bc 100644 --- a/contrib/amd/amd/restart.c +++ b/contrib/amd/amd/restart.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: restart.c,v 1.3.2.3 2002/12/27 22:44:43 ezk Exp $ + * $Id: restart.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/rpc_fwd.c b/contrib/amd/amd/rpc_fwd.c index 36ff516cc8b4..5a5439c50fb2 100644 --- a/contrib/amd/amd/rpc_fwd.c +++ b/contrib/amd/amd/rpc_fwd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: rpc_fwd.c,v 1.3.2.4 2002/12/27 22:44:44 ezk Exp $ + * $Id: rpc_fwd.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/sched.c b/contrib/amd/amd/sched.c index 40fc5b507b0e..c32ef0fe0c39 100644 --- a/contrib/amd/amd/sched.c +++ b/contrib/amd/amd/sched.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: sched.c,v 1.4.2.4 2002/12/27 22:44:44 ezk Exp $ + * $Id: sched.c,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/srvr_amfs_auto.c b/contrib/amd/amd/srvr_amfs_auto.c index 390722831d3c..70c93bf1f83e 100644 --- a/contrib/amd/amd/srvr_amfs_auto.c +++ b/contrib/amd/amd/srvr_amfs_auto.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: srvr_amfs_auto.c,v 1.3.2.5 2002/12/27 22:44:44 ezk Exp $ + * $Id: srvr_amfs_auto.c,v 1.3.2.6 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amd/srvr_nfs.c b/contrib/amd/amd/srvr_nfs.c index d2b7a6245bd3..48e0789abecf 100644 --- a/contrib/amd/amd/srvr_nfs.c +++ b/contrib/amd/amd/srvr_nfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: srvr_nfs.c,v 1.7.2.10 2002/12/29 01:55:43 ib42 Exp $ + * $Id: srvr_nfs.c,v 1.7.2.11 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8 index 7f705a813b40..7ccfd7c0735c 100644 --- a/contrib/amd/amq/amq.8 +++ b/contrib/amd/amq/amq.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amq.8,v 1.3.2.7 2002/12/27 22:44:45 ezk Exp $ +.\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ .\" .TH AMQ 8 "25 April 1989" .SH NAME diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c index 98f70d8154c4..06574bf2fca4 100644 --- a/contrib/amd/amq/amq.c +++ b/contrib/amd/amq/amq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $ + * $Id: amq.c,v 1.7.2.9 2004/01/06 03:15:16 ezk Exp $ * */ @@ -48,13 +48,13 @@ #ifndef lint char copyright[] = "\ -@(#)Copyright (c) 1997-2003 Erez Zadok\n\ +@(#)Copyright (c) 1997-2004 Erez Zadok\n\ @(#)Copyright (c) 1990 Jan-Simon Pendry\n\ @(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\ @(#)Copyright (c) 1990 The Regents of the University of California.\n\ @(#)All rights reserved.\n"; #if __GNUC__ < 2 -static char rcsid[] = "$Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.7.2.9 2004/01/06 03:15:16 ezk Exp $"; static char sccsid[] = "%W% (Berkeley) %G%"; #endif /* __GNUC__ < 2 */ #endif /* not lint */ diff --git a/contrib/amd/amq/amq.h b/contrib/amd/amq/amq.h index 06293591c2df..4e2d78566b68 100644 --- a/contrib/amd/amq/amq.h +++ b/contrib/amd/amq/amq.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq.h,v 1.14.2.3 2002/12/27 22:44:45 ezk Exp $ + * $Id: amq.h,v 1.14.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amq/amq_clnt.c b/contrib/amd/amq/amq_clnt.c index 12a39dd9778f..37de00add895 100644 --- a/contrib/amd/amq/amq_clnt.c +++ b/contrib/amd/amq/amq_clnt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_clnt.c,v 1.3.2.3 2002/12/27 22:44:45 ezk Exp $ + * $Id: amq_clnt.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amq/amq_xdr.c b/contrib/amd/amq/amq_xdr.c index 7addddffe246..835b98d9ba88 100644 --- a/contrib/amd/amq/amq_xdr.c +++ b/contrib/amd/amq/amq_xdr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_xdr.c,v 1.3.2.3 2002/12/27 22:44:46 ezk Exp $ + * $Id: amq_xdr.c,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1 index 99fca6a26502..d7ddebd1fc9f 100644 --- a/contrib/amd/amq/pawd.1 +++ b/contrib/amd/amq/pawd.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: pawd.1,v 1.3.2.3 2002/12/27 22:44:46 ezk Exp $ +.\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ .\" .TH PAWD 1 "6 Jan 1998" .SH NAME diff --git a/contrib/amd/amq/pawd.c b/contrib/amd/amq/pawd.c index e9b2c64fdd9d..2d655d05cda4 100644 --- a/contrib/amd/amq/pawd.c +++ b/contrib/amd/amq/pawd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: pawd.c,v 1.6.2.3 2002/12/27 22:44:46 ezk Exp $ + * $Id: pawd.c,v 1.6.2.4 2004/01/06 03:15:16 ezk Exp $ * */ diff --git a/contrib/amd/bootstrap b/contrib/amd/bootstrap index 58f1df1c338a..f28953662a64 100755 --- a/contrib/amd/bootstrap +++ b/contrib/amd/bootstrap @@ -67,7 +67,7 @@ if test -s ${LOG}; then exit 2 fi # now prepare the real configure script -mv -f configure configure.old +test -f configure && mv -f configure configure.old mv -f configure.new configure chmod a+rx configure rm -f configure.old diff --git a/contrib/amd/conf/checkmount/checkmount_bsd44.c b/contrib/amd/conf/checkmount/checkmount_bsd44.c index b449ec42669b..abe8831d0b31 100644 --- a/contrib/amd/conf/checkmount/checkmount_bsd44.c +++ b/contrib/amd/conf/checkmount/checkmount_bsd44.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: checkmount_bsd44.c,v 1.3.2.3 2002/12/27 22:44:47 ezk Exp $ + * $Id: checkmount_bsd44.c,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $ * */ diff --git a/contrib/amd/conf/mtab/mtab_bsd.c b/contrib/amd/conf/mtab/mtab_bsd.c index 30ec41932a72..efe817a48e76 100644 --- a/contrib/amd/conf/mtab/mtab_bsd.c +++ b/contrib/amd/conf/mtab/mtab_bsd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mtab_bsd.c,v 1.3.2.4 2002/12/27 22:44:50 ezk Exp $ + * $Id: mtab_bsd.c,v 1.3.2.5 2004/01/06 03:15:19 ezk Exp $ * */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h index 53bb9063ff7e..e59602bb8cf9 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd2.h,v 1.3.2.3 2002/12/27 22:44:54 ezk Exp $ + * $Id: nfs_prot_freebsd2.h,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $ * */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index edecdf72b59f..4260080fa808 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.5.2.6 2003/08/27 19:35:16 ib42 Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $ * */ diff --git a/contrib/amd/conf/transp/transp_sockets.c b/contrib/amd/conf/transp/transp_sockets.c index 5ccd8c2c9c02..23ed3f7f11da 100644 --- a/contrib/amd/conf/transp/transp_sockets.c +++ b/contrib/amd/conf/transp/transp_sockets.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: transp_sockets.c,v 1.6.2.10 2003/04/23 14:27:34 ezk Exp $ + * $Id: transp_sockets.c,v 1.6.2.11 2004/01/06 03:15:20 ezk Exp $ * * Socket specific utilities. * -Erez Zadok diff --git a/contrib/amd/conf/umount/umount_bsd44.c b/contrib/amd/conf/umount/umount_bsd44.c index 9da517b6ff44..6ac4c0396259 100644 --- a/contrib/amd/conf/umount/umount_bsd44.c +++ b/contrib/amd/conf/umount/umount_bsd44.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: umount_bsd44.c,v 1.3.2.3 2002/12/27 22:45:01 ezk Exp $ + * $Id: umount_bsd44.c,v 1.3.2.4 2004/01/06 03:15:20 ezk Exp $ * */ diff --git a/contrib/amd/doc/am-utils.texi b/contrib/amd/doc/am-utils.texi index 8d2493d12ff1..65d1af30cc02 100644 --- a/contrib/amd/doc/am-utils.texi +++ b/contrib/amd/doc/am-utils.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c -@c Copyright (c) 1997-2003 Erez Zadok +@c Copyright (c) 1997-2004 Erez Zadok @c Copyright (c) 1989 Jan-Simon Pendry @c Copyright (c) 1989 Imperial College of Science, Technology & Medicine @c Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ @c @c %W% (Berkeley) %G% @c -@c $Id: am-utils.texi,v 1.21.2.28 2003/04/14 01:23:10 ezk Exp $ +@c $Id: am-utils.texi,v 1.21.2.32 2004/01/21 04:04:58 ib42 Exp $ @c @setfilename am-utils.info @@ -60,7 +60,7 @@ (Originally by Jan-Simon Pendry and Nick Williams) @page -Copyright @copyright{} 1997-2003 Erez Zadok +Copyright @copyright{} 1997-2004 Erez Zadok @* Copyright @copyright{} 1989 Jan-Simon Pendry @* @@ -93,7 +93,7 @@ For version @value{VERSION}, @value{UPDATED} @* (Originally by Jan-Simon Pendry and Nick Williams) -Copyright @copyright{} 1997-2003 Erez Zadok +Copyright @copyright{} 1997-2004 Erez Zadok @* Copyright @copyright{} 1989 Jan-Simon Pendry @* @@ -232,17 +232,25 @@ Revision 5.2 was part of the 4.3BSD Reno distribution. Revision 5.3bsdnet, a late alpha version of 5.3, was part of the BSD network version 2 distribution -Revision 6.0 was made independently by @email{ezk@@cs.columbia.edu,Erez -Zadok} at the @uref{http://www.cs.columbia.edu/,Computer Science -Department} of @uref{http://www.columbia.edu/,Columbia University}, as -part of his @uref{http://www.cs.columbia.edu/~ezk/research/tp/thesis_proposal.html,PhD thesis work}. @xref{History}, for more details. +Revision 6.0 was made independently by +@email{ezk@@cs.columbia.edu,Erez Zadok} at the Computer Science +Department of @uref{http://www.cs.columbia.edu/,Columbia University}, +as part of his +@uref{http://www.cs.columbia.edu/~ezk/research/tp/thesis_proposal.html,PhD +thesis work}. Am-utils (especially version 6.1) continues to be +developed and maintained at the +@uref{http://www.cs.sunysb.edu/,Computer Science Department} of +@uref{http://www.stonybrook.edu/,Stony Brook University}, as a service +to the user community. + +@xref{History}, for more details. @unnumberedsec Bug Reports @cindex Bug reports Before reporting a bug, see if it is a known one in the @uref{http://www.am-utils.org/BUGS.txt,bugs} file. -Send all bug reports to @email{amd-dev@@majordomo.cs.columbia.edu} +Send all bug reports to @email{am-utils@@am-utils.org} quoting the details of the release and your configuration. These can be obtained by running the command @samp{amd -v}. It would greatly help if you could provide a reproducible procedure for detecting the bug you are @@ -253,10 +261,10 @@ incorporated, however small, will get its author an honorable mention in the @uref{http://www.am-utils.org/AUTHORS.txt,authors file}. -@unnumberedsec Mailing List -@cindex Mailing list +@unnumberedsec Mailing Lists +@cindex Mailing lists -There are two mailing lists for people interested in keeping up-to-date +There are several mailing lists for people interested in keeping up-to-date with developments. @c ############### @@ -264,15 +272,7 @@ with developments. @enumerate @item -The older list, @samp{amd-workers} is for general "how to" questions and -announcements. To subscribe, send a note to -@email{amd-workers-request@@majordomo.glue.umd.edu}.@footnote{Note that -the older address, @email{amd-workers-request@@acl.lanl.gov}, is -defunct.} To post a message to this list, send mail to -@email{amd-workers@@majordomo.glue.umd.edu}. - -@item -The developers only list, @samp{amd-dev} is for +The users mailing list, @samp{am-utils} is for @itemize @minus @item @@ -285,22 +285,63 @@ discussions of new features for am-utils implementation and porting issues @end itemize -To subscribe, send a note to @email{majordomo@@majordomo.cs.columbia.edu} -with the single body text line @samp{subscribe amd-dev}. To post a -message to this list, send mail to -@email{amd-dev@@majordomo.cs.columbia.edu}. To avoid as much spam as +To subscribe, visit +@url{http://lists.am-utils.org/mailman/listinfo/am-utils}. After +subscribing, you can post a message to this list at +@email{am-utils@@am-utils.org}. To avoid as much spam as possible, only subscribers to this list may post to it. -Subscribers of @samp{amd-dev} are most suitable if they have the time -and resources to test new and buggy versions of amd, on as many -different platforms as possible. They should also be prepared to learn -and use the GNU Autoconf, Automake, and Libtool packages, and of course, -be very familiar with the complex code in the am-utils package. In -other words, subscribers on this list should be able to contribute -meaningfully to the development of amd. +Subscribers of @samp{am-utils} are most helpful if they have the time +and resources to test new and development versions of amd, on as many +different platforms as possible. They should also be prepared to +learn and use the GNU Autoconf, Automake, and Libtool packages, as +needed; and of course, become familiar with the complex code in the +am-utils package. In other words, subscribers on this list should +hopefully be able to contribute meaningfully to the development of +amd. + +Note that this @samp{am-utils} list used to be called @samp{amd-dev} +before January 1st, 2004. Please use the new name, @samp{am-utils}. + +@item +The announcements mailing list, @samp{am-utils-announce} is for +announcements only (mostly new releases). To subscribe, visit +@url{http://lists.am-utils.org/mailman/listinfo/am-utils-announce}. +This list is read-only: only am-utils developers may post to it. + +@item +We distribute nightly CVS snapshots in +@url{ftp://ftp.am-utils.org/pub/am-utils/snapshots/daily/}. If you +like to get email notices of commits to the am-utils CVS repository, +subscribe to the CVS logs mailing list, @samp{am-utils-cvs} at +@url{http://lists.am-utils.org/mailman/listinfo/am-utils-cvs}. + +@item +The older list which was used to user discussions, @samp{amd-workers}, +is defunct as of January 2004. (Its last address was +@email{amd-workers@@majordomo.glue.umd.edu}.) Don't use +@samp{amd-workers}: use the newer, more active @samp{am-utils} list. + +@item +For completeness, there's a developers-only closed list called +@samp{am-utils-developers@@am-utils.org}. @end enumerate +@unnumberedsec Am-utils Book +@cindex Am-utils book +@cindex Amd book +@cindex Automounter book +@cindex book + +@email{ezk@@cs.sunysb.edu,Erez Zadok} wrote a +@uref{http://www.fsl.cs.sunysb.edu/docs/amd-book/,book}, titled @i{Linux NFS and +Automounter Administration}, ISBN 0-7821-2739-8, (Sybex, 2001). The +book is full of details and examples that go beyond what this manual +has. The book also covers NFS in great detail. Although the book is +geared toward Linux users, it is general enough for any Unix +administrator and contains specific sections for non-Linux systems. + @c ################################################################ @node Intro, History, Distrib, Top @unnumbered Introduction @@ -337,7 +378,7 @@ The @i{Amd} package has been without an official maintainer since 1992. Several people have stepped in to maintain it unofficially. Most notable were the `upl' (Unofficial Patch Level) releases of @i{Amd}, created by me (@email{ezk@@cs.columbia.edu,Erez Zadok}), and available from -@url{ftp://ftp.cs.columbia.edu/pub/amd/}. The last such unofficial +@url{ftp://ftp.am-utils.org/pub/amd/}. The last such unofficial release was `upl102'. Through the process of patching and aging, it was becoming more and more @@ -4430,6 +4471,7 @@ The following parameters are applicable to the @samp{[global]} section only. * local_domain Parameter:: * log_file Parameter:: * log_options Parameter:: +* nfs_allow_insecure_port Parameter:: * nfs_proto Parameter:: * nfs_retransmit_counter Parameter:: * nfs_retry_interval Parameter:: @@ -4658,7 +4700,7 @@ is generally a bad idea to use those reserved for other services such as @samp{kern}, @samp{lpr}, @samp{cron}, etc. @c ---------------------------------------------------------------- -@node log_options Parameter, nfs_proto Parameter, log_file Parameter, Global Parameters +@node log_options Parameter, nfs_allow_insecure_port Parameter, log_file Parameter, Global Parameters @comment node-name, next, previous, up @subsection @t{log_options} Parameter @cindex log_options Parameter @@ -4695,7 +4737,25 @@ warnings @end table @c ---------------------------------------------------------------- -@node nfs_proto Parameter, nfs_retransmit_counter Parameter, log_options Parameter, Global Parameters +@node nfs_allow_insecure_port Parameter, nfs_proto Parameter, log_options Parameter, Global Parameters +@comment node-name, next, previous, up +@subsection @t{nfs_allow_insecure_port} Parameter +@cindex nfs_allow_insecure_port Parameter + +(type=string, default=@samp{no}). Normally amd will refuse requests +coming from unprivileged ports (i.e. ports >= 1024 on Unix systems), +so that only privileged users and the kernel can send NFS requests to +it. However, some kernels (certain versions of Darwin, MacOS X, and +Linux) have bugs that cause them to use unprivileged ports in certain +situations, which causes amd to stop dead in its tracks. This +parameter allows amd to operate normally even on such systems, at the +expense of a slight decrease in the security of its operations. If you +see messages like ``ignoring request from foo:1234, port not +reserved'' in your amd log, try enabling this parameter and give it +another go. + +@c ---------------------------------------------------------------- +@node nfs_proto Parameter, nfs_retransmit_counter Parameter, nfs_allow_insecure_port Parameter, Global Parameters @comment node-name, next, previous, up @subsection @t{nfs_proto} Parameter @cindex nfs_proto Parameter @@ -8285,13 +8345,19 @@ XXX: This section needs to be updated @comment node-name, next, previous, up @unnumbered Acknowledgments & Trademarks -Many thanks to the @email{amd-dev@@majordomo.cs.columbia.edu,Amd -Developers} mailing list through the months developing am-utils. These -members have contributed to the discussions, ideas, code and -documentation, and subjected their systems to alpha quality code. -Special thanks go to those -@uref{http://www.am-utils.org/AUTHORS.txt,authors} who -have submitted patches. +Many thanks to the @email{am-utils@@am-utils.org,Am-Utils Users} +mailing list through the months developing am-utils. These members +have contributed to the discussions, ideas, code and documentation, +and subjected their systems to alpha quality code. Special thanks go +to those @uref{http://www.am-utils.org/AUTHORS.txt,authors} who have +submitted patches, and especially to the maintainers: + +@itemize @bullet +@item @email{ezk@@cs.sunysb.edu,Erez Zadok} +@item @email{ib42@@cs.columbia.edu,Ion Badulescu} +@item @email{ro@@techfak.uni-bielefeld.de,Rainer Orth} +@item @email{nick.williams@@morganstanley.com,Nick Williams} +@end itemize Thanks to the Formal Methods Group at Imperial College for suffering patiently while @i{Amd} was being developed on their machines. @@ -8300,8 +8366,9 @@ Thanks to the many people who have helped with the development of @i{Amd}, especially Piete Brooks at the Cambridge University Computing Lab for many hours of testing, experimentation and discussion. -Thanks to the @email{amd-workers@@majordomo.glue.umd.edu,Amd Workers} -mailing list members for many suggestions and bug reports to @i{Amd}. +Thanks to the older @email{amd-workers@@majordomo.glue.umd.edu,Amd +Workers} mailing list (now defunct) members for many suggestions and +bug reports to @i{Amd}. @itemize @bullet @item diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8 index e16c50babd4b..4fa41d56a32a 100644 --- a/contrib/amd/fixmount/fixmount.8 +++ b/contrib/amd/fixmount/fixmount.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: fixmount.8,v 1.3.2.5 2003/03/16 01:46:59 ezk Exp $ +.\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $ .\" .TH FIXMOUNT 8 "26 Feb 1993" .SH NAME diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c index cff31d1ce99a..058c30f5003c 100644 --- a/contrib/amd/fixmount/fixmount.c +++ b/contrib/amd/fixmount/fixmount.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fixmount.c,v 1.5.2.3 2002/12/27 22:45:04 ezk Exp $ + * $Id: fixmount.c,v 1.5.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_analyze.c b/contrib/amd/fsinfo/fsi_analyze.c index 4bede1295061..6a513337a7e9 100644 --- a/contrib/amd/fsinfo/fsi_analyze.c +++ b/contrib/amd/fsinfo/fsi_analyze.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_analyze.c,v 1.3.2.4 2003/07/18 04:50:19 ezk Exp $ + * $Id: fsi_analyze.c,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_data.h b/contrib/amd/fsinfo/fsi_data.h index 0ecf86dbabf1..ac4fd01baec8 100644 --- a/contrib/amd/fsinfo/fsi_data.h +++ b/contrib/amd/fsinfo/fsi_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_data.h,v 1.3.2.3 2002/12/27 22:45:05 ezk Exp $ + * $Id: fsi_data.h,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_dict.c b/contrib/amd/fsinfo/fsi_dict.c index 832a0533bb5b..0f11a42febac 100644 --- a/contrib/amd/fsinfo/fsi_dict.c +++ b/contrib/amd/fsinfo/fsi_dict.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_dict.c,v 1.3.2.3 2002/12/27 22:45:06 ezk Exp $ + * $Id: fsi_dict.c,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_gram.y b/contrib/amd/fsinfo/fsi_gram.y index 08c7ba955d44..969f4bf13549 100644 --- a/contrib/amd/fsinfo/fsi_gram.y +++ b/contrib/amd/fsinfo/fsi_gram.y @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_gram.y,v 1.4.2.3 2002/12/27 22:45:06 ezk Exp $ + * $Id: fsi_gram.y,v 1.4.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsi_lex.l b/contrib/amd/fsinfo/fsi_lex.l index 2fc7b8a36aa4..8de8a139b8d1 100644 --- a/contrib/amd/fsinfo/fsi_lex.l +++ b/contrib/amd/fsinfo/fsi_lex.l @@ -1,6 +1,6 @@ %{ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -37,9 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: fsi_lex.l,v 1.4.2.4 2002/12/27 22:45:06 ezk Exp $ + * $Id: fsi_lex.l,v 1.4.2.6 2004/05/12 15:54:31 ezk Exp $ * */ @@ -48,8 +47,9 @@ * TODO: Needs rewriting. */ +static int ayylineno; + #ifdef FLEX_SCANNER -static int yylineno; # define INIT_STATE { \ switch ((yy_start - 1) / 2) { \ case 0: \ @@ -159,6 +159,13 @@ struct r { %} +/* This option causes Solaris lex to fail. Use flex. See BUGS file */ +/* no need to use yyunput() */ +%option nounput + +/* allocate more output slots so lex scanners don't run out of mem */ +%o 1024 + %start F Q %% @@ -166,22 +173,22 @@ struct r { [^ \t\n"={}]+ { return find_resword(yytext); } /* dummy " */ [ \t] ; -"\n" { yylineno++; } +"\n" { ayylineno++; } [={}] { return *yytext; } \" { BEGIN Q; optr = ostr; quoted = 1; } -\n { yylineno++; yyerror("\" expected"); BEGIN F; } +\n { ayylineno++; yyerror("\" expected"); BEGIN F; } \\b { *optr++ = '\b'; /* escape */ } \\t { *optr++ = '\t'; /* escape */ } \\\" { *optr++ = '\"'; /* escape */ } \\\\ { *optr++ = '\\'; /* escape */ } -\\\n { yylineno++; /* continue */ } +\\\n { ayylineno++; /* continue */ } \\r { *optr++ = '\r'; /* escape */ } \\n { *optr++ = '\n'; /* escape */ } \\f { *optr++ = '\f'; /* escape */ } "\\ " { *optr++ = ' '; /* force space */ } \\. { yyerror("Unknown \\ sequence"); } -([ \t]|"\\\n"){2,} { char *p = (char *) yytext-1; while ((p = strchr(p+1, '\n'))) yylineno++; } +([ \t]|"\\\n"){2,} { char *p = (char *) yytext-1; while ((p = strchr(p+1, '\n'))) ayylineno++; } \" { BEGIN F; quoted = 0; *optr = '\0'; yylval.s = strdup(ostr); @@ -235,12 +242,11 @@ yyerror(char *fmt, ...) va_start(ap, fmt); col_cleanup(0); - fprintf(stderr, "%s:%d: ", fsi_filename ? fsi_filename : "/dev/stdin", yylineno); + fprintf(stderr, "%s:%d: ", fsi_filename ? fsi_filename : "/dev/stdin", ayylineno); vfprintf(stderr, fmt, ap); fputc('\n', stderr); parse_errors++; va_end(ap); - if (0) unput(0);/* dummy to shut gcc up: "unput defined but not used" */ return 0; } @@ -249,7 +255,7 @@ ioloc * current_location(void) { ioloc *ip = CALLOC(struct ioloc); - ip->i_line = yylineno; + ip->i_line = ayylineno; ip->i_file = fsi_filename; return ip; } diff --git a/contrib/amd/fsinfo/fsi_util.c b/contrib/amd/fsinfo/fsi_util.c index a41b3be38613..8d8ac61f8b5f 100644 --- a/contrib/amd/fsinfo/fsi_util.c +++ b/contrib/amd/fsinfo/fsi_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -35,7 +35,7 @@ * * %W% (Berkeley) %G% * - * $Id: fsi_util.c,v 1.3.2.5 2003/07/18 04:50:19 ezk Exp $ + * $Id: fsi_util.c,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8 index 18c1bf5ee804..c9755ab423fc 100644 --- a/contrib/amd/fsinfo/fsinfo.8 +++ b/contrib/amd/fsinfo/fsinfo.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1993 Jan-Simon Pendry. .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 -.\" $Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $ +.\" $Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ .\" .TH FSINFO 8 "June 28, 1993" .SH NAME diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c index 6db19100b99b..0c870e137e70 100644 --- a/contrib/amd/fsinfo/fsinfo.c +++ b/contrib/amd/fsinfo/fsinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -36,9 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: fsinfo.c,v 1.5.2.5 2003/07/18 04:50:20 ezk Exp $ + * $Id: fsinfo.c,v 1.5.2.7 2004/05/12 15:54:31 ezk Exp $ * */ @@ -168,7 +167,9 @@ fsi_get_args(int c, char *v[]) if (c != optind) { g_argv = v + optind - 1; +#ifdef yywrap if (yywrap()) +#endif /* yywrap */ fatal("Cannot read any input files"); } else { usage++; diff --git a/contrib/amd/fsinfo/fsinfo.h b/contrib/amd/fsinfo/fsinfo.h index 7744d8d24a55..911ecbb08a3e 100644 --- a/contrib/amd/fsinfo/fsinfo.h +++ b/contrib/amd/fsinfo/fsinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -36,9 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: fsinfo.h,v 1.4.2.5 2003/07/18 04:50:20 ezk Exp $ + * $Id: fsinfo.h,v 1.4.2.7 2004/05/12 15:54:31 ezk Exp $ * */ @@ -115,7 +114,6 @@ extern void domain_strip(char *otherdom, char *localdom); */ #ifndef yywrap extern int yywrap(void); -# define yywrap() 1 #endif /* not yywrap */ extern int yyparse(void); extern int write_atab(qelem *q); diff --git a/contrib/amd/fsinfo/wr_atab.c b/contrib/amd/fsinfo/wr_atab.c index 2ae0fc8379d6..6db5eea2b22f 100644 --- a/contrib/amd/fsinfo/wr_atab.c +++ b/contrib/amd/fsinfo/wr_atab.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_atab.c,v 1.3.2.3 2002/12/27 22:45:07 ezk Exp $ + * $Id: wr_atab.c,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_bparam.c b/contrib/amd/fsinfo/wr_bparam.c index 6e15a5e35c0c..c1ca06848eca 100644 --- a/contrib/amd/fsinfo/wr_bparam.c +++ b/contrib/amd/fsinfo/wr_bparam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_bparam.c,v 1.3.2.3 2002/12/27 22:45:07 ezk Exp $ + * $Id: wr_bparam.c,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_dumpset.c b/contrib/amd/fsinfo/wr_dumpset.c index 246aeebc25ab..029ec305f128 100644 --- a/contrib/amd/fsinfo/wr_dumpset.c +++ b/contrib/amd/fsinfo/wr_dumpset.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_dumpset.c,v 1.3.2.3 2002/12/27 22:45:07 ezk Exp $ + * $Id: wr_dumpset.c,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_exportfs.c b/contrib/amd/fsinfo/wr_exportfs.c index 6e818324c54a..f6354c29dc52 100644 --- a/contrib/amd/fsinfo/wr_exportfs.c +++ b/contrib/amd/fsinfo/wr_exportfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_exportfs.c,v 1.3.2.3 2002/12/27 22:45:07 ezk Exp $ + * $Id: wr_exportfs.c,v 1.3.2.4 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/fsinfo/wr_fstab.c b/contrib/amd/fsinfo/wr_fstab.c index 0243890b879f..7391601efe25 100644 --- a/contrib/amd/fsinfo/wr_fstab.c +++ b/contrib/amd/fsinfo/wr_fstab.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wr_fstab.c,v 1.3.2.4 2003/07/18 04:50:20 ezk Exp $ + * $Id: wr_fstab.c,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8 index cdf69e8b3d37..bed4480a534c 100644 --- a/contrib/amd/hlfsd/hlfsd.8 +++ b/contrib/amd/hlfsd/hlfsd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -36,7 +36,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: hlfsd.8,v 1.3.2.4 2003/03/16 01:47:00 ezk Exp $ +.\" $Id: hlfsd.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ .\" .\" HLFSD was written at Columbia University Computer Science Department, by .\" Erez Zadok and Alexander Dupuy diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c index 0eaa7ec8838c..355509d37637 100644 --- a/contrib/amd/hlfsd/hlfsd.c +++ b/contrib/amd/hlfsd/hlfsd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: hlfsd.c,v 1.7.2.7 2002/12/27 22:45:08 ezk Exp $ + * $Id: hlfsd.c,v 1.7.2.9 2004/01/19 00:25:55 ezk Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy @@ -746,7 +746,7 @@ hlfsd_init(void) if (setitimer(ITIMER_REAL, &reloadinterval, (struct itimerval *) 0) < 0) fatal("setitimer: %m"); - gettimeofday((struct timeval *) &startup, (struct timezone *) 0); + gettimeofday((struct timeval *) ((void *)&startup), (struct timezone *) 0); #ifdef DEBUG /* diff --git a/contrib/amd/hlfsd/hlfsd.h b/contrib/amd/hlfsd/hlfsd.h index bce463188598..645c2f87f4b7 100644 --- a/contrib/amd/hlfsd/hlfsd.h +++ b/contrib/amd/hlfsd/hlfsd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: hlfsd.h,v 1.4.2.6 2002/12/27 22:45:08 ezk Exp $ + * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c index 91431bfedf04..533b7f4d6b85 100644 --- a/contrib/amd/hlfsd/homedir.c +++ b/contrib/amd/hlfsd/homedir.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: homedir.c,v 1.5.2.10 2002/12/27 22:45:08 ezk Exp $ + * $Id: homedir.c,v 1.5.2.11 2004/01/06 03:15:23 ezk Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy diff --git a/contrib/amd/hlfsd/nfs_prot_svc.c b/contrib/amd/hlfsd/nfs_prot_svc.c index 9583753c90a3..b9150e3d8831 100644 --- a/contrib/amd/hlfsd/nfs_prot_svc.c +++ b/contrib/amd/hlfsd/nfs_prot_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_svc.c,v 1.4.2.4 2002/12/27 22:45:09 ezk Exp $ + * $Id: nfs_prot_svc.c,v 1.4.2.5 2004/01/06 03:15:23 ezk Exp $ * */ diff --git a/contrib/amd/hlfsd/stubs.c b/contrib/amd/hlfsd/stubs.c index a65772e7fc42..4038c05006f7 100644 --- a/contrib/amd/hlfsd/stubs.c +++ b/contrib/amd/hlfsd/stubs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: stubs.c,v 1.5.2.6 2002/12/27 22:45:09 ezk Exp $ + * $Id: stubs.c,v 1.5.2.7 2004/01/06 03:15:23 ezk Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index da483d76f3fd..35a9d0334b14 100644 --- a/contrib/amd/include/am_defs.h +++ b/contrib/amd/include/am_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_defs.h,v 1.15.2.13 2002/12/27 22:45:09 ezk Exp $ + * $Id: am_defs.h,v 1.15.2.16 2004/05/12 15:54:31 ezk Exp $ * */ @@ -69,6 +69,26 @@ char *strchr(), *strrchr(), *strdup(); #endif /* not STDC_HEADERS */ +/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include +# else /* not HAVE_ALLOCA_H */ +# ifdef _AIX +/* + * This pragma directive is indented so that pre-ANSI C compilers will + * ignore it, rather than choke on it. + */ + #pragma alloca +# else /* not _AIX */ +# ifndef alloca +/* predefined by HP cc +Olibcalls */ +voidp alloca(); +# endif /* not alloca */ +# endif /* not _AIX */ +# endif /* not HAVE_ALLOCA_H */ +#endif /* not __GNUC__ */ + /* * Handle gcc __attribute__ if available. */ @@ -275,10 +295,13 @@ typedef bool_t (*xdrproc_t) __P ((XDR *, __ptr_t, ...)); /* * Actions to take if exists. + * Don't include malloc.h if stdlib.h exists, because modern + * systems complain if you use malloc.h instead of stdlib.h. + * XXX: let's hope there are no systems out there that need both. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) # include -#endif /* HAVE_MALLOC_H */ +#endif /* defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) */ /* * Actions to take if exists. @@ -325,21 +348,13 @@ extern int errno; * Should be included before because on some systems * like Linux, it also defines "struct datum". */ -#ifdef HAVE_NDBM_H -# include +#ifdef HAVE_MAP_NDBM +# include NEW_DBM_H # ifndef DATUM /* ensure that struct datum is not included again from */ # define DATUM # endif /* not DATUM */ -#else /* not HAVE_NDBM_H */ -# ifdef HAVE_DB1_NDBM_H -# include -# ifndef DATUM -/* ensure that struct datum is not included again from */ -# define DATUM -# endif /* not DATUM */ -# endif /* HAVE_DB1_NDBM_H */ -#endif /* HAVE_NDBM_H */ +#endif /* HAVE_MAP_NDBM */ /* * Actions to take if exists. diff --git a/contrib/amd/include/am_utils.h b/contrib/amd/include/am_utils.h index e99084079ca5..0549186a7185 100644 --- a/contrib/amd/include/am_utils.h +++ b/contrib/amd/include/am_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_utils.h,v 1.11.2.12 2002/12/27 22:45:10 ezk Exp $ + * $Id: am_utils.h,v 1.11.2.13 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/include/am_xdr_func.h b/contrib/amd/include/am_xdr_func.h index a8b25548e2de..6e3cdcea26a4 100644 --- a/contrib/amd/include/am_xdr_func.h +++ b/contrib/amd/include/am_xdr_func.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_xdr_func.h,v 1.3.2.5 2002/12/27 22:45:10 ezk Exp $ + * $Id: am_xdr_func.h,v 1.3.2.6 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/include/amq_defs.h b/contrib/amd/include/amq_defs.h index cd059f6d8adf..118233026d99 100644 --- a/contrib/amd/include/amq_defs.h +++ b/contrib/amd/include/amq_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_defs.h,v 1.4.2.3 2002/12/27 22:45:10 ezk Exp $ + * $Id: amq_defs.h,v 1.4.2.4 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/amu.h b/contrib/amd/libamu/amu.h index e6532fad19ab..833d8c3e34ca 100644 --- a/contrib/amd/libamu/amu.h +++ b/contrib/amd/libamu/amu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amu.h,v 1.3.2.3 2002/12/27 22:45:11 ezk Exp $ + * $Id: amu.h,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/hasmntopt.c b/contrib/amd/libamu/hasmntopt.c index 843ef2fc77fb..e6696edc9751 100644 --- a/contrib/amd/libamu/hasmntopt.c +++ b/contrib/amd/libamu/hasmntopt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ n * modification, are permitted provided that the following conditions * * %W% (Berkeley) %G% * - * $Id: hasmntopt.c,v 1.3.2.3 2002/12/27 22:45:11 ezk Exp $ + * $Id: hasmntopt.c,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/misc_rpc.c b/contrib/amd/libamu/misc_rpc.c index ae413c3adb9f..47b11ad0011b 100644 --- a/contrib/amd/libamu/misc_rpc.c +++ b/contrib/amd/libamu/misc_rpc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: misc_rpc.c,v 1.4.2.5 2002/12/29 00:46:43 ib42 Exp $ + * $Id: misc_rpc.c,v 1.4.2.6 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c index c6a468f710c7..3fecabe78069 100644 --- a/contrib/amd/libamu/mount_fs.c +++ b/contrib/amd/libamu/mount_fs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mount_fs.c,v 1.11.2.11 2003/05/08 17:57:53 ib42 Exp $ + * $Id: mount_fs.c,v 1.11.2.12 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/mtab.c b/contrib/amd/libamu/mtab.c index eab87b389009..b323097b2dfb 100644 --- a/contrib/amd/libamu/mtab.c +++ b/contrib/amd/libamu/mtab.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mtab.c,v 1.3.2.7 2002/12/27 22:45:12 ezk Exp $ + * $Id: mtab.c,v 1.3.2.8 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/nfs_prot_xdr.c b/contrib/amd/libamu/nfs_prot_xdr.c index 9a3ff9a9dd35..cb3368bace86 100644 --- a/contrib/amd/libamu/nfs_prot_xdr.c +++ b/contrib/amd/libamu/nfs_prot_xdr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_xdr.c,v 1.3.2.3 2002/12/27 22:45:12 ezk Exp $ + * $Id: nfs_prot_xdr.c,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/strerror.c b/contrib/amd/libamu/strerror.c index 7c230bc1d2dd..af10e7009960 100644 --- a/contrib/amd/libamu/strerror.c +++ b/contrib/amd/libamu/strerror.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002-2003 Ion Badulescu - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 2002-2004 Ion Badulescu + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * - * $Id: strerror.c,v 1.2.2.2 2002/12/27 22:45:13 ezk Exp $ + * $Id: strerror.c,v 1.2.2.3 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/util.c b/contrib/amd/libamu/util.c index e9b83ed3efdc..ad16b15eb9df 100644 --- a/contrib/amd/libamu/util.c +++ b/contrib/amd/libamu/util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: util.c,v 1.3.2.3 2002/12/27 22:45:13 ezk Exp $ + * $Id: util.c,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/wire.c b/contrib/amd/libamu/wire.c index 649b3369d4fd..093f1a64a9d4 100644 --- a/contrib/amd/libamu/wire.c +++ b/contrib/amd/libamu/wire.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wire.c,v 1.8.2.9 2002/12/27 22:45:13 ezk Exp $ + * $Id: wire.c,v 1.8.2.10 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/xdr_func.c b/contrib/amd/libamu/xdr_func.c index eed657ce3d3b..1592a0e83057 100644 --- a/contrib/amd/libamu/xdr_func.c +++ b/contrib/amd/libamu/xdr_func.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: xdr_func.c,v 1.4.2.7 2002/12/27 22:45:14 ezk Exp $ + * $Id: xdr_func.c,v 1.4.2.8 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/libamu/xutil.c b/contrib/amd/libamu/xutil.c index ca571b636704..5095c23bf30a 100644 --- a/contrib/amd/libamu/xutil.c +++ b/contrib/amd/libamu/xutil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: xutil.c,v 1.11.2.12 2003/04/04 15:53:35 ezk Exp $ + * $Id: xutil.c,v 1.11.2.13 2004/01/06 03:15:24 ezk Exp $ * */ diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8 index b9587f75ab00..2e2436667088 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.8 +++ b/contrib/amd/mk-amd-map/mk-amd-map.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1993 Jan-Simon Pendry .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)mk-amd-map.8 8.1 (Berkeley) 6/28/93 -.\" $Id: mk-amd-map.8,v 1.3.2.3 2002/12/27 22:45:15 ezk Exp $ +.\" $Id: mk-amd-map.8,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ .\" .TH MK-AMD-MAP 8 "June 28, 1993" .SH NAME diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c index 15036001f286..a9ae96567b6d 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.c +++ b/contrib/amd/mk-amd-map/mk-amd-map.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mk-amd-map.c,v 1.5.2.5 2003/06/09 16:57:46 ezk Exp $ + * $Id: mk-amd-map.c,v 1.5.2.6 2004/01/06 03:15:25 ezk Exp $ */ /* diff --git a/contrib/amd/scripts/amd.conf-sample b/contrib/amd/scripts/amd.conf-sample index 3fbfdb52124b..02ccbdfc345b 100644 --- a/contrib/amd/scripts/amd.conf-sample +++ b/contrib/amd/scripts/amd.conf-sample @@ -76,6 +76,8 @@ fully_qualified_hosts = yes | no # force NFS version or NFS protocol nfs_vers = 2 | 3 nfs_proto = udp | tcp +# allow NFS requests from insecure (>=1024) ports +nfs_allow_insecure_port = yes | no ############################################################################## # DEFINE AN AMD MOUNT POINT diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5 index 14cc54e96780..6e6b4ddc4770 100644 --- a/contrib/amd/scripts/amd.conf.5 +++ b/contrib/amd/scripts/amd.conf.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amd.conf.5,v 1.7.2.8 2003/03/16 01:47:00 ezk Exp $ +.\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $ .\" .TH AMD.CONF 5 "7 August 1997" .SH NAME @@ -370,6 +370,18 @@ and the parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes excessive retries. +.TP +.BR nfs_allow_insecure_port " (string, default=no). +Normally amd will refuse requests coming from unprivileged ports (i.e. +ports >= 1024 on Unix systems), so that only privileged users and the kernel +can send NFS requests to it. However, some kernels (certain versions of +Darwin, MacOS X, and Linux) have bugs that cause them to use unprivileged +ports in certain situations, which causes amd to stop dead in its +tracks. This parameter allows amd to operate normally even on such systems, +at the expense of a slight decrease in the security of its operations. If +you see messages like "ignoring request from foo:1234, port not reserved" +in your amd log, try enabling this parameter and give it another go. + .TP .BR nfs_proto " (string, default to trying version tcp then udp)" By default, amd tries TCP and then UDP. This option forces the overall NFS diff --git a/contrib/amd/scripts/automount2amd.8 b/contrib/amd/scripts/automount2amd.8 index 9dd2d66fd1be..e4fa9bcde2fe 100644 --- a/contrib/amd/scripts/automount2amd.8 +++ b/contrib/amd/scripts/automount2amd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: automount2amd.8,v 1.2.2.3 2002/12/27 22:45:16 ezk Exp $ +.\" $Id: automount2amd.8,v 1.2.2.4 2004/01/06 03:15:25 ezk Exp $ .\" .TH AUTOMOUNT2AMD 8L "24 May 1993" .SH NAME diff --git a/contrib/amd/scripts/expn.1 b/contrib/amd/scripts/expn.1 index e5ee1258c8f0..bb90c49ab705 100644 --- a/contrib/amd/scripts/expn.1 +++ b/contrib/amd/scripts/expn.1 @@ -16,7 +16,7 @@ $sockaddr = 'S n a4 x8'; # system requirements: # must have 'nslookup' and 'hostname' programs. -# $Header: /proj/bank/cvsroot/am-utils/scripts/expn.1,v 1.1.1.1.2.2 2003/03/16 01:47:01 ezk Exp $ +# $Header: /home/cvsroot/am-utils/scripts/expn.1,v 1.1.1.1.2.3 2004/01/06 03:15:25 ezk Exp $ # TODO: # less magic should apply to command-line addresses diff --git a/contrib/amd/scripts/expn.in b/contrib/amd/scripts/expn.in index e63571088e7e..7dbee4191214 100755 --- a/contrib/amd/scripts/expn.in +++ b/contrib/amd/scripts/expn.in @@ -15,7 +15,7 @@ $SOCK_STREAM = &SOCK_STREAM; # system requirements: # must have 'nslookup' and 'hostname' programs. -# $Header: /proj/bank/cvsroot/am-utils/scripts/expn.in,v 1.2.2.2 2002/07/11 14:27:02 ezk Exp $ +# $Header: /home/cvsroot/am-utils/scripts/expn.in,v 1.2.2.2 2002/07/11 14:27:02 ezk Exp $ # TODO: # less magic should apply to command-line addresses diff --git a/contrib/amd/tasks b/contrib/amd/tasks index bb66afad11af..3fc767d11679 100644 --- a/contrib/amd/tasks +++ b/contrib/amd/tasks @@ -1,5 +1,3 @@ -# -*- text -*- - AM-UTILS-6.0 TASKS TODO Please volunteer to do any of the following: diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8 index ecd85cc4dba7..0d2efe79eb30 100644 --- a/contrib/amd/wire-test/wire-test.8 +++ b/contrib/amd/wire-test/wire-test.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: wire-test.8,v 1.3.2.4 2002/12/27 22:45:16 ezk Exp $ +.\" $Id: wire-test.8,v 1.3.2.5 2004/01/06 03:15:25 ezk Exp $ .\" .TH WIRE-TEST 8 "26 Feb 1993" .SH NAME diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c index 9eb5aa207e24..f0a266309f63 100644 --- a/contrib/amd/wire-test/wire-test.c +++ b/contrib/amd/wire-test/wire-test.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 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. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wire-test.c,v 1.5.2.3 2002/12/27 22:45:16 ezk Exp $ + * $Id: wire-test.c,v 1.5.2.4 2004/01/06 03:15:25 ezk Exp $ * */