[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1431-g1b2c65f

[Tim Prouty]

The branch, master has been updated
       via  1b2c65ff8d3c0033a0207801319dda662dbad4ba (commit)
       via  032bb807c70a442f539c5321c2a903461f83ac54 (commit)
      from  e46a88ce35e1aba9d9a344773bc97a9f3f2bd616 (commit)

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


- Log -----------------------------------------------------------------
commit 1b2c65ff8d3c0033a0207801319dda662dbad4ba
Author: Tim Prouty <tprouty at samba.org>
Date:   Mon May 4 08:51:55 2009 -0700

    s3 torture: Fix comparison is always true warning

commit 032bb807c70a442f539c5321c2a903461f83ac54
Author: Tim Prouty <tprouty at samba.org>
Date:   Mon May 4 08:50:35 2009 -0700

    libcli: Fix shadowed variable warning

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

Summary of changes:
 libcli/named_pipe_auth/npa_tstream.c |    4 ++--
 source3/torture/denytest.c           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c
index c1a293e..57e8418 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -63,7 +63,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx,
 					const char *directory,
 					const char *npipe,
 					const struct tsocket_address *client,
-					const char *client_name,
+					const char *client_name_in,
 					const struct tsocket_address *server,
 					const char *server_name,
 					const struct netr_SamInfo3 *info3,
@@ -119,7 +119,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx,
 		state->auth_req.level = 2;
 		info2 = &state->auth_req.info.info2;
 
-		info2->client_name = client_name;
+		info2->client_name = client_name_in;
 		info2->client_addr = tsocket_address_inet_addr_string(client, state);
 		if (!info2->client_addr) {
 			/* errno might be EINVAL */
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 1360fc2..e5cd5a2 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1555,8 +1555,8 @@ bool torture_denytest2(int dummy)
 			       resultstr(denytable2[i].result));
 		}
 
-		if (fnum1 != -1) cli_close(cli1, fnum1);
-		if (fnum2 != -1) cli_close(cli2, fnum2);
+		cli_close(cli1, fnum1);
+		cli_close(cli2, fnum2);
 	}
 		
 	for (i=0;i<2;i++) {


-- 
Samba Shared Repository