[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon May 30 09:42:03 MDT 2011


The branch, master has been updated
       via  508e160 s3: fix some -Wunused-but-set-variable build warnings.
      from  bcc08dc s3: Add ioctl code to smbd_smb2_ioctl_send debug

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 508e1607764d993c4d9a84793ffb7cfd22357f91
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 30 16:26:17 2011 +0200

    s3: fix some -Wunused-but-set-variable build warnings.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon May 30 17:41:18 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/lib/netapi/user.c          |    2 --
 source3/libsmb/cli_np_tstream.c    |    6 ++----
 source3/libsmb/dsgetdcname.c       |    2 --
 source3/printing/nt_printing_tdb.c |    4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 7831e20..28619a0 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -3137,7 +3137,6 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 	size_t num_del_rids = 0;
 
 	uint32_t *member_rids = NULL;
-	size_t num_member_rids = 0;
 
 	struct GROUP_USERS_INFO_0 *i0 = NULL;
 	struct GROUP_USERS_INFO_1 *i1 = NULL;
@@ -3263,7 +3262,6 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 	}
 
 	member_rids = group_rids.ids;
-	num_member_rids = group_rids.count;
 
 	status = dcerpc_samr_GetGroupsForUser(b, talloc_tos(),
 					      &user_handle,
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c
index 99a7e4f..ba37ea5 100644
--- a/source3/libsmb/cli_np_tstream.c
+++ b/source3/libsmb/cli_np_tstream.c
@@ -479,9 +479,8 @@ static void tstream_cli_np_writev_disconnect_done(struct tevent_req *subreq)
 		tevent_req_data(req, struct tstream_cli_np_writev_state);
 	struct tstream_cli_np *cli_nps =
 		tstream_context_data(state->stream, struct tstream_cli_np);
-	NTSTATUS status;
 
-	status = cli_close_recv(subreq);
+	cli_close_recv(subreq);
 	TALLOC_FREE(subreq);
 
 	cli_nps->cli = NULL;
@@ -853,9 +852,8 @@ static void tstream_cli_np_readv_disconnect_done(struct tevent_req *subreq)
 		tevent_req_data(req, struct tstream_cli_np_readv_state);
 	struct tstream_cli_np *cli_nps =
 		tstream_context_data(state->stream, struct tstream_cli_np);
-	NTSTATUS status;
 
-	status = cli_close_recv(subreq);
+	cli_close_recv(subreq);
 	TALLOC_FREE(subreq);
 
 	cli_nps->cli = NULL;
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 61a104f..edcec0b 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -936,10 +936,8 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
 
 	for (i=0; i<num_dcs; i++) {
 		uint16_t val;
-		int dgm_id;
 
 		generate_random_buffer((uint8_t *)&val, 2);
-		dgm_id = val;
 
 		ip_list.ss = dclist[i].ss;
 		ip_list.port = 0;
diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index e321b90..3c4c661 100644
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -162,7 +162,6 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 	struct security_descriptor *sec, *new_sec;
 	TALLOC_CTX *ctx = state;
 	int result, i;
-	uint32 sd_size;
 	size_t size_new_sec;
 
 	if (!data.dptr || data.dsize == 0) {
@@ -236,9 +235,6 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 
 	/* store it back */
 
-	sd_size = ndr_size_security_descriptor(sd_store->sd, 0)
-		+ sizeof(struct sec_desc_buf);
-
 	status = marshall_sec_desc_buf(ctx, sd_store, &data.dptr, &data.dsize);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("sec_desc_upg_fn: Failed to parse new sec_desc for %s\n", key.dptr ));


-- 
Samba Shared Repository


More information about the samba-cvs mailing list