diff options
| author | obrien <obrien@FreeBSD.org> | 1999-01-24 10:10:20 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-01-24 10:10:20 +0000 |
| commit | 2e9f65c6cc53501f56adb96f8cc9ba0e413aac83 (patch) | |
| tree | 082156e69521a66339d7024dec773aa254b9c598 /contrib/amd/libamu | |
| parent | 979823d1d3428a03aa06e472200d9e0c04b3b837 (diff) | |
| download | FreeBSD-src-2e9f65c6cc53501f56adb96f8cc9ba0e413aac83.zip FreeBSD-src-2e9f65c6cc53501f56adb96f8cc9ba0e413aac83.tar.gz | |
Fix logic surrounding the noconn option.
(this should also shutup the warning message everybody sees)
Submitted by: David Wolfskill <dhw@whistle.com>
Diffstat (limited to 'contrib/amd/libamu')
| -rw-r--r-- | contrib/amd/libamu/mount_fs.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c index 49e6c2d..751ab52 100644 --- a/contrib/amd/libamu/mount_fs.c +++ b/contrib/amd/libamu/mount_fs.c @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mount_fs.c,v 1.1.1.1 1998/11/05 02:04:45 ezk Exp $ + * $Id: mount_fs.c,v 1.1.1.2 1999/01/13 19:20:28 obrien Exp $ * */ @@ -528,12 +528,16 @@ compute_nfs_args(nfs_args_t *nap, mntent_t *mntp, int genflags, struct sockaddr_ * conf/nfs_prot/nfs_prot_*.h files. */ # ifdef USE_UNCONNECTED_NFS_SOCKETS - nap->flags |= MNT2_NFS_OPT_NOCONN; - plog(XLOG_WARNING, "noconn option exists, and was turned ON! (May cause NFS hangs on some systems...)"); + if (!(nap->flags & MNT2_NFS_OPT_NOCONN)) { + nap->flags |= MNT2_NFS_OPT_NOCONN; + plog(XLOG_WARNING, "noconn option not specified, and was just turned ON (OS override)! (May cause NFS hangs on some systems...)"); + } # endif /* USE_UNCONNECTED_NFS_SOCKETS */ # ifdef USE_CONNECTED_NFS_SOCKETS - nap->flags &= ~MNT2_NFS_OPT_NOCONN; - plog(XLOG_WARNING, "noconn option exists, and was turned OFF! (May cause NFS hangs on some systems...)"); + if (nap->flags & MNT2_NFS_OPT_NOCONN) { + nap->flags &= ~MNT2_NFS_OPT_NOCONN; + plog(XLOG_WARNING, "noconn option specified, and was just turned OFF (OS override)! (May cause NFS hangs on some systems...)"); + } # endif /* USE_CONNECTED_NFS_SOCKETS */ } #endif /* MNT2_NFS_OPT_NOCONN */ |
