[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-5-g370d030

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  370d030b227486ba87a98f4f6e8920f52f743a94 (commit)
       via  1e7ee35c0cb937405689f58e8846016b2ab44582 (commit)
       via  f990498818e28cbf12fe387746b182c6893d2639 (commit)
      from  ad711da7972b9ccc8b82c506db830b192a833918 (commit)

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


- Log -----------------------------------------------------------------
commit 370d030b227486ba87a98f4f6e8920f52f743a94
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 5 15:21:43 2008 +0100

    Give a better error message why NetServerSetInfo() may fail in the gui.
    
    Guenther
    (cherry picked from commit 1bbbebb7767b8a25532e8be3dbd274c211e34bbd)

commit 1e7ee35c0cb937405689f58e8846016b2ab44582
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 5 13:20:32 2008 +0100

    Add PICFLAG to libnetapi Makefile.
    
    Guenther
    (cherry picked from commit 29fca3c0353f2be4577613d7e38fbc51d2a370fa)

commit f990498818e28cbf12fe387746b182c6893d2639
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 5 16:20:34 2008 +0100

    Fix coverity ID 525, 526, 527, 528, 529 and 530
    
    Upon failure to allocate one of the arrays, further down the TALLOC_FREE would
    have looked at the variables given to it without initizalizing.
    (cherry picked from commit 6cac3127312acaac65fcd54280605605765787ad)

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

Summary of changes:
 source/lib/netapi/examples/Makefile.in             |    1 +
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    2 +-
 source/lib/netapi/serverinfo.c                     |    3 +
 source/rpc_client/cli_lsarpc.c                     |   40 ++++++++++---------
 4 files changed, 26 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/examples/Makefile.in b/source/lib/netapi/examples/Makefile.in
index 6de3e65..000eef1 100644
--- a/source/lib/netapi/examples/Makefile.in
+++ b/source/lib/netapi/examples/Makefile.in
@@ -7,6 +7,7 @@ LIBS=@LIBS@ -lnetapi -ltdb -ltalloc
 DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
 FLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
 CC=@CC@
+PICFLAG=@PICFLAG@
 LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 DYNEXP=@DYNEXP@
 
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 73b14d4..a3719c7 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -154,7 +154,7 @@ static void callback_apply_description_change(GtkWidget *widget,
 						GTK_MESSAGE_ERROR,
 						GTK_BUTTONS_OK,
 						"Failed to change computer description: %s.",
-						libnetapi_errstr(status));
+						libnetapi_get_error_string(state->ctx, status));
 		g_signal_connect_swapped(dialog, "response",
 					 G_CALLBACK(gtk_widget_destroy),
 					 dialog);
diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 7fa166e..09f275b 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -185,6 +185,9 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 	}
 
 	if (!lp_config_backend_is_registry()) {
+		libnetapi_set_error_string(ctx,
+			"Configuration manipulation requested but not "
+			"supported by backend");
 		return WERR_NOT_SUPPORTED;
 	}
 
diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index 2759881..0b89488 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -243,46 +243,45 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
 				POLICY_HND *pol,
 				int num_sids,
 				const DOM_SID *sids,
-				char ***domains,
-				char ***names,
-				enum lsa_SidType **types)
+				char ***pdomains,
+				char ***pnames,
+				enum lsa_SidType **ptypes)
 {
 	NTSTATUS result = NT_STATUS_OK;
 	int sids_left = 0;
 	int sids_processed = 0;
 	const DOM_SID *hunk_sids = sids;
-	char **hunk_domains = NULL;
-	char **hunk_names = NULL;
-	enum lsa_SidType *hunk_types = NULL;
+	char **hunk_domains;
+	char **hunk_names;
+	enum lsa_SidType *hunk_types;
+	char **domains = NULL;
+	char **names = NULL;
+	enum lsa_SidType *types = NULL;
 
 	if (num_sids) {
-		if (!((*domains) = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
+		if (!(domains = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
 			result = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
 
-		if (!((*names) = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
+		if (!(names = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
 			result = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
 
-		if (!((*types) = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_sids))) {
+		if (!(types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
 			result = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
-	} else {
-		(*domains) = NULL;
-		(*names) = NULL;
-		(*types) = NULL;
 	}
 
 	sids_left = num_sids;
-	hunk_domains = *domains;
-	hunk_names = *names;
-	hunk_types = *types;
+	hunk_domains = domains;
+	hunk_names = names;
+	hunk_types = types;
 
 	while (sids_left > 0) {
 		int hunk_num_sids;
@@ -334,12 +333,15 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
 		hunk_types += hunk_num_sids;
 	}
 
+	*pdomains = domains;
+	*pnames = names;
+	*ptypes = types;
 	return result;
 
 fail:
-	TALLOC_FREE(*domains);
-	TALLOC_FREE(*names);
-	TALLOC_FREE(*types);
+	TALLOC_FREE(domains);
+	TALLOC_FREE(names);
+	TALLOC_FREE(types);
 	return result;
 }
 


-- 
Samba Shared Repository