[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-468-g9059431

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  905943137c2dafca4dc946f9b1f133fc5542eb37 (commit)
      from  750d26b7e9ab39663da0c3e6ccc1288fc08c81ea (commit)

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


- Log -----------------------------------------------------------------
commit 905943137c2dafca4dc946f9b1f133fc5542eb37
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 4 18:47:20 2007 -0800

    More pstring removal.
    Jeremy.

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

Summary of changes:
 source/client/smbmnt.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/smbmnt.c b/source/client/smbmnt.c
index 08dcac8..7f1e1d5 100644
--- a/source/client/smbmnt.c
+++ b/source/client/smbmnt.c
@@ -157,10 +157,18 @@ static int mount_ok(char *mount_point)
 static int
 do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
 {
-	pstring opts;
+	char *opts;
 	struct utsname uts;
 	char *release, *major, *minor;
 	char *data1, *data2;
+	int ret;
+
+	if (asprintf(&opts,
+			"version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
+			mount_uid, mount_gid, data->file_mode,
+			data->dir_mode,options) < 0) {
+		return -1;
+	}
 
 	uname(&uts);
 	release = uts.release;
@@ -176,12 +184,13 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
 		data2 = (char *) data;
 	}
 
-	slprintf(opts, sizeof(opts)-1,
-		 "version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
-		 mount_uid, mount_gid, data->file_mode, data->dir_mode,options);
-	if (mount(share_name, ".", "smbfs", flags, data1) == 0)
+	if (mount(share_name, ".", "smbfs", flags, data1) == 0) {
+		SAFE_FREE(opts);
 		return 0;
-	return mount(share_name, ".", "smbfs", flags, data2);
+	}
+	ret = mount(share_name, ".", "smbfs", flags, data2);
+	SAFE_FREE(opts);
+	return ret;
 }
 
  int main(int argc, char *argv[])


-- 
Samba Shared Repository