diff options
| author | Michael Adam <obnox@samba.org> | 2007-11-16 22:26:26 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-11-16 22:26:26 +0100 |
| commit | 5267c9d2e6ff95687a7121e91496da3ae742d282 (patch) | |
| tree | 627e4d5849874e7be26b6d00016d5a70a33a1c8c | |
| parent | b3976c2ea25732a9f939fbc23020b7ab54c67783 (diff) | |
| download | samba-5267c9d2e6ff95687a7121e91496da3ae742d282.tar.gz samba-5267c9d2e6ff95687a7121e91496da3ae742d282.tar.bz2 samba-5267c9d2e6ff95687a7121e91496da3ae742d282.zip | |
Fix for bug #4781: allow cleaning of /etc/mtab by canonicalizing mountpoint.
Canonicalize mountpoint by trimming trailing slashes before unmounting.
This allows for correct cleanup of /etc/mtab after unmounting.
Thanks to Steve Langasek <vorlon@debian.org>.
Michael
(This used to be commit 118fd6213d5f6419f654e9226a41d527c04346f7)
| -rw-r--r-- | source3/client/umount.cifs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/client/umount.cifs.c b/source3/client/umount.cifs.c index d1195755ca..ab94a20c60 100644 --- a/source3/client/umount.cifs.c +++ b/source3/client/umount.cifs.c @@ -341,6 +341,13 @@ int main(int argc, char ** argv) /* fixup path if needed */ + /* Trim any trailing slashes */ + while ((strlen(mountpoint) > 1) && + (mountpoint[strlen(mountpoint)-1] == '/')) + { + mountpoint[strlen(mountpoint)-1] = '\0'; + } + /* make sure that this is a cifs filesystem */ rc = statfs(mountpoint, &statbuf); |