Virgin import of AMD (am-utils) v6.0

This commit is contained in:
David E. O'Brien 1999-01-13 19:23:16 +00:00
parent 37d7e39316
commit 75cb9b41f6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/amd/dist/; revision=42629
133 changed files with 2334 additions and 1378 deletions

View File

@ -202,4 +202,16 @@ April 20, 1998: allow arbitrary number of interfaces in wire listing.
September 4, 1998: bug fix to avoid overrunning hostname buffer, and minor
amd.conf man page typo correction.
* Danny Rathjens <dkr@cs.fiu.edu>
October 29, 1998: swap arguments to kill(2) in amd.c.
* Mike Mitchell <mcm@unx.sas.com>
November 3, 1998: amd/nfs_subr.c (nfsproc_lookup_2_svc): try to avoid a race
condition between unmounting and re-mounting an entry, by increasing the ttl
of a looked up entry before unmounting it.
* Douglas K. Rand" <rand@aero.und.edu>
December 3, 1998: case insensitive host name match for nfsl.

View File

@ -72,6 +72,9 @@ that nfsd is running. Normally these are not required.
executable dump core unexpectedly, then it may be a bug in gcc 2.7.x.
Upgrade to gcc 2.8.x or use IBM's xlC compiler.
[C] Do not link amd with libnsl. It is buggy and causes amd to core dump
in strlen inside strdup inside svc_register().
(5) *-linux-gnu (RedHat Linux 5.1)

View File

