[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d5eb3b2 s4:torture: remove and useless variable and assignment in smb2.session.reauth5
       via  f33c1c8 auth: fix space/tab mixup in cli_credentials_get_password()
      from  e24fcf0 Fix bug 10162 - POSIX ACL mapping failing when setting DENY ACE's from Windows.

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


- Log -----------------------------------------------------------------
commit d5eb3b225cf5815f703431e5b87c31b06a3ddfc2
Author: Michael Adam <obnox at samba.org>
Date:   Sat Sep 21 02:51:34 2013 +0200

    s4:torture: remove and useless variable and assignment in smb2.session.reauth5
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Sep 21 08:00:02 CEST 2013 on sn-devel-104

commit f33c1c89eeed8bb9c239db12b9adb27760ddb2f9
Author: Michael Adam <obnox at samba.org>
Date:   Sat Sep 21 01:49:08 2013 +0200

    auth: fix space/tab mixup in cli_credentials_get_password()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 auth/credentials/credentials.c |    4 ++--
 source4/torture/smb2/session.c |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index d15cee6..642eef7 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -405,9 +405,9 @@ _PUBLIC_ const char *cli_credentials_get_password(struct cli_credentials *cred)
 
 	if (cred->password_obtained == CRED_CALLBACK && 
 	    !cred->callback_running) {
-	    	cred->callback_running = true;
+		cred->callback_running = true;
 		cred->password = cred->password_cb(cred);
-	    	cred->callback_running = false;
+		cred->callback_running = false;
 		if (cred->password_obtained == CRED_CALLBACK) {
 			cred->password_obtained = CRED_CALLBACK_RESULT;
 			cli_credentials_invalidate_ccache(cred, cred->password_obtained);
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index 6901f47..3d72433 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -591,7 +591,7 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree)
 				| SECINFO_DACL
 				| SECINFO_PROTECTED_DACL
 				| SECINFO_UNPROTECTED_DACL;
-	struct security_descriptor *f_sd1, *f_sd2;
+	struct security_descriptor *f_sd1;
 	struct security_descriptor *d_sd1 = NULL;
 	struct security_ace ace;
 	struct dom_sid *extra_sid;
@@ -836,8 +836,6 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree)
 	status = smb2_getinfo_file(tree, mem_ctx, &qfinfo);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	f_sd2 = qfinfo.query_secdesc.out.sd;
-
 done:
 	if (dh1 != NULL) {
 		smb2_util_close(tree, *dh1);


-- 
Samba Shared Repository