aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>1998-04-09 23:31:53 +0000
committerH. Peter Anvin <hpa@zytor.com>1998-04-09 23:31:53 +0000
commit601a19cf14e64bef6229701666f143a036b8439d (patch)
tree5a91e5c789b321162779ac7bf70e777f80ad83ff
parent775fece953641a550e297ca58e6c71a9629825de (diff)
downloadautofs3-601a19cf14e64bef6229701666f143a036b8439d.tar.gz
autofs3-601a19cf14e64bef6229701666f143a036b8439d.tar.xz
autofs3-601a19cf14e64bef6229701666f143a036b8439d.zip
Fixed embarrassing bug with SLOPPYOPT in the wrong place.
-rw-r--r--.lastrel2
-rw-r--r--NEWS2
-rw-r--r--modules/mount_nfs.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/.lastrel b/.lastrel
index fd2a018..94ff29c 100644
--- a/.lastrel
+++ b/.lastrel
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/NEWS b/NEWS
index 22295ce..5082060 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
Since autofs-3.1.0:
-------------------
+* The -s option (SLOPPYOPT) was put in the wrong place in mount_nfs.c!
+ Oops! Now fixed.
Since autofs-0.3.14:
--------------------
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index a3adbb3..1996972 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -184,8 +184,8 @@ int mount_mount(const char *root, const char *name, int name_len,
if ( options ) {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t nfs " SLOPPY "-o %s %s %s",
options, whatstr, fullpath);
- err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", "nfs", "-o",
- SLOPPYOPT options, whatstr, fullpath, NULL);
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", "nfs",
+ SLOPPYOPT "-o", options, whatstr, fullpath, NULL);
} else {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t nfs %s %s", whatstr, fullpath);
err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", "nfs",