@ -1,3 +1,160 @@
1999-01-01 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
*******************************************************************
*** Released am-utils-6.0 ***
*******************************************************************
1998-12-28 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* conf/nfs_prot/nfs_prot_sunos5_7.h: support ldap in solaris 2.7.
1998-12-27 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* conf/nfs_prot/nfs_prot_bsdi3.h: don't use reserved ports on
bsdi4 for NFS V3/nfs mounts.
1998-12-26 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* using latest libtool (1.2e + patches), now supporting shared
libraries on many more systems. Also using latest autoconf and
automake (unreleased GNU CVS'd versions.)
* minor new ports: hppa2.0w-hp-hpux11.00,
i386-unknown-netbsd1.3.3, mips-sgi-irix6.5.
* fsinfo/fsinfo.h (yywrap): define it for systems (osf4) that
have /usr/bin/flex but not libfl.
1998-12-24 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* lots of code cleanup, to make sure libamu.so does not use
undefined symbols. Some system's shared libraries cannot handle
that.
1998-12-23 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* include/am_defs.h: only defined seteuid extern if function also
exists and is not superceded by setresuid (hpux).
* amd/ops_autofs.c (autofs_bgmount, autofs_lookuppn): put explicit
braces to avoid confusion with nested if-then-else clauses.
* aux/config.{sub,status}, aux/{ltmain.sh,ltconfig,mkinstalldirs:
updated from latest versions.
1998-12-22 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* minor new port: i386-pc-bsdi4.0
* conf/nfs_prot/nfs_prot_bsdi3.h: add missing hesiod header
definitions for bsdi4.
* {amd,fsinfo}/Makefile.am: force path to .y/.l files, because
some make programs (bsdi4) do not support VPATH correctly.
1998-12-16 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* conf/mount/mount_aix.c: minor code cleanup
* aux/configure.in: check for extern definition to xdr_groups.
1998-12-15 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* minor new port: powerpc-ibm-aix4.3.1.0
* aux/macros/*.m4: updates for aix 4.3
1998-12-14 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* minor new port: i386-unknown-openbsd2.4
* aux/configure.in: don't check for xfs on openbsd because
openbsd-2.4 introduces a new file system named xfs, but different
than Irix's XFS. Sigh.
* minor new port: i386-unknown-freebsd2.2.8
1998-12-03 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* amd/amfs_nfsl.c (amfs_nfsl_ffserver): use case insensitive host
name match. Bug fix from Douglas K. Rand" <rand@aero.und.edu>.
1998-11-20 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* scripts/ctl-amd.in: wait4amd2die runs in the stop action, to
avoid race conditions when shutting down systems running amd.
* Makefile.am: add a dist-hook to change modes of the directories
in the tar file so they are not world writable.
* conf/nfs_prot/nfs_prot_freebsd3.h: turned on NFSv3 support,
since it is now finally defined in the header files and
(hopefully) stable.
* amd/srvr_nfs.c (find_nfs_srvr): allow overriding if nfsv2 option
is specified in mount options. freebsd patches from David
O'Brien.
* amq/amq.c (main), fixmount/fixmount.c (main), hlfsd/hlfsd.c
(main), fsinfo/fsinfo.c (fsi_get_args), hlfsd/hlfsd.c (main),
amd/get_args.c (get_args): posix: use -1 to check for return from
getopt() (not EOF), as per posix.
* amd/amq_subr.c (xdr_amq_mount_tree_node): patches from "David
O'Brien" <obrien@NUXI.com>, from the FreeBSD source tree. Use
real variable whose pointer is on the stack for decoding a long
int.
1998-11-11 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* scripts/ctl-{amd,hlfsd}.in: include comments useful for redhat's
chkconfig utility.
1998-11-10 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* released snapshot am-utils-6.0b2s3
* conf/transp/transp_sockets.c (create_nfs_service): remove C++
style comments.
1998-11-04 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* released snapshot am-utils-6.0b2s2
* created CVS package
* amd/nfs_subr.c (nfsproc_lookup_2_svc): try to avoid a race
condition between unmounting and re-mounting an entry, by
increasing the ttl of a looked up entry before unmounting it.
Patch from Mike Mitchell <mcm@unx.sas.com>.
* All files: spell comments and strings.
1998-11-03 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* aux/configure.in: look for yp_all in libnsl only if yp_all not
already found elsewhere (in libc or other default libraries).
This is so RedHat 5.1 systems could find yp functions in libnsl,
but also so AIX 4.2.1 will NOT include libnsl, because the latter
has broken nis functionality that also exists and works ok in libc.
1998-10-29 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
* amd/amd.c (main): bug fix: swapped arguments to kill(2). Fix
from Danny Rathjens <dkr@cs.fiu.edu>.
1998-10-28 Erez Zadok <ezk@spruce.mcl.cs.columbia.edu>
* released snapshot am-utils-6.0b2s1
1998-10-27 Erez Zadok <ezk@spruce.mcl.cs.columbia.edu>
* aux/macros/*.m4: support bsdi4 as bsdi3.
* aux/macros/os_ldflags.m4: enable detection of LDAP on solaris
2.7 (libraries located in /usr/lib/fn). This is off until Sun
includes LDAP header information.
1998-10-20 Erez Zadok <ezk@shekel.mcl.cs.columbia.edu>
*******************************************************************

View File

@ -3,52 +3,68 @@
For each system, list if it autoconfigures, compiles, or runs. Fill in
email id of person who confirms the fact. A missing entry means unverified.
A 'no' means verified broken.
A 'no' or '!' means verified broken or nonexistent (static library).
SYSTEM AUTOCONF COMPILE RUN SHLIB
========================= ======== ========= ======= =====
alpha-dec-osf2.1 ezk ezk ezk
alpha-dec-osf4.0 ezk ezk dsr[3]
alpha-dec-osf2.1 ezk ezk ezk !ezk
alpha-dec-osf4.0 ezk ezk dsr[3] ezk
alphaev5-unknown-linux-gnu ezk ezk finkel ezk
hppa1.0-hp-hpux11.00 ezk ezk ezk
hppa1.1-hp-hpux10.10 ezk ezk ezk -ezk (!rpcsvc.so)
hppa1.1-hp-hpux10.20 ezk ezk ezk -ezk (!rpcsvc.so)
hppa1.1-hp-hpux9.01 ezk[4] ezk[4] nrh/ezk
hppa1.1-hp-hpux9.05 ezk[4] ezk[4] nrh/ezk
hppa1.1-hp-hpux9.07 ezk[4] ezk[4] nrh/ezk
i386-pc-bsdi2.1 ezk ezk ezk
i386-pc-bsdi3.0 ezk ezk ezk
i386-pc-bsdi3.1 ezk ezk ezk
hppa1.1-hp-hpux10.10 ezk ezk ezk ezk
hppa1.1-hp-hpux10.20 ezk ezk ezk ezk
hppa1.1-hp-hpux9.01 ezk[4] ezk[4] nrh/ezk ezk
hppa1.1-hp-hpux9.05 ezk[4] ezk[4] nrh/ezk ezk
hppa1.1-hp-hpux9.07 ezk[4] ezk[4] nrh/ezk ezk
hppa2.0w-hp-hpux11.00 ezk ezk ezk ezk
i386-pc-bsdi2.1 ezk ezk ezk !ezk
i386-pc-bsdi3.0 ezk ezk ezk !ezk
i386-pc-bsdi3.1 ezk ezk ezk !ezk
i386-pc-bsdi4.0 ezk ezk ezk ezk
i386-pc-solaris2.5.1 ezk ezk ezk ezk
i386-pc-solaris2.6 ezk ezk ezk ezk
i386-pc-solaris2.7 ezk ezk ezk ezk
i386-unknown-freebsd2.1.0 ezk ezk ezk
i386-unknown-freebsd2.2.1 ezk ezk ezk ezk
i386-unknown-freebsd2.2.6 ezk ezk ezk ezk
i386-unknown-freebsd2.2.7 ezk ezk ezk ezk
i386-unknown-freebsd2.2.8 ezk ezk ezk ezk
i386-unknown-freebsd3.0 ezk ezk ezk ezk
i386-unknown-netbsd1.2.1 ezk ezk ezk ezk
i386-unknown-netbsd1.3 ezk ezk ezk ezk
i386-unknown-netbsd1.3.1 ezk ezk ezk ezk
i386-unknown-netbsd1.3.2 ezk ezk ezk ezk
i386-unknown-netbsd1.3.3 ezk ezk ezk ezk
i386-unknown-openbsd2.1 ezk ezk ezk ezk
i486-ncr-sysv4.3.03 ezk ezk
i386-unknown-openbsd2.2 ezk ezk ezk ezk
i386-unknown-openbsd2.3 ezk ezk ezk ezk
i386-unknown-openbsd2.4 ezk ezk ezk ezk
i486-ncr-sysv4.3.03 ezk ezk ezk
i486-pc-linux-gnulibc1 ezk ezk ezk ezk
i486-pc-linux-gnuoldld ezk ezk ezk ezk
i586-pc-linux-gnu ezk ezk ezk ezk
i586-pc-linux-gnulibc1 ezk ezk ezk ezk
i686-pc-linux-gnu ezk ezk ezk ezk
i686-pc-linux-gnulibc ezk ezk ezk ezk
i686-pc-linux-gnulibc1 ezk ezk ezk ezk
m68k-hp-hpux9.00 ezk[4] ezk[4] nrh/ezk
m68k-next-nextstep3 ezk ezk ezk
m68k-sun-sunos4.1.1 ezk ezk
m68k-next-nextstep3 ezk ezk ezk !ezk
m68k-sun-sunos4.1.1 ezk ezk !ezk
mips-dec-ultrix4.3 ro ro ro
mips-sgi-irix5.2
mips-sgi-irix5.3 ezk ezk ezk
mips-sgi-irix6.2 ezk[1] ezk[1] ezk[1]
mips-sgi-irix6.4 ezk ezk ezk ezk (!gcc)
powerpc-ibm-aix4.1.5.0 ezk ezk wpaul
powerpc-ibm-aix4.2.1.0 ezk ezk ezk
mips-sgi-irix5.3 ezk ezk ezk ezk
mips-sgi-irix6.2 ezk[1] ezk[1] ezk[1] ezk
mips-sgi-irix6.4 ezk ezk ezk ezk
mips-sgi-irix6.5 ezk ezk ezk
powerpc-ibm-aix4.1.5.0 ezk ezk wpaul !ezk
powerpc-ibm-aix4.2.1.0 ezk ezk ezk !ezk
powerpc-ibm-aix4.3.1.0 ezk ezk !ezk
powerpc-unknown-linux-gnu jose jose jose
rs6000-ibm-aix3.2 ezk ezk ezk
rs6000-ibm-aix3.2.5 ezk ezk ezk
rs6000-ibm-aix4.1.4.0 ezk ezk
sparc-sun-solaris2.3 ezk ezk ezk
rs6000-ibm-aix4.1.4.0 ezk ezk !ezk
rs6000-ibm-aix4.1.5.0 ezk ezk !ezk
sparc-sun-solaris2.3 ezk ezk ezk ezk
sparc-sun-solaris2.4 ezk ezk ezk ezk
sparc-sun-solaris2.5 ezk ezk ezk ezk
sparc-sun-solaris2.5.1 ezk ezk ezk ezk
@ -61,6 +77,7 @@ sparc-sun-sunos4.1.3_U1 ezk ezk ezk ezk
sparc-sun-sunos4.1.4 ezk ezk ezk ezk
sparc-unknown-linux-gnulibc1 ezk ezk ezk ezk
sparc-unknown-netbsd1.2E ezk ezk ezk
sparc-unknown-netbsd1.2G ezk ezk ezk
sparc64-unknown-linux-gnu ezk ezk ezk ezk
EMAIL ID LEGEND:
@ -68,11 +85,12 @@ EMAIL ID LEGEND:
bking: Bevis R W King <B.King@ee.surrey.ac.uk>
dsr: Dan Riley <dsr@mail.lns.cornell.edu>
ezk: Erez Zadok <ezk@cs.columbia.edu>
finkel: Raphael Finkel <raphael@cs.uky.edu>
jose: Jose Nazario <jose@biocserver.BIOC.CWRU.Edu>
nrh: Nick Hall <nrh@dcs.ed.ac.uk>
ro: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
stolke: Andreas Stolcke <stolcke@speech.sri.com>
wpaul: Bill Paul <wpaul@ctr.columbia.edu>
finkel: Raphael Finkel <raphael@cs.uky.edu>
ro: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
FOOTNOTES:

20
contrib/amd/LSM.am-utils Normal file
View File

@ -0,0 +1,20 @@
Begin3
Title: am-utils
Version: 6.0
Entered-date: 01JAN99
Description: BSD Automounter Utilities
Replaces the old amd-upl102. Offers NFS V3 support, many
new features, and numerous ports. The home page for
am-utils is in http://www.cs.columbia.edu/~ezk/am-utils/
Keywords: amd amq hlfsd fsinfo wire-test fixmount mk-amd-map automount
Author: ezk@cs.columbia.edu (Erez Zadok)
Maintained-by: ezk@cs.columbia.edu (Erez Zadok)
Primary-site: shekel.mcl.cs.columbia.edu /pub/am-utils
1.6MB am-utils-6.0.tar.gz
1.6MB am-utils.tar.gz
1.6MB am-utils-snapshot.tar.gz
Alternate-site: http://www.cs.columbia.edu/~ezk/am-utils/mirrors.html
Original-site: ftp.cs.columbia.edu /pub/amd
Platforms: all modern Unix systems
Copying-policy: BSD
End

View File

@ -1,3 +1,35 @@
*** Notes specific to am-utils version 6.0:
- updated or minor new ports:
hppa2.0w-hp-hpux11.00,
i386-pc-bsdi4.0
i386-unknown-freebsd2.2.8
i386-unknown-netbsd1.3.3
i386-unknown-openbsd2.4
mips-sgi-irix6.5
powerpc-ibm-aix4.3.1.0
i386-unknown-freebsd3.0 now supports nfs v.3
- ctl-amd and ctl-hlfsd now compatible with RedHat's chkconfig utility
- ctl-amd stop will now wait until amd is down
- libamu.so completely self contained --- does not export any symbols which
must be defined by the process linking with it. This is so shared
libraries could be supported on systems that have restrictive shared
libraries.
- use latest autoconf, automake, and libtool (off of cygnus' CVS server) to
support shared libraries on many more platforms.
- posix code cleanups
- bugs fixed:
case insensitive host match in type:=nfsl
correct swapped args to kill(2)
try to avoid a race condition b/t mounting and unmounting
yp_all support is found in libnsl in RH-5.1 systems
*** Notes specific to am-utils version 6.0b1:
- updated or minor new ports:

View File

@ -1,12 +1,12 @@
# -*- text -*-
This is an alpha version of amd. "Buyers" beware!!!
This is the official version of am-utils.
See the file NEWS for news on this and previous releases.
*** General Notes to alpha testers:
*** General Notes to alpha/beta testers:
[A] an an alpha testers, I expect you to be able to find certain things on
[A] as alpha/beta testers, I expect you to be able to find certain things on
your own (especially look at the sources to figure out how things work).
[B] if you intend to modify any files, first find out if the file you want

View File

@ -67,7 +67,7 @@ correct new prototype.
use HAVE_SVC_GETREQSET instead of RPC_4.
replace all "jsp" in *.[hc] $Id$ with ezk.
replace all "jsp" in *.[hc] $Id: TODO,v 1.1.1.1 1998/11/05 02:04:19 ezk Exp $ with ezk.
use MNTTAB_FILE_NAME instead of MOUNTED

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: am_ops.c,v 5.2.2.1 1992/02/09 15:08:17 jsp beta $
* $Id: am_ops.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
*
*/
@ -315,7 +315,7 @@ reverse_option(const char *opt)
* Caller must eventually free the string being returned.
*/
static char *
merge_opts(char *opts1, char *opts2)
merge_opts(const char *opts1, const char *opts2)
{
mntent_t mnt2; /* place holder for opts2 */
char *newstr; /* new string to return (malloc'ed) */
@ -327,7 +327,7 @@ merge_opts(char *opts1, char *opts2)
char *s1 = strdup(opts1); /* copy of opts1 to munge */
/* initialization */
mnt2.mnt_opts = opts2;
mnt2.mnt_opts = (char *) opts2;
newstr = xmalloc(len);
newstr[0] = '\0';

View File

@ -38,7 +38,7 @@
.\"
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amd.8,v 5.2.2.1 1992/02/09 15:11:11 jsp beta $
.\" $Id: amd.8,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
.\"
.TH AMD 8 "3 November 1989"
.SH NAME

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amd.c,v 5.2.2.1 1992/02/09 15:08:15 jsp beta $
* $Id: amd.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
*
*/
@ -55,23 +55,29 @@
struct amu_global_options gopt; /* where global options are stored */
char pid_fsname[16 + MAXHOSTNAMELEN]; /* "kiska.southseas.nz:(pid%d)" */
#if 0
char *progname; /* "amd" */
#endif
char *hostdomain = "unknown.domain";
#if 0
char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
#endif
char hostd[2 * MAXHOSTNAMELEN + 1]; /* Host+domain */
char *endian = ARCH_ENDIAN; /* Big or Little endian */
char *cpu = HOST_CPU; /* CPU type */
char *PrimNetName; /* name of primary network */
char *PrimNetNum; /* number of primary network */
int foreground = 1; /* This is the top-level server */
int immediate_abort; /* Should close-down unmounts be retried */
int orig_umask;
int orig_umask = 022;
int select_intr_valid;
jmp_buf select_intr;
#if 0
pid_t mypid; /* Current process id */
serv_state amd_state;
int foreground = 1; /* This is the top-level server */
#endif
struct amd_stats amd_stats; /* Server statistics */
struct in_addr myipaddr; /* (An) IP address of this host */
time_t do_mapc_reload = 0; /* mapc_reload() call required? */
@ -168,7 +174,7 @@ daemon_mode(void)
*/
for (;;)
pause();
/* should never reache here */
/* should never reach here */
}
#ifdef HAVE_SIGACTION
sigaction(SIGQUIT, &osa, NULL);
@ -181,7 +187,7 @@ daemon_mode(void)
*/
if (gopt.flags & CFM_PRINT_PID) {
if (STREQ(gopt.pid_file, "/dev/stdout")) {
printf("%ld\n", (long) mypid);
printf("%ld\n", (long) am_mypid);
fflush(stdout);
/* do not fclose stdout */
} else {
@ -190,7 +196,7 @@ daemon_mode(void)
f = fopen(gopt.pid_file, "w");
if (f) {
fprintf(f, "%ld\n", (long) mypid);
fprintf(f, "%ld\n", (long) am_mypid);
(void) fclose(f);
} else {
fprintf(stderr, "cannot open %s (errno=%d)\n", gopt.pid_file, errno);
@ -307,6 +313,8 @@ main(int argc, char *argv[])
char *domdot, *verstr;
int ppid = 0;
int error;
char *progname = NULL; /* "amd" */
char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
#ifdef HAVE_SIGACTION
struct sigaction sa;
#endif /* HAVE_SIGACTION */
@ -334,13 +342,14 @@ main(int argc, char *argv[])
}
if (!progname)
progname = "amd";
am_set_progname(progname);
/*
* Initialise process id. This is kept
* Initialize process id. This is kept
* cached since it is used for generating
* and using file handles.
*/
mypid = getpid();
am_set_mypid();
/*
* Get local machine name
@ -359,13 +368,18 @@ main(int argc, char *argv[])
going_down(1);
}
#ifdef DEBUG
/* initialize debugging flags (Register AMQ, Enter daemon mode) */
debug_flags = D_AMQ | D_DAEMON;
#endif /* DEBUG */
/*
* Initialize global options structure.
*/
init_global_options();
/*
* Partially initialise hostd[]. This
* Partially initialize hostd[]. This
* is completed in get_args().
*/
if ((domdot = strchr(hostname, '.'))) {
@ -378,6 +392,7 @@ main(int argc, char *argv[])
hostdomain = domdot;
}
strcpy(hostd, hostname);
am_set_hostname(hostname);
/*
* Trap interrupts for shutdowns.
@ -519,7 +534,7 @@ main(int argc, char *argv[])
#endif /* DEBUG */
ppid = daemon_mode();
sprintf(pid_fsname, "%s:(pid%ld)", hostname, (long) mypid);
sprintf(pid_fsname, "%s:(pid%ld)", am_get_hostname(), (long) am_mypid);
do_mapc_reload = clocktime() + ONE_HOUR;
@ -528,7 +543,7 @@ main(int argc, char *argv[])
*/
error = mount_automounter(ppid);
if (error && ppid)
kill(SIGALRM, ppid);
kill(ppid, SIGALRM);
going_down(error);
abort();

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amd.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $
* $Id: amd.h,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -178,18 +178,17 @@ struct mnt_map {
/*
* Mounting a file system may take a significant period of time. The
* problem is that if this is done in the main process thread then
* the entire automounter could be blocked, possibly hanging lots of
* processes on the system. Instead we use a continuation scheme to
* allow mounts to be attempted in a sub-process. When the sub-process
* exits we pick up the exit status (by convention a UN*X error number)
* and continue in a notifier. The notifier gets handed a data structure
* and can then determine whether the mount was successful or not. If
* not, it updates the data structure and tries again until there are no
* more ways to try the mount, or some other permanent error occurs.
* In the mean time no RPC reply is sent, even after the mount is succesful.
* We rely on the RPC retry mechanism to resend the lookup request which
* can then be handled.
* problem is that if this is done in the main process thread then the
* entire automounter could be blocked, possibly hanging lots of processes
* on the system. Instead we use a continuation scheme to allow mounts to
* be attempted in a sub-process. When the sub-process exits we pick up the
* exit status (by convention a UN*X error number) and continue in a
* notifier. The notifier gets handed a data structure and can then
* determine whether the mount was successful or not. If not, it updates
* the data structure and tries again until there are no more ways to try
* the mount, or some other permanent error occurs. In the mean time no RPC
* reply is sent, even after the mount is successful. We rely on the RPC
* retry mechanism to resend the lookup request which can then be handled.
*/
struct continuation {
char **ivec; /* Current mount info */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_auto.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
* $Id: amfs_auto.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
*
*/
@ -477,7 +477,7 @@ try_mount(voidp mvp)
break
fi
if no error on this mount then
this_error = initialise mount point
this_error = initialize mount point
fi
if no error on this mount and mount is delayed then
this_error = -1
@ -496,7 +496,7 @@ try_mount(voidp mvp)
this_error = mount in foreground
fi
fi
if an error occured on this mount then
if an error occurred on this mount then
update stats
save error in mount point
fi
@ -657,7 +657,7 @@ amfs_auto_bgmount(struct continuation * cp, int mpe)
/*
* Will usually need to play around with the mount nodes
* file attribute structure. This must be done here.
* Try and get things initialised, even if the fileserver
* Try and get things initialized, even if the fileserver
* is not known to be up. In the common case this will
* progress things faster.
*/
@ -987,7 +987,7 @@ amfs_auto_lookuppn(am_node *mp, char *fname, int *error_return, int op)
}
/*
* If an error occured then return it.
* If an error occurred then return it.
*/
if (error) {
#ifdef DEBUG
@ -1511,7 +1511,7 @@ amfs_auto_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsen
if (te_next) {
nfsentry *te_saved = te_next->ne_nextentry;
te_next->ne_nextentry = NULL; /* terminate "te" chain */
te_next = te_saved; /* save rest of "te" for next interation */
te_next = te_saved; /* save rest of "te" for next iteration */
dp->dl_eof = FALSE; /* tell readdir there's more */
} else {
dp->dl_eof = TRUE; /* tell readdir that's it */
@ -1565,7 +1565,7 @@ amfs_auto_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsen
if (te_next) {
nfsentry *te_saved = te_next->ne_nextentry;
te_next->ne_nextentry = NULL; /* terminate "te" chain */
te_next = te_saved; /* save rest of "te" for next interation */
te_next = te_saved; /* save rest of "te" for next iteration */
dp->dl_eof = FALSE; /* tell readdir there's more */
}
ep = te; /* send next chunk of "te" chain */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_direct.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
* $Id: amfs_direct.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_error.c,v 5.2.2.1 1992/02/09 15:08:21 jsp beta $
* $Id: amfs_error.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_host.c,v 5.2.2.2 1992/05/31 16:36:08 jsp Exp $
* $Id: amfs_host.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
*
*/
@ -347,7 +347,7 @@ amfs_host_fmount(mntfs *mf)
* The original 10 second per try timeout is WAY too large, especially
* if we're only waiting 10 or 20 seconds max for the response.
* That would mean we'd try only once in 10 seconds, and we could
* lose the transmitt or receive packet, and never try again.
* lose the transmit or receive packet, and never try again.
* A 2-second per try timeout here is much more reasonable.
* 09/28/92 Mike Mitchell, mcm@unx.sas.com
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_inherit.c,v 5.2.2.1 1992/02/09 15:08:26 jsp beta $
* $Id: amfs_inherit.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/
@ -119,7 +119,7 @@ amfs_inherit_init(mntfs *mf)
/*
* Take the linked mount point and
* propogate.
* propagate.
*/
static mntfs *
amfs_inherit_inherit(mntfs *mf)

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_link.c,v 5.2.2.1 1992/02/09 15:09:04 jsp beta $
* $Id: amfs_link.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_linkx.c,v 5.2.2.1 1992/02/09 15:09:04 jsp beta $
* $Id: amfs_linkx.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/
@ -101,4 +101,3 @@ amfs_linkx_mount(am_node *mp)
return 0;
}

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_nfsl.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: amfs_nfsl.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
*
*/
@ -99,7 +99,7 @@ amfs_nfsl_match(am_opts *fo)
struct stat stb;
if (!cp || !ho) {
plog(XLOG_USER, "amfs_nfsl: nost $fs and $rhost must be specified");
plog(XLOG_USER, "amfs_nfsl: host $fs and $rhost must be specified");
return NULL;
}
@ -109,7 +109,7 @@ amfs_nfsl_match(am_opts *fo)
* If link value exists (or same host), then perform amfs_link_match(),
* same as for linkx.
*/
if (!STRCEQ(ho, hostname)) {
if (!STRCEQ(ho, am_get_hostname())) {
plog(XLOG_INFO, "amfs_nfsl: \"%s\" is not local host, using type:=nfs", ho);
return nfs_match(fo);
} else if (lstat(cp, &stb) < 0) {
@ -228,7 +228,7 @@ amfs_nfsl_ffserver(mntfs *mf)
* If link value exists (or same host), then perform
* find_amfs_auto_srvr(), same as for linkx.
*/
if (!STREQ(ho, hostname) || lstat(cp, &stb) < 0) {
if (!STRCEQ(ho, am_get_hostname()) || lstat(cp, &stb) < 0) {
return find_nfs_srvr(mf);
} else {
mf->mf_flags |= MFF_NFSLINK;

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_linxx.c,v 5.2.2.3 1992/05/31 16:13:07 jsp Exp $
* $Id: amfs_nfsx.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/
@ -463,7 +463,7 @@ amfs_nfsx_fumount(mntfs *mf)
* If this node has not been messed with
* and there has been no error so far
* then try and unmount.
* If an error had occured then zero
* If an error had occurred then zero
* the error code so that the remount
* only tries to unmount those nodes
* which had been successfully unmounted.

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_program.c,v 5.2.2.1 1992/02/09 15:08:56 jsp beta $
* $Id: amfs_program.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_root.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
* $Id: amfs_root.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_toplvl.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
* $Id: amfs_toplvl.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
*
*/
@ -158,8 +158,8 @@ mount_amfs_toplvl(char *dir, char *opts)
* Make a ``hostname'' string for the kernel
*/
sprintf(fs_hostname, "pid%ld@%s:%s",
(long) (foreground ? mypid : getppid()),
hostname,
(long) (foreground ? am_mypid : getppid()),
am_get_hostname(),
dir);
/*
* Most kernels have a name length restriction (64 bytes)...

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amfs_union.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
* $Id: amfs_union.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,11 +38,11 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq_subr.c,v 5.2.2.1 1992/02/09 15:08:18 jsp beta $
* $Id: amq_subr.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
*
*/
/*
* Auxilliary routines for amq tool
* Auxiliary routines for amq tool
*/
#ifdef HAVE_CONFIG_H
@ -139,7 +139,7 @@ amqproc_setopt_1_svc(voidp argp, struct svc_req *rqstp)
case AMOPT_LOGFILE:
if (gopt.logfile && opt->as_str
&& STREQ(gopt.logfile, opt->as_str)) {
if (switch_to_logfile(opt->as_str))
if (switch_to_logfile(opt->as_str, orig_umask))
rc = EINVAL;
} else {
rc = EACCES;
@ -303,6 +303,7 @@ bool_t
xdr_amq_mount_tree_node(XDR *xdrs, amq_mount_tree *objp)
{
am_node *mp = (am_node *) objp;
long mtime;
if (!xdr_amq_string(xdrs, &mp->am_mnt->mf_info)) {
return (FALSE);
@ -316,7 +317,8 @@ xdr_amq_mount_tree_node(XDR *xdrs, amq_mount_tree *objp)
if (!xdr_amq_string(xdrs, &mp->am_mnt->mf_ops->fs_type)) {
return (FALSE);
}
if (!xdr_long(xdrs, (long *) &mp->am_stats.s_mtime)) {
mtime = mp->am_stats.s_mtime;
if (!xdr_long(xdrs, &mtime)) {
return (FALSE);
}
if (!xdr_u_short(xdrs, &mp->am_stats.s_uid)) {

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq_svc.c,v 5.2.2.1 1992/02/09 15:09:26 jsp beta $
* $Id: amq_svc.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: autil.c,v 5.2.2.2 1992/03/07 17:52:06 jsp Exp $
* $Id: autil.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
*
*/
@ -393,7 +393,7 @@ dofork(void)
goto top;
}
if (pid == 0) { /* child process (foreground==false) */
mypid = getpid();
am_set_mypid();
foreground = 0;
} else { /* parent process, has one more child */
NumChild++;

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,14 +38,14 @@
*
* %W% (Berkeley) %G%
*
* $Id: clock.c,v 5.2.2.1 1992/02/09 15:08:20 jsp beta $
* $Id: clock.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
*
*/
/*
* Callouts.
*
* Modelled on kernel object of the same name.
* Modeled on kernel object of the same name.
* See usual references.
*
* Use of a heap-based mechanism was rejected:

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: conf.c,v 5.2.2.1 1992/02/09 15:08:23 jsp beta $
* $Id: conf.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
*
*/
@ -373,7 +373,7 @@ gopt_debug_options(const char *val)
return 0;
#else /* not DEBUG */
fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n",
progname);
am_get_progname());
return 1;
#endif /* not DEBUG */
}

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: conf_parse.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $
* $Id: conf_parse.y,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/

View File

@ -18,7 +18,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -39,7 +39,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: conf_tok.l,v 5.2.2.1 1992/02/09 15:09:36 jsp beta $
* $Id: conf_tok.l,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -70,7 +70,7 @@
#endif /* ECHO */
/*
* There are some things that need to be defined only if useing GNU flex.
* There are some things that need to be defined only if using GNU flex.
* These must not be defined if using standard lex
*/
#ifdef FLEX_SCANNER

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: get_args.c,v 5.2.2.1 1992/02/09 15:08:23 jsp beta $
* $Id: get_args.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
*
*/
@ -60,11 +60,12 @@ char *conf_tag = NULL; /* default conf file tags to use */
int usage = 0;
int use_conf_file = 0; /* default don't use amd.conf file */
char *mnttab_file_name = NULL; /* symbol must be available always */
#if 0
#ifdef DEBUG
int debug_flags = D_AMQ /* Register AMQ */
| D_DAEMON; /* Enter daemon mode */
#endif /* DEBUG */
#endif
/*
* Return the version string (dynamic buffer)
@ -131,13 +132,13 @@ get_args(int argc, char *argv[])
if (argc <= 1)
use_conf_file = 1;
while ((opt_ch = getopt(argc, argv, "nprvSa:c:d:k:l:o:t:w:x:y:C:D:F:T:O:H")) != EOF)
while ((opt_ch = getopt(argc, argv, "nprvSa:c:d:k:l:o:t:w:x:y:C:D:F:T:O:H")) != -1)
switch (opt_ch) {
case 'a':
if (*optarg != '/') {
fprintf(stderr, "%s: -a option must begin with a '/'\n",
progname);
am_get_progname());
exit(1);
}
gopt.auto_dir = optarg;
@ -224,7 +225,8 @@ get_args(int argc, char *argv[])
#ifdef DEBUG
usage += debug_option(optarg);
#else /* not DEBUG */
fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n", progname);
fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n",
am_get_progname());
#endif /* not DEBUG */
break;
@ -334,7 +336,7 @@ get_args(int argc, char *argv[])
# endif /* DEBUG */
#endif /* not MOUNT_TABLE_ON_FILE */
if (switch_to_logfile(gopt.logfile) != 0)
if (switch_to_logfile(gopt.logfile, orig_umask) != 0)
plog(XLOG_USER, "Cannot switch logfile");
/*
@ -362,7 +364,7 @@ get_args(int argc, char *argv[])
\t[-k kernel_arch] [-l logfile%s\n\
\t[-t timeout.retrans] [-w wait_timeout] [-C cluster_name]\n\
\t[-o op_sys_ver] [-O op_sys_name]\n\
\t[-F conf_file] [-T conf_tag]", progname,
\t[-F conf_file] [-T conf_tag]", am_get_progname(),
#ifdef HAVE_SYSLOG
# ifdef LOG_DAEMON
"|\"syslog[:facility]\"]"

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_file.c,v 5.2.2.1 1992/02/09 15:08:28 jsp beta $
* $Id: info_file.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_hesiod.c,v 1.1 1997-1998/07/11 08:34:52 danny Exp danny $
* $Id: info_hesiod.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_ldap.c,v 5.2.2.1 1992/02/09 15:08:29 jsp beta $
* $Id: info_ldap.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/
@ -263,7 +263,7 @@ amu_ldap_rebind(ALD *a)
return (0);
}
}
plog(XLOG_WARNING, "Exausted list of ldap servers, looping.\n");
plog(XLOG_WARNING, "Exhausted list of ldap servers, looping.\n");
}
plog(XLOG_USER, "Unable to (re)bind to any ldap hosts\n");

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_ndbm.c,v 5.2.2.1 1992/02/09 15:08:31 jsp beta $
* $Id: info_ndbm.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_nis.c,v 5.2.2.1 1992/02/09 15:08:32 jsp beta $
* $Id: info_nis.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/
@ -228,7 +228,7 @@ nis_search(mnt_map *m, char *map, char *key, char **val, time_t *tp)
YP_ORDER_OUTORDER_TYPE order;
/*
* Make sure domain initialised
* Make sure domain initialized
*/
if (!gopt.nis_domain) {
int error = determine_nis_domain();
@ -341,7 +341,7 @@ nis_mtime(mnt_map *m, char *map, time_t *tp)
* alternate code which avoids a bug in yp_all(). The bug in yp_all() is
* that it does not close a TCP connection to ypserv, and this ypserv runs
* out of open filedescriptors, getting into an infinite loop, thus all YP
* clients enevtually unbind and hang too.
* clients eventually unbind and hang too.
*
* Systems known to be plagued with this bug:
* earlier SunOS 4.x

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_nisplus.c,v 5.2.2.1 1992/02/09 15:08:32 jsp beta $
* $Id: info_nisplus.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_passwd.c,v 5.2.2.1 1992/02/09 15:08:33 jsp beta $
* $Id: info_passwd.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_union.c,v 5.2.2.1 1992/02/09 15:08:34 jsp beta $
* $Id: info_union.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: map.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
* $Id: map.c,v 1.2 1998/12/27 06:24:47 ezk Exp $
*
*/
@ -134,7 +134,7 @@ exported_ap_realloc_map(int nsize)
* Allocate a new mount slot and create
* a new node.
* Fills in the map number of the node,
* but leaves everything else uninitialised.
* but leaves everything else uninitialized.
*/
am_node *
exported_ap_alloc(void)
@ -297,7 +297,7 @@ mk_fattr(am_node *mp, nfsftype vntype)
/*
* Initialise an allocated mount node.
* Initialize an allocated mount node.
* It is assumed that the mount node was b-zero'd
* before getting here so anything that would
* be set to zero isn't done here.
@ -371,7 +371,7 @@ fh_to_mp3(am_nfs_fh *fhp, int *rp, int c_or_d)
* from an old kernel cached filehandle
* which is now out of date.
*/
if (fp->fhh_pid != mypid)
if (fp->fhh_pid != am_mypid)
goto drop;
/*
@ -511,7 +511,7 @@ mp_to_fh(am_node *mp, am_nfs_fh *fhp)
/*
* Take the process id
*/
fp->fhh_pid = mypid;
fp->fhh_pid = am_mypid;
/*
* ... the map number
@ -726,7 +726,7 @@ make_root_node(void)
root_node->am_mnt = root_mnt;
/*
* Initialise the root
* Initialize the root
*/
if (root_mnt->mf_ops->fs_init)
(*root_mnt->mf_ops->fs_init) (root_mnt);
@ -893,7 +893,7 @@ free_map_if_success(int rc, int term, voidp closure)
mf->mf_flags &= ~MFF_UNMOUNTING;
/*
* If a timeout was defered because the underlying filesystem
* If a timeout was deferred because the underlying filesystem
* was busy then arrange for a timeout as soon as possible.
*/
if (mf->mf_flags & MFF_WANTTIMO) {

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: mapc.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
* $Id: mapc.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
*
*/
@ -113,7 +113,7 @@ static char wildcard[] = "*";
typedef struct map_type map_type;
struct map_type {
char *name; /* Name of this map type */
init_fn *init; /* Initialisation */
init_fn *init; /* Initialization */
reload_fn *reload; /* Reload or fill */
isup_fn *isup; /* Is service up or not? (1=up, 0=down) */
search_fn *search; /* Search for new entry */
@ -578,7 +578,7 @@ mapc_create(char *map, char *opt, const char *type)
default:
plog(XLOG_USER, "Ambiguous map cache type \"%s\"; using \"inc\"", opt);
alloc = MAPC_INC;
/* fallthrough... */
/* fall-through... */
case MAPC_NONE:
case MAPC_INC:
case MAPC_ROOT:

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: mntfs.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
* $Id: mntfs.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: nfs_prot_svc.c,v 5.2.2.1 1992/02/09 15:09:30 jsp beta $
* $Id: nfs_prot_svc.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: nfs_start.c,v 5.2.2.1 1992/02/09 15:08:51 jsp beta $
* $Id: nfs_start.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: nfs_subr.c,v 5.2.2.1 1992/02/09 15:08:53 jsp beta $
* $Id: nfs_subr.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
*
*/
@ -141,7 +141,7 @@ nfsproc_getattr_2_svc(am_nfs_fh *argp, struct svc_req *rqstp)
#ifndef MNT2_NFS_OPT_SYMTTL
/*
* This code is needed to defeat Solaris 2.4's (and newer) symlink values
* cache. It forces the last-modifed time of the symlink to be current.
* cache. It forces the last-modified time of the symlink to be current.
* It is not needed if the O/S has an nfs flag to turn off the
* symlink-cache at mount time (such as Irix 5.x and 6.x). -Erez.
*/
@ -211,6 +211,13 @@ nfsproc_lookup_2_svc(nfsdiropargs *argp, struct svc_req *rqstp)
}
res.dr_status = nfs_error(error);
} else {
/*
* XXX: EXPERIMENTAL! Delay unmount of what was looked up. This
* should reduce the chance for race condition between unmounting an
* entry synchronously, and re-mounting it asynchronously.
*/
if (ap->am_ttl < mp->am_ttl)
ap->am_ttl = mp->am_ttl;
mp_to_fh(ap, &res.dr_u.dr_drok_u.drok_fhandle);
res.dr_u.dr_drok_u.drok_attributes = ap->am_fattr;
res.dr_status = NFS_OK;

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_TEMPLATE.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_TEMPLATE.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_autofs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_autofs.c,v 1.2 1998/12/27 06:24:47 ezk Exp $
*
*/
@ -53,7 +53,7 @@
#include <amd.h>
/*
* CLUDGE: wrap whole file in HAVE_FS_AUTOFS, becasue
* KLUDGE: wrap whole file in HAVE_FS_AUTOFS, because
* not all systems with an automounter file system are supported
* by am-utils yet...
*/
@ -76,7 +76,7 @@ static int mount_autofs(char *dir, char *opts);
static int autofs_mount_1_svc(struct mntrequest *mr, struct mntres *result, struct authunix_parms *cred);
static int autofs_unmount_1_svc(struct umntrequest *ur, struct umntres *result, struct authunix_parms *cred);
/* externam declarations */
/* external declarations */
extern bool_t xdr_mntrequest(XDR *, mntrequest *);
extern bool_t xdr_mntres(XDR *, mntres *);
extern bool_t xdr_umntrequest(XDR *, umntrequest *);
@ -284,8 +284,9 @@ mount_autofs(char *dir, char *opts)
/*
* Make a ``hostname'' string for the kernel
*/
sprintf(fs_hostname, "pid%ld@%s:%s", (long) (foreground ? mypid : getppid()),
hostname, dir);
sprintf(fs_hostname, "pid%ld@%s:%s",
(long) (foreground ? am_mypid : getppid()),
am_get_hostname(), dir);
/*
* Most kernels have a name length restriction.
@ -481,7 +482,7 @@ autofs_unmount_1_svc(struct umntrequest *ur, struct umntres *result, struct auth
break
fi
if no error on this mount then
this_error = initialise mount point
this_error = initialize mount point
fi
if no error on this mount and mount is delayed then
this_error = -1
@ -500,7 +501,7 @@ autofs_unmount_1_svc(struct umntrequest *ur, struct umntres *result, struct auth
this_error = mount in foreground
fi
fi
if an error occured on this mount then
if an error occurred on this mount then
update stats
save error in mount point
fi
@ -661,7 +662,7 @@ autofs_bgmount(struct continuation * cp, int mpe)
/*
* Will usually need to play around with the mount nodes
* file attribute structure. This must be done here.
* Try and get things initialised, even if the fileserver
* Try and get things initialized, even if the fileserver
* is not known to be up. In the common case this will
* progress things faster.
*/
@ -711,7 +712,7 @@ autofs_bgmount(struct continuation * cp, int mpe)
cp->retry = TRUE;
}
if (!this_error)
if (!this_error) {
if (p->fs_flags & FS_MBACKGROUND) {
mf->mf_flags |= MFF_MOUNTING; /* XXX */
#ifdef DEBUG
@ -737,6 +738,7 @@ autofs_bgmount(struct continuation * cp, int mpe)
cp->retry = TRUE;
}
}
}
if (this_error >= 0) {
if (this_error > 0) {
@ -859,7 +861,7 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
char *auto_opts; /* Automount options */
int error = 0; /* Error so far */
char path_name[MAXPATHLEN]; /* General path name buffer */
char apath[MAXPATHLEN]; /* authofs path (added space) */
char apath[MAXPATHLEN]; /* autofs path (added space) */
char *pfname; /* Path for database lookup */
struct continuation *cp; /* Continuation structure if need to mount */
int in_progress = 0; /* # of (un)mount in progress */
@ -877,10 +879,11 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
*/
if (amd_state == Finishing) {
#ifdef DEBUG
if ((mf = mp->am_mnt) == 0 || mf->mf_ops == &amfs_direct_ops)
if ((mf = mp->am_mnt) == 0 || mf->mf_ops == &amfs_direct_ops) {
dlog("%s mount ignored - going down", fname);
else
} else {
dlog("%s/%s mount ignored - going down", mp->am_path, fname);
}
#endif /* DEBUG */
ereturn(ENOENT);
}
@ -990,7 +993,7 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
}
/*
* If an error occured then return it.
* If an error occurred then return it.
*/
if (error) {
#ifdef DEBUG

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_cachefs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_cachefs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_cdfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_cdfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_efs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_efs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_lofs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_lofs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_mfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_mfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_nfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_nfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_nfs3.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_nfs3.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_nullfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_nullfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_pcfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_pcfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_tfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_tfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_tmpfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_tmpfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_ufs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_ufs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_umapfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_umapfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_unionfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
* $Id: ops_unionfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/
@ -52,4 +52,4 @@
#include <am_defs.h>
#include <amd.h>
/* FEEL FREE TO INPLEMENT THIS... :-) */
/* FEEL FREE TO IMPLEMENT THIS... :-) */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: ops_xfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
* $Id: ops_xfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: opts.c,v 5.2.2.4 1992/08/02 10:42:21 jsp Exp $
* $Id: opts.c,v 1.2 1998/12/27 06:24:48 ezk Exp $
*
*/
@ -91,7 +91,7 @@ struct functable {
};
/*
* FORWARD DEFINITSION:
* FORWARD DEFINITION:
*/
static int f_in_network(char *);
static int f_netgrp(char *);
@ -106,7 +106,7 @@ static struct am_opts fs_static; /* copy of the options to play with */
static char NullStr[] = "<NULL>";
static char nullstr[] = "";
static char *opt_dkey = NullStr;
static char *opt_host = hostname;
static char *opt_host = nullstr; /* XXX: was the global hostname */
static char *opt_hostd = hostd;
static char *opt_key = nullstr;
static char *opt_keyd = nullstr;
@ -1050,7 +1050,7 @@ expand_op(opt_apply *p, int sel_p)
}
/*
* Check that the search was succesful
* Check that the search was successful
*/
if (!op->name) {
/*
@ -1104,7 +1104,7 @@ expand_op(opt_apply *p, int sel_p)
}
/*
* Save the exansion
* Save the expansion
*/
*p->opt = strdup(expbuf);
}
@ -1219,6 +1219,9 @@ eval_fs_opts(am_opts *fo, char *opts, char *g_opts, char *path, char *key, char
memset((voidp) vars, 0, sizeof(vars));
memset((voidp) fo, 0, sizeof(*fo));
/* set hostname */
opt_host = (char *) am_get_hostname();
/*
* Set key, map & path before expansion
*/
@ -1260,7 +1263,7 @@ eval_fs_opts(am_opts *fo, char *opts, char *g_opts, char *path, char *key, char
ok = FALSE;
/*
* Normalise remote host name.
* Normalize remote host name.
* 1. Expand variables
* 2. Normalize relative to host tables
* 3. Strip local domains from the remote host

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: restart.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
* $Id: restart.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: rpc_fwd.c,v 5.2.2.1 1992/02/09 15:09:01 jsp beta $
* $Id: rpc_fwd.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: sched.c,v 5.2.2.1 1992/02/09 15:09:02 jsp beta $
* $Id: sched.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/
@ -127,7 +127,7 @@ run_task(task_fun tf, voidp ta, cb_fun cf, voidp ca)
p->wchan = (voidp) p;
#ifdef HAVE_SIGACTION
sigemptyset(&new); /* initialise signal set we wish to block */
sigemptyset(&new); /* initialize signal set we wish to block */
sigaddset(&new, SIGCHLD); /* only block on SIGCHLD */
sigprocmask(SIG_BLOCK, &new, &mask);
#else /* not HAVE_SIGACTION */
@ -235,7 +235,7 @@ do_task_notify(void)
* Do callback if it exists
*/
if (p->cb_fun) {
/* these two trigraphs will ensure compatibity with strict POSIX.1 */
/* these two trigraphs will ensure compatibility with strict POSIX.1 */
(*p->cb_fun) (WIFEXITED(p->w) ? WEXITSTATUS(p->w) : 0,
WIFSIGNALED(p->w) ? WTERMSIG(p->w) : 0,
p->cb_closure);

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: srvr_amfs_auto.c,v 5.2.2.1 1992/02/09 15:09:05 jsp beta $
* $Id: srvr_amfs_auto.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: srvr_nfs.c,v 5.2.2.1 1992/02/09 15:09:06 jsp beta $
* $Id: srvr_nfs.c,v 1.2 1998/12/27 06:24:48 ezk Exp $
*
*/
@ -489,7 +489,7 @@ nfs_keepalive(voidp v)
nfs_pinged);
/*
* See if a hard error occured
* See if a hard error occurred
*/
switch (error) {
case ENETDOWN:
@ -571,7 +571,7 @@ nfs_srvr_port(fserver *fs, u_short * port, voidp wchan)
if (error < 0 && wchan && !(fs->fs_flags & FSF_WANT)) {
/*
* If a wait channel is supplied, and no
* error has yet occured, then arrange
* error has yet occurred, then arrange
* that a wakeup is done on the wait channel,
* whenever a wakeup is done on this fs node.
* Wakeup's are done on the fs node whenever
@ -663,6 +663,15 @@ find_nfs_srvr(mntfs *mf)
}
#endif /* MNTTAB_OPT_PROTO */
#ifdef HAVE_NFS_NFSV2_H
/* allow overriding if nfsv2 option is specified in mount options */
if (hasmntopt(&mnt, "nfsv2")) {
nfs_version = (u_long) 2; /* nullify any ``vers=X'' statements */
nfs_proto = "udp"; /* nullify any ``proto=tcp'' stmts */
plog(XLOG_WARNING, "found compatiblity option \"nfsv2\": set options vers=2, proto=udp for host %s", host);
}
#endif /* HAVE_NFS_NFSV2_H */
/*
* lookup host address and canonical name
*/
@ -750,7 +759,7 @@ find_nfs_srvr(mntfs *mf)
nfs_version, nfs_proto, host);
/*
* Try to find an existing fs server stucture for this host.
* Try to find an existing fs server structure for this host.
* Note that differing versions or protocols have their own structures.
* XXX: Need to fix the ping mechanism to actually use the NFS protocol
* chosen here (right now it always uses datagram sockets).

View File

@ -38,7 +38,7 @@
.\"
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amq.8,v 5.2.2.1 1992/02/09 15:11:15 jsp beta $
.\" $Id: amq.8,v 1.1.1.1 1998/11/05 02:04:52 ezk Exp $
.\"
.TH AMQ 8 "25 April 1989"
.SH NAME

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $
* $Id: amq.c,v 1.2 1998/12/27 06:24:50 ezk Exp $
*
*/
@ -54,7 +54,7 @@ char copyright[] = "\
@(#)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 6.0 1997-1998/01/01 15:09:16 ezk $";
static char rcsid[] = "$Id: amq.c,v 1.2 1998/12/27 06:24:50 ezk Exp $";
static char sccsid[] = "%W% (Berkeley) %G%";
#endif /* __GNUC__ < 2 */
#endif /* not lint */
@ -66,7 +66,9 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include <amq.h>
/* locals */
#if 0
char *progname;
#endif
static int flush_flag;
static int minfo_flag;
static int getpid_flag;
@ -86,7 +88,7 @@ static char *def_server = localhost;
extern int optind;
extern char *optarg;
/* forward decalrations */
/* forward declarations */
#ifdef HAVE_TRANSPORT_TYPE_TLI
static CLIENT *get_secure_amd_client(char *host, struct timeval *tv, int *sock);
static int amq_bind_resv_port(int td, u_short *pp);
@ -95,10 +97,13 @@ static int privsock(int ty);
#endif /* not HAVE_TRANSPORT_TYPE_TLI */
/* dummy variables */
#if 0
char hostname[MAXHOSTNAMELEN];
int orig_umask, foreground, debug_flags;
pid_t mypid;
serv_state amd_state;
int foreground, orig_umask;
int debug_flags;
#endif
/* structures */
enum show_opt {
@ -309,6 +314,7 @@ main(int argc, char *argv[])
struct hostent *hp;
int nodefault = 0;
struct timeval tv;
char *progname = NULL;
#ifndef HAVE_TRANSPORT_TYPE_TLI
enum clnt_stat cs;
#endif /* not HAVE_TRANSPORT_TYPE_TLI */
@ -326,11 +332,12 @@ main(int argc, char *argv[])
}
if (!progname)
progname = "amq";
am_set_progname(progname);
/*
* Parse arguments
*/
while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:pP:TU")) != EOF)
while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:pP:TU")) != -1)
switch (opt_ch) {
case 'f':
flush_flag = 1;
@ -412,7 +419,7 @@ main(int argc, char *argv[])
fprintf(stderr, "\
Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
\t[-l logfile|\"syslog\"] [-x log_flags] [-D dbg_opts] [-M mapent]\n\
\t[-P prognum] [-T] [-U]\n", progname);
\t[-P prognum] [-T] [-U]\n", am_get_progname());
exit(1);
}
@ -434,7 +441,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
* Get address of server
*/
if ((hp = gethostbyname(server)) == 0 && !STREQ(server, localhost)) {
fprintf(stderr, "%s: Can't get address of %s\n", progname, server);
fprintf(stderr, "%s: Can't get address of %s\n",
am_get_progname(), server);
exit(1);
}
memset(&server_addr, 0, sizeof server_addr);
@ -469,7 +477,7 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
cs = pmap_ping(&server_addr);
if (cs == RPC_TIMEDOUT) {
fprintf(stderr, "%s: failed to contact portmapper on host \"%s\". %s\n",
progname, server, clnt_sperrno(cs));
am_get_progname(), server, clnt_sperrno(cs));
exit(1);
}
@ -487,7 +495,7 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
}
#endif /* not HAVE_TRANSPORT_TYPE_TLI */
if (!clnt) {
fprintf(stderr, "%s: ", progname);
fprintf(stderr, "%s: ", am_get_progname());
clnt_pcreateerror(server);
exit(1);
}
@ -502,10 +510,12 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
opt.as_str = debug_opts;
rc = amqproc_setopt_1(&opt, clnt);
if (rc && *rc < 0) {
fprintf(stderr, "%s: daemon not compiled for debug\n", progname);
fprintf(stderr, "%s: daemon not compiled for debug\n",
am_get_progname());
errs = 1;
} else if (!rc || *rc > 0) {
fprintf(stderr, "%s: debug setting for \"%s\" failed\n", progname, debug_opts);
fprintf(stderr, "%s: debug setting for \"%s\" failed\n",
am_get_progname(), debug_opts);
errs = 1;
}
}
@ -520,7 +530,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
opt.as_str = xlog_optstr;
rc = amqproc_setopt_1(&opt, clnt);
if (!rc || *rc) {
fprintf(stderr, "%s: setting log level to \"%s\" failed\n", progname, xlog_optstr);
fprintf(stderr, "%s: setting log level to \"%s\" failed\n",
am_get_progname(), xlog_optstr);
errs = 1;
}
}
@ -535,7 +546,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
opt.as_str = amq_logfile;
rc = amqproc_setopt_1(&opt, clnt);
if (!rc || *rc) {
fprintf(stderr, "%s: setting logfile to \"%s\" failed\n", progname, amq_logfile);
fprintf(stderr, "%s: setting logfile to \"%s\" failed\n",
am_get_progname(), amq_logfile);
errs = 1;
}
}
@ -550,7 +562,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
opt.as_str = "";
rc = amqproc_setopt_1(&opt, clnt);
if (!rc || *rc) {
fprintf(stderr, "%s: amd on %s cannot flush the map cache\n", progname, server);
fprintf(stderr, "%s: amd on %s cannot flush the map cache\n",
am_get_progname(), server);
errs = 1;
}
}
@ -570,7 +583,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
show_mi(ml, Full, &mwid, &dwid, &twid);
} else {
fprintf(stderr, "%s: amd on %s cannot provide mount info\n", progname, server);
fprintf(stderr, "%s: amd on %s cannot provide mount info\n",
am_get_progname(), server);
}
}
@ -587,8 +601,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
errno = *rc;
else
errno = ETIMEDOUT;
fprintf(stderr, "%s: could not start new ", progname);
perror("autmount point");
fprintf(stderr, "%s: could not start new ", am_get_progname());
perror("automount point");
}
}
@ -601,7 +615,8 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
fputs(*spp, stdout);
XFREE(*spp);
} else {
fprintf(stderr, "%s: failed to get version information\n", progname);
fprintf(stderr, "%s: failed to get version information\n",
am_get_progname());
errs = 1;
}
}
@ -614,7 +629,7 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
if (ip && *ip) {
printf("%d\n", *ip);
} else {
fprintf(stderr, "%s: failed to get PID of amd\n", progname);
fprintf(stderr, "%s: failed to get PID of amd\n", am_get_progname());
errs = 1;
}
}
@ -646,11 +661,11 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
dwid, dwid, "What");
show_mt(mt, Stats, &mwid, &dwid, &twid);
} else {
fprintf(stderr, "%s: %s not automounted\n", progname, fs);
fprintf(stderr, "%s: %s not automounted\n", am_get_progname(), fs);
}
xdr_pri_free((XDRPROC_T_TYPE) xdr_amq_mount_tree_p, (caddr_t) mtp);
} else {
fprintf(stderr, "%s: ", progname);
fprintf(stderr, "%s: ", am_get_progname());
clnt_perror(clnt, server);
errs = 1;
}
@ -665,7 +680,7 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
if (ms) {
show_ms(ms);
} else {
fprintf(stderr, "%s: ", progname);
fprintf(stderr, "%s: ", am_get_progname());
clnt_perror(clnt, server);
errs = 1;
}
@ -690,13 +705,13 @@ Usage: %s [-h host] [[-f] [-m] [-p] [-v] [-s]] | [[-u] directory ...]]\n\
}
} else {
fprintf(stderr, "%s: ", progname);
fprintf(stderr, "%s: ", am_get_progname());
clnt_perror(clnt, server);
errs = 1;
}
}
exit(errs);
return errs; /* should never reache here */
return errs; /* should never reach here */
}
@ -793,7 +808,7 @@ get_secure_amd_client(char *host, struct timeval *tv, int *sock)
NULL);
if (cs == RPC_TIMEDOUT) {
fprintf(stderr, "%s: failed to contact portmapper on host \"%s\". %s\n",
progname, host, clnt_sperrno(cs));
am_get_progname(), host, clnt_sperrno(cs));
exit(1);
}
}
@ -811,12 +826,12 @@ get_secure_amd_client(char *host, struct timeval *tv, int *sock)
if (!rpcb_getaddr(amd_program_number, AMQ_VERSION, nc, &nb, host)) {
/*
* don't pring error messages here, since amd might legitimately
* don't print error messages here, since amd might legitimately
* serve udp only
*/
goto tryudp;
}
/* Create priviledged TCP socket */
/* Create privileged TCP socket */
*sock = t_open(nc->nc_device, O_RDWR, 0);
if (*sock < 0) {
@ -852,7 +867,7 @@ get_secure_amd_client(char *host, struct timeval *tv, int *sock)
clnt_spcreateerror("couldn't get amd address on udp"));
return NULL;
}
/* create priviledged UDP socket */
/* create privileged UDP socket */
*sock = t_open(nc->nc_device, O_RDWR, 0);
if (*sock < 0) {

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $
* $Id: amq.h,v 1.1.1.1 1998/11/05 02:04:52 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq_clnt.c,v 5.2.2.1 1992/02/09 15:09:24 jsp beta $
* $Id: amq_clnt.c,v 1.1.1.1 1998/11/05 02:04:52 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: amq_xdr.c,v 5.2.2.1 1992/02/09 15:09:23 jsp beta $
* $Id: amq_xdr.c,v 1.1.1.1 1998/11/05 02:04:52 ezk Exp $
*
*/

View File

@ -38,7 +38,7 @@
.\"
.\" %W% (Berkeley) %G%
.\"
.\" $Id: pawd.1,v 5.2.2.1 1992/02/09 15:11:15 jsp beta $
.\" $Id: pawd.1,v 1.1.1.1 1998/11/05 02:04:52 ezk Exp $
.\"
.TH PAWD 1 "6 Jan 1998"
.SH NAME

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: pawd.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $
* $Id: pawd.c,v 1.2 1998/12/27 06:24:50 ezk Exp $
*
*/
@ -59,11 +59,14 @@
#include <amq.h>
/* dummy variables */
#if 0
char *progname;
char hostname[MAXHOSTNAMELEN];
int orig_umask, foreground, debug_flags;
pid_t mypid;
serv_state amd_state;
int foreground, orig_umask;
int debug_flags;
#endif
/* statics */
static char *localhost="localhost";
@ -293,4 +296,3 @@ main(int argc, char *argv[])
}
exit(0);
}

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: checkmount_bsd44.c,v 5.2.2.2 1992/05/31 16:35:45 jsp Exp $
* $Id: checkmount_bsd44.c,v 1.1.1.1 1998/11/05 02:04:33 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: mtab_bsd.c,v 5.2.2.2 1992/11/12 23:29:14 jsp Exp $
* $Id: mtab_bsd.c,v 1.1.1.1 1998/11/05 02:04:37 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: nfs_prot_freebsd2.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $
* $Id: nfs_prot_freebsd2.h,v 1.1.1.1 1998/11/05 02:04:38 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: nfs_prot_freebsd3.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $
* $Id: nfs_prot_freebsd3.h,v 1.2 1998/12/27 06:25:03 ezk Exp $
*
*/
@ -141,62 +141,29 @@ typedef writeargs nfswriteargs;
/*
*
* FreeBSD 3.0 snapshots have NFS V3, but you need to regenrate the rpcsc
* header files as follows:
* cd /usr/local/rpcsvc
* rpcgen -DWANT_NFS3 mount.x
* rpcgen -DWANT_NFS3 nfs_prot.x
* But that's not expected of everyone, plus there are additional things
* needed so I define everything that's needed for NFS V3 here.
* The problem is fixed in FreeBSD-3.0-19981006-BETA hence this code is off.
* FreeBSD-3.0-RELEASE has NFS V3. Older versions had it only defined
* in the rpcgen source file. If you are on an older system, and you
* want NFSv3 support, you need to regenerate the rpcsvc header files as
* follows:
* cd /usr/include/rpcsvc
* rpcgen -h -C -DWANT_NFS3 mount.x
* rpcgen -h -C -DWANT_NFS3 nfs_prot.x
* If you don't want NFSv3, then you will have to turn off the NFSMNT_NFSV3
* macro below. If the code doesn't compile, upgrade to the latest 3.0
* version...
*/
#ifdef NFSMNT_NFSV3_off
#ifdef NFSMNT_NFSV3
# define MOUNT_NFS3 MOUNT_NFS
# define MNTOPT_NFS3 "nfs"
# define MOUNT_NFS3 "nfs" /* is this right? */
# define MNTOPT_NFS3 "nfs"
#define FHSIZE3 64 /* size in bytes of a file handle (v3) */
#define NFS3_FHSIZE 64
#define MOUNTVERS3 ((unsigned long)(3))
#define NFS_V3 ((unsigned long)(3))
typedef struct {
u_int fhandle3_len;
char *fhandle3_val;
} fhandle3;
enum mountstat3 {
MNT3_OK = 0,
MNT3ERR_PERM = 1,
MNT3ERR_NOENT = 2,
MNT3ERR_IO = 5,
MNT3ERR_ACCES = 13,
MNT3ERR_NOTDIR = 20,
MNT3ERR_INVAL = 22,
MNT3ERR_NAMETOOLONG = 63,
MNT3ERR_NOTSUPP = 10004,
MNT3ERR_SERVERFAULT = 10006
};
typedef enum mountstat3 mountstat3;
struct mountres3_ok {
fhandle3 fhandle;
struct {
u_int auth_flavors_len;
int *auth_flavors_val;
} auth_flavors;
};
typedef struct mountres3_ok mountres3_ok;
struct mountres3 {
mountstat3 fhs_status;
union {
mountres3_ok mountinfo;
} mountres3_u;
};
typedef struct mountres3 mountres3;
struct nfs_fh3 {
/*
* as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
* (or the one generated by rpcgen) lacks the proper full definition,
* listed below. A special macro (aux/macros/struct_nfs_fh3.m4) searches
* for this special name before other names.
*/
struct nfs_fh3_freebsd3 {
u_int fh3_length;
union nfs_fh3_u {
struct nfs_fh3_i {
@ -205,7 +172,7 @@ struct nfs_fh3 {
char data[NFS3_FHSIZE];
} fh3_u;
};
typedef struct nfs_fh3 nfs_fh3;
typedef struct nfs_fh3_freebsd3 nfs_fh3_freebsd3;
#endif /* NFSMNT_NFSV3 */

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: transp_sockets.c,v 5.2.2.2 1992/07/18 18:57:03 jsp Exp jsp $
* $Id: transp_sockets.c,v 1.2 1998/11/10 16:23:41 ezk Exp $
*
* Socket specific utilities.
* -Erez Zadok <ezk@cs.columbia.edu>
@ -206,12 +206,10 @@ create_nfs_service(int *soNFSp, u_short *nfs_portp, SVCXPRT **nfs_xprtp, void (*
plog(XLOG_FATAL, "Can't create privileged nfs port");
return 1;
}
if ((*nfs_xprtp = svcudp_create(*soNFSp)) == NULL) {
plog(XLOG_FATAL, "cannot create rpc/udp service");
return 2;
}
if (!svc_register(*nfs_xprtp, NFS_PROGRAM, NFS_VERSION, dispatch_fxn, 0)) {
plog(XLOG_FATAL, "unable to register (NFS_PROGRAM, NFS_VERSION, 0)");
return 3;

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: umount_bsd44.c,v 5.2.2.2 1993/01/27 07:32:45 jsp Exp $
* $Id: umount_bsd44.c,v 1.1.1.1 1998/11/05 02:04:43 ezk Exp $
*
*/

View File

@ -38,7 +38,7 @@
@c
@c %W% (Berkeley) %G%
@c
@c $Id: am-utils.texi,v 6.0 1997/02/09 15:11:50 ezk beta $
@c $Id: am-utils.texi,v 1.2 1998/12/27 06:25:16 ezk Exp $
@c
@setfilename am-utils.info
@ -684,6 +684,7 @@ am-utils, not all systems listed here have been verified working for all
features.
@multitable {Auto-Configured System Name} {Config} {Compile} {Amd} {NFS3} {Shlib} {Hlfsd}
@c @multitable @columnfractions .5 .1 .1 .1 .1 .1
@item @b{Auto-Configured System Name}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@ -691,51 +692,59 @@ features.
@item @b{alpha-dec-osf2.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab @tab @tab
@tab yes @tab yes @tab yes @tab ? @tab no @tab ?
@item @b{alpha-dec-osf4.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{alphaev5-unknown-linux-gnu}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{hppa1.0-hp-hpux11.00}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab no @tab @tab
@tab yes @tab yes @tab yes @tab no @tab yes @tab ?
@item @b{hppa1.1-hp-hpux10.10}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab no @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{hppa1.1-hp-hpux10.20}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab no @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{hppa1.1-hp-hpux9.01}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{hppa1.1-hp-hpux9.05}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{hppa1.1-hp-hpux9.07}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{hppa2.0w-hp-hpux11.00}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-pc-bsdi2.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{i386-pc-bsdi3.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{i386-pc-bsdi3.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{i386-pc-bsdi4.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-pc-solaris2.5.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@ -751,123 +760,167 @@ features.
@item @b{i386-unknown-freebsd2.1.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab ? @tab ?
@item @b{i386-unknown-freebsd2.2.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-unknown-freebsd2.2.6}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-unknown-freebsd2.2.7}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-unknown-freebsd2.2.8}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i386-unknown-freebsd3.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-netbsd1.2.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-netbsd1.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-netbsd1.3.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-netbsd1.3.2}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-netbsd1.3.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-openbsd2.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-openbsd2.2}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-openbsd2.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i386-unknown-openbsd2.4}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{i486-ncr-sysv4.3.03}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab @tab yes @tab @tab
@tab yes @tab yes @tab ? @tab yes @tab yes @tab ?
@item @b{i486-pc-linux-gnulibc1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i486-pc-linux-gnuoldld}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i586-pc-linux-gnu}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i586-pc-linux-gnulibc1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i686-pc-linux-gnu}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{i686-pc-linux-gnulibc1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{m68k-hp-hpux9.00}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab ? @tab ?
@item @b{m68k-sun-sunos4.1.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{m68k-next-nextstep3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no @tab ?
@item @b{mips-dec-ultrix4.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab ? @tab ?
@item @b{mips-sgi-irix5.2}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab @tab @tab @tab @tab @tab
@tab ? @tab ? @tab ? @tab ? @tab ? @tab ?
@item @b{mips-sgi-irix5.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{mips-sgi-irix6.2}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{mips-sgi-irix6.4}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{mips-sgi-irix6.5}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab ? @tab yes @tab yes @tab ?
@item @b{powerpc-ibm-aix4.1.5.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no/broken @tab ?
@item @b{powerpc-ibm-aix4.2.1.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab @tab
@tab yes @tab yes @tab yes @tab yes @tab no/broken @tab ?
@item @b{powerpc-ibm-aix4.3.1.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab ? @tab yes @tab ? @tab ?
@item @b{rs6000-ibm-aix3.2}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab ? @tab ?
@item @b{rs6000-ibm-aix3.2.5}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab ? @tab ?
@item @b{rs6000-ibm-aix4.1.4.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no/broken @tab ?
@item @b{rs6000-ibm-aix4.1.5.0}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab no/broken @tab ?
@item @b{sparc-sun-solaris2.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-solaris2.4}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-solaris2.5}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab yes @tab yes @tab
@tab yes @tab yes @tab yes @tab yes @tab yes @tab ?
@item @b{sparc-sun-solaris2.5.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@ -883,35 +936,39 @@ features.
@item @b{sparc-sun-sunos4.1.1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-sunos4.1.3}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-sunos4.1.3C}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-sunos4.1.3_U1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-sun-sunos4.1.4}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-unknown-linux-gnulibc1}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@item @b{sparc-unknown-netbsd1.2E}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab @tab @tab
@tab yes @tab yes @tab yes @tab ? @tab ? @tab ?
@item @b{sparc-unknown-netbsd1.2G}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab ? @tab ? @tab ?
@item @b{sparc64-unknown-linux-gnu}
@c {Config} {Compile} {Amd} {NFS V.3} {Shlib} {Hlfsd}
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab
@tab yes @tab yes @tab yes @tab n/a @tab yes @tab ?
@end multitable

View File

@ -1,3 +1,3 @@
@set UPDATED 19 October 1998
@set EDITION 6.0b1
@set VERSION 6.0b1
@set UPDATED 27 December 1998
@set EDITION 6.0
@set VERSION 6.0

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
@set UPDATED 19 October 1998
@set EDITION 6.0b1
@set VERSION 6.0b1
@set UPDATED 27 December 1998
@set EDITION 6.0
@set VERSION 6.0

View File

@ -38,7 +38,7 @@
.\"
.\" %W% (Berkeley) %G%
.\"
.\" $Id: fixmount.8,v 5.2.2.1 1992/02/09 15:11:15 jsp beta $
.\" $Id: fixmount.8,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
.\"
.TH FIXMOUNT 8L "26 Feb 1993"
.SH NAME

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fixmount.c,v 5.2.2.2 1992/05/31 16:35:45 jsp Exp $
* $Id: fixmount.c,v 1.2 1998/12/27 06:25:20 ezk Exp $
*
*/
@ -87,11 +87,14 @@ void print_dump(mountlist);
void usage(void);
/* dummy variables */
#if 0
char *progname;
char hostname[MAXHOSTNAMELEN];
int orig_umask, foreground, debug_flags;
pid_t mypid;
serv_state amd_state;
int foreground, orig_umask;
int debug_flags;
#endif
void
usage(void)
@ -288,7 +291,7 @@ main(int argc, char *argv[])
register int rpcs = 0;
struct timeval tv;
while ((ch = getopt(argc, argv, "adervAqfh:")) != EOF)
while ((ch = getopt(argc, argv, "adervAqfh:")) != -1)
switch ((char) ch) {
case 'a':

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_analyze.c,v 5.2.2.1 1992/02/09 15:09:41 jsp beta $
* $Id: fsi_analyze.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_data.h,v 5.2.2.1 1992/02/09 15:09:53 jsp beta $
* $Id: fsi_data.h,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $
*
*/
@ -89,11 +89,10 @@ struct host {
ioloc *h_ioloc;
fsmount *h_netroot, *h_netswap;
#define HF_HOST 0
char *h_hostname; /* The full name of the host */
char *h_lochost; /* The name of the host with local domains *
* * * stripped */
char *h_hostpath; /* The filesystem path to the host (cf * * *
* compute_hostpath) */
char *h_hostname; /* The full name of the host */
char *h_lochost; /* The name of the host with local domains stripped */
char *h_hostpath; /* The filesystem path to the host (cf
compute_hostpath) */
#define HF_ETHER 1
qelem *h_ether;
#define HF_CONFIG 2

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_dict.c,v 5.2.2.1 1992/02/09 15:09:43 jsp beta $
* $Id: fsi_dict.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
*
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_gram.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $
* $Id: fsi_gram.y,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $
*
*/

View File

@ -18,7 +18,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -39,7 +39,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_lex.l,v 5.2.2.1 1992/02/09 15:09:36 jsp beta $
* $Id: fsi_lex.l,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $
*
*/
@ -97,7 +97,7 @@ static int yylineno;
#endif /* ECHO */
/*
* There are some things that need to be defined only if useing GNU flex.
* There are some things that need to be defined only if using GNU flex.
* These must not be defined if using standard lex
*/
#ifdef FLEX_SCANNER

View File

@ -14,7 +14,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -35,7 +35,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsi_util.c,v 5.2.2.1 1992/02/09 15:09:39 jsp beta $
* $Id: fsi_util.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
*
*/

View File

@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93
.\" $Id: fsinfo.8,v 1.2 1994/06/13 20:50:18 mycroft Exp $
.\" $Id: fsinfo.8,v 1.1.1.1 1998/11/05 02:04:54 ezk Exp $
.\"
.TH FSINFO 8 "June 28, 1993"
.SH NAME

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsinfo.c,v 5.2.2.1 1992/02/09 15:09:33 jsp beta $
* $Id: fsinfo.c,v 1.2 1998/12/27 06:25:21 ezk Exp $
*
*/
@ -58,8 +58,8 @@
char **g_argv;
char *autodir = "/a";
char *progname;
char *username;
char hostname[MAXHOSTNAMELEN + 1];
char *username;
char idvbuf[1024];
dict *dict_of_hosts;
dict *dict_of_volnames;
@ -80,9 +80,12 @@ char *fstab_pref;
char *mount_pref;
/* dummy variables */
int orig_umask, foreground, debug_flags;
#if 0
pid_t mypid;
serv_state amd_state;
int foreground, orig_umask;
int debug_flags;
#endif
/*
@ -109,7 +112,7 @@ fsi_get_args(int c, char *v[])
if (!progname)
progname = "fsinfo";
while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != EOF)
while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != -1)
switch (ch) {

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: fsinfo.h,v 5.2.2.1 1992/02/09 15:09:51 jsp beta $
* $Id: fsinfo.h,v 1.2 1998/12/27 06:25:21 ezk Exp $
*
*/
@ -109,6 +109,7 @@ 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);

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: wr_atab.c,v 5.2.2.1 1992/02/09 15:09:44 jsp beta $
* $Id: wr_atab.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
*
*/
@ -129,7 +129,7 @@ write_amount_info(FILE *af, automount *ap, int sk)
fsi_mount *mp = (fsi_mount *) dd->dd_data;
/*
* If the mount point and the exported volname are the
* same then this filesystem will be recognised by
* same then this filesystem will be recognized by
* the restart code - so we don't need to put out a
* special rule for it.
*/

View File

@ -17,7 +17,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* must display the following acknowledgment:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: wr_bparam.c,v 5.2.2.1 1992/02/09 15:09:46 jsp beta $
* $Id: wr_bparam.c,v 1.1.1.1 1998/11/05 02:04:53 ezk Exp $
*
*/

Some files were not shown because too many files have changed in this diff Show More