[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-326-g118fd62

[Michael Adam]

The branch, v3-2-test has been updated
       via  118fd6213d5f6419f654e9226a41d527c04346f7 (commit)
       via  d2c7417393e58de12b5747b9d6c19aea3c343ea5 (commit)
      from  a1725f4ff7ed375808c78ac661b539557748d0a5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 118fd6213d5f6419f654e9226a41d527c04346f7
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 16 22:26:26 2007 +0100

    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 at debian.org>.
    
    Michael

commit d2c7417393e58de12b5747b9d6c19aea3c343ea5
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 16 22:22:05 2007 +0100

    Fix an implicit cast warning.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/client/umount.cifs.c |    7 +++++++
 source/lib/readline.c       |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index d119575..ab94a20 100644
--- a/source/client/umount.cifs.c
+++ b/source/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);
 	
diff --git a/source/lib/readline.c b/source/lib/readline.c
index 6fed929..7c12781 100644
--- a/source/lib/readline.c
+++ b/source/lib/readline.c
@@ -65,7 +65,7 @@ static char *smb_readline_replacement(const char *prompt, void (*callback)(void)
 	}
 
 	if (line == NULL) {
-		line = SMB_MALLOC(BUFSIZ);
+		line = (char *)SMB_MALLOC(BUFSIZ);
 		if (!line) {
 			return NULL;
 		}


-- 
Samba Shared Repository