Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
	source4/scripting/python/samba/provision.py

3 files changed, 33 insertions, 9 deletions

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index dabfc398ce..ad11ee0ed4 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1642,6 +1642,7 @@ bool cli_session_request(struct cli_state *cli,
 {
 	char *p;
 	int len = 4;
+	char *tmp;
 
 	/* 445 doesn't have session request */
 	if (cli->port == 445)
@@ -1651,14 +1652,30 @@ bool cli_session_request(struct cli_state *cli,
 	memcpy(&(cli->called ), called , sizeof(*called ));
 
 	/* put in the destination name */
+
+	tmp = name_mangle(talloc_tos(), cli->called.name,
+			  cli->called.name_type);
+	if (tmp == NULL) {
+		return false;
+	}
+
 	p = cli->outbuf+len;
-	name_mangle(cli->called .name, p, cli->called .name_type);
-	len += name_len(p);
+	memcpy(p, tmp, name_len(tmp));
+	len += name_len(tmp);
+	TALLOC_FREE(tmp);
 
 	/* and my name */
+
+	tmp = name_mangle(talloc_tos(), cli->calling.name,
+			  cli->calling.name_type);
+	if (tmp == NULL) {
+		return false;
+	}
+
 	p = cli->outbuf+len;
-	name_mangle(cli->calling.name, p, cli->calling.name_type);
-	len += name_len(p);
+	memcpy(p, tmp, name_len(tmp));
+	len += name_len(tmp);
+	TALLOC_FREE(tmp);
 
 	/* send a session request (RFC 1002) */
 	/* setup the packet length
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 1843fe262f..56661af70b 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -1519,7 +1519,7 @@ SMBC_chmod_ctx(SMBCCTX *context,
 		return -1;
 	}
 
-	DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, newmode));
+	DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, (unsigned int)newmode));
 
 	if (SMBC_parse_path(frame,
                             context,
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 02b13ae63e..5f3eda44fe 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -1279,12 +1279,19 @@ static int name_interpret(char *in, fstring name)
  Note:  <Out> must be (33 + strlen(scope) + 2) bytes long, at minimum.
 ****************************************************************************/
 
-int name_mangle( char *In, char *Out, char name_type )
+char *name_mangle(TALLOC_CTX *mem_ctx, char *In, char name_type)
 {
 	int   i;
 	int   len;
 	nstring buf;
-	char *p = Out;
+	char *result;
+	char *p;
+
+	result = talloc_array(mem_ctx, char, 33 + strlen(global_scope()) + 2);
+	if (result == NULL) {
+		return NULL;
+	}
+	p = result;
 
 	/* Safely copy the input string, In, into buf[]. */
 	if (strcmp(In,"*") == 0)
@@ -1321,7 +1328,7 @@ int name_mangle( char *In, char *Out, char name_type )
 				p[0] = len;
 				if( len > 0 )
 					p[len+1] = 0;
-				return( name_len(Out) );
+				return result;
 			case '.':
 				p[0] = len;
 				p   += (len + 1);
@@ -1333,7 +1340,7 @@ int name_mangle( char *In, char *Out, char name_type )
 		}
 	}
 
-	return( name_len(Out) );
+	return result;
 }
 
 /****************************************************************************