The branch, master has been updated
via 595d07d0ab494e3749c71caf86887ad1cebda229 (commit)
from 6e92505080fd6764461563e4fdf1172be1ba2963 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 595d07d0ab494e3749c71caf86887ad1cebda229
Author: Jeff Layton <jlay...@samba.org>
Date: Mon Jun 29 06:16:38 2009 -0400
mount.cifs: don't pass text ro/rw options to kernel
/bin/mount strips off the ro/rw options after setting the MS_RDONLY
flag appropriately. Make mount.cifs do the same thing.
Signed-off-by: Jeff Layton <jlay...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
client/mount.cifs.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index db05665..4387f59 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -771,8 +771,10 @@ static int parse_options(char ** optionsp, unsigned long *
filesys_flags)
got_password = 1;
} else if (strncmp(data, "ro", 2) == 0) {
*filesys_flags |= MS_RDONLY;
+ goto nocopy;
} else if (strncmp(data, "rw", 2) == 0) {
*filesys_flags &= ~MS_RDONLY;
+ goto nocopy;
} else if (strncmp(data, "remount", 7) == 0) {
*filesys_flags |= MS_REMOUNT;
} /* else if (strnicmp(data, "port", 4) == 0) {
--
Samba Shared Repository
