Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes to previous version and some NetBSD tag differences.

Browse Source
This commit is contained in:
wiz 2000-11-20 00:02:56 +00:00
parent 8a09ffd10e
commit 0d632f7ea0
5 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/am-utils/amd/amq_subr.c vendored
View File

@ -1,4 +1,5 @@
/* $NetBSD: amq_subr.c,v 1.2 2000/06/16 02:10:12 dogcow Exp $ */
/* $NetBSD: amq_subr.c,v 1.3 2000/11/20 00:02:56 wiz Exp $ */
/*
* Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry

16
dist/am-utils/amd/srvr_nfs.c vendored
View File

@ -1,4 +1,5 @@
/* $NetBSD: srvr_nfs.c,v 1.2 2000/06/16 02:10:12 dogcow Exp $ */
/* $NetBSD: srvr_nfs.c,v 1.3 2000/11/20 00:02:56 wiz Exp $ */
/*
* Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
@ -39,7 +40,7 @@
*
* %W% (Berkeley) %G%
*
* Id: srvr_nfs.c,v 1.6 2000/01/12 16:44:26 ezk Exp
* Id: srvr_nfs.c,v 1.7 2000/02/16 13:52:57 ezk Exp
*
*/
@ -673,6 +674,17 @@ find_nfs_srvr(mntfs *mf)
}
#endif /* HAVE_NFS_NFSV2_H */
/* check if we globally overridden the NFS version/protocol */
if (gopt.nfs_vers) {
nfs_version = gopt.nfs_vers;
plog(XLOG_INFO, "find_nfs_srvr: force NFS version to %d",
(int) nfs_version);
}
if (gopt.nfs_proto) {
nfs_proto = gopt.nfs_proto;
plog(XLOG_INFO, "find_nfs_srvr: force NFS protocol to %s", nfs_proto);
}
/*
* lookup host address and canonical name
*/

3
dist/am-utils/fsinfo/fsinfo.c vendored
View File

@ -1,4 +1,5 @@
/* $NetBSD: fsinfo.c,v 1.2 2000/06/16 02:10:13 dogcow Exp $ */
/* $NetBSD: fsinfo.c,v 1.3 2000/11/20 00:03:15 wiz Exp $ */
/*
* Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry

3
dist/am-utils/include/amq_defs.h vendored
View File

@ -1,4 +1,5 @@
/* $NetBSD: amq_defs.h,v 1.2 2000/06/16 02:10:13 dogcow Exp $ */
/* $NetBSD: amq_defs.h,v 1.3 2000/11/20 00:03:16 wiz Exp $ */
/*
* Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry

16
dist/am-utils/libamu/wire.c vendored
View File

@ -1,4 +1,5 @@
/* $NetBSD: wire.c,v 1.2 2000/06/16 02:10:13 dogcow Exp $ */
/* $NetBSD: wire.c,v 1.3 2000/11/20 00:03:16 wiz Exp $ */
/*
* Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
@ -39,7 +40,7 @@
*
* %W% (Berkeley) %G%
*
* Id: wire.c,v 1.8 2000/02/07 08:35:29 ezk Exp
* Id: wire.c,v 1.8.2.2 2000/06/09 20:16:26 ezk Exp
*
*/
@ -61,7 +62,6 @@
#include <am_defs.h>
#include <amu.h>
#ifdef HAVE_IFADDRS_H
#include <ifaddrs.h>
#endif /* HAVE_IFADDRS_H */
@ -170,7 +170,17 @@ getwire_lookup(u_long address, u_long netmask, int ishost)
u_char addr[4];
if (irs_gen == NULL)
#ifdef irs_irp_acc
/*
* bsdi4 added another argument to this function, without changing
* its name. The irs_irp_acc is the one (hacky) distinguishing
* feature found in <irs.h> that can differentiate between bsdi3 and
* bsdi4.
*/
irs_gen = irs_gen_acc("", NULL);
#else /* not irs_irp_acc */
irs_gen = irs_gen_acc("");
#endif /* not irs_irp_acc */
if (irs_gen && irs_nw == NULL)
irs_nw = (*irs_gen->nw_map)(irs_gen);
net = ntohl(address) & (mask = ntohl(netmask));