Fix for bug #4781: allow cleaning of /etc/mtab by canonicalizing mountpoint.

[samba.git] / source / client / umount.cifs.c

diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index 3869e3439fce544ac8dc7177881e9fd3880b3de8..ab94a20c60c19abd62fb3f6d32dbda70fcd1e635 100644 (file)
--- a/source/client/umount.cifs.c
+++ b/source/client/umount.cifs.c
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -342,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);