[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2571-g6523a05

[Günther Deschner]

The branch, v3-2-test has been updated
       via  6523a051ded9f7b433fcce2d4c4a5f186b5a28f6 (commit)
      from  d18778f329f0c49f1250d93cf1b52603afaf15e1 (commit)

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


- Log -----------------------------------------------------------------
commit 6523a051ded9f7b433fcce2d4c4a5f186b5a28f6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 28 10:14:26 2008 +0100

    Fix segfault in _srv_net_file_enum.
    
    Guenther

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

Summary of changes:
 source/rpc_server/srv_srvsvc_nt.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index f0680a8..37bd204 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -1216,17 +1216,20 @@ done:
 
 WERROR _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u)
 {
+	const char *username = NULL;
+
 	switch ( q_u->level ) {
-	case 3: {
-		char *username;
-		if (!(username = rpcstr_pull_unistr2_talloc(
-			      p->mem_ctx, q_u->username))) {
-			return WERR_NOMEM;
+	case 3:
+		if (q_u->username) {
+			username = rpcstr_pull_unistr2_talloc(
+				p->mem_ctx, q_u->username);
+			if (!username) {
+				return WERR_NOMEM;
+			}
 		}
 
 		return net_file_enum_3(username, r_u,
 				       get_enum_hnd(&q_u->enum_hnd));
-	}
 	default:
 		return WERR_UNKNOWN_LEVEL;
 	}


-- 
Samba Shared Repository