[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-781-g4c8d90a

[Günther Deschner]

The branch, v3-4-test has been updated
       via  4c8d90a077901f7901b8202abed54746679aa3a9 (commit)
       via  7f6094fe8238f7a146fe7c45ab31f0e2244704bd (commit)
       via  93f4a4f89448f33dbcf67ebb92fd94e65579b3c4 (commit)
      from  afc2a0f9c860fbaee86c96e2f77b2f551727c2fd (commit)

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


- Log -----------------------------------------------------------------
commit 4c8d90a077901f7901b8202abed54746679aa3a9
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:21:20 2009 +0200

    s3-samr: set the builtin_domain bool flag in get_samr_dispinfo_by_sid().
    
    Volker, please check.
    
    Found by torture test RPC-SAMR-PASSWORDS-PWDLASTSET (which we pass with
    this fix).
    
    Guenther
    (cherry picked from commit 0ba833f3eedff5dec272eb71f3b09becd8707156)

commit 7f6094fe8238f7a146fe7c45ab31f0e2244704bd
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:14:14 2009 +0200

    s3-selftest: enable RPC-SAMR-PASSWORDS-PWDLASTSET whilte testing Samba3.
    
    Guenther
    (cherry picked from commit 490f6c418d8b1280d0a3b85773a72b2047122c12)

commit 93f4a4f89448f33dbcf67ebb92fd94e65579b3c4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:04:44 2009 +0200

    s4-smbtorture: disable CreateUser2 tests when running RPC-SAMR-PASSWORDS-PWDLAST
    against Samba3.
    
    Samba 3 does not (yet) get all the ACB_flag settings right upon creation.
    
    Guenther
    (cherry picked from commit 32add69632ed4a2b877043c8df1185008516c299)

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

Summary of changes:
 source3/rpc_server/srv_samr_nt.c      |    2 ++
 source3/script/tests/test_posix_s3.sh |    3 ++-
 source4/torture/rpc/samr.c            |    4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index b153bef..165fb17 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -343,6 +343,7 @@ static DISP_INFO *get_samr_dispinfo_by_sid(DOM_SID *psid)
 			}
 		}
 		sid_copy(&builtin_dispinfo->sid, &global_sid_Builtin);
+		builtin_dispinfo->builtin_domain = true;
 
 		return builtin_dispinfo;
 	}
@@ -359,6 +360,7 @@ static DISP_INFO *get_samr_dispinfo_by_sid(DOM_SID *psid)
 			}
 		}
 		sid_copy(&domain_dispinfo->sid, get_global_sam_sid());
+		domain_dispinfo->builtin_domain = false;
 
 		return domain_dispinfo;
 	}
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 89a7ea7..093afb6 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -40,7 +40,8 @@ raw="$raw RAW-SAMBA3ROOTDIRFID"
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-rpc="$rpc RPC-SVCCTL RPC-SPOOLSS-WIN RPC-NTSVCS RPC-LSA-LOOKUPSIDS"
+rpc="$rpc RPC-SVCCTL RPC-SPOOLSS-WIN RPC-NTSVCS RPC-LSA-LOOKUPSIDS "
+rpc="$rpc RPC-SAMR-PASSWORDS-PWDLASTSET"
 
 # NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
 # config to allow guest access. I'm not sure whether this would break other
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 8af9867..9c867fd 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -5664,7 +5664,9 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
 		}
 		break;
 	case TORTURE_SAMR_PASSWORDS_PWDLASTSET:
-		ret &= test_CreateUser2(p, tctx, &domain_handle, sid, which_ops, machine_credentials);
+		if (!torture_setting_bool(tctx, "samba3", false)) {
+			ret &= test_CreateUser2(p, tctx, &domain_handle, sid, which_ops, machine_credentials);
+		}
 		ret &= test_CreateUser(p, tctx, &domain_handle, &user_handle, sid, which_ops, machine_credentials);
 		if (!ret) {
 			printf("Testing PASSWORDS PWDLASTSET on domain %s failed!\n", dom_sid_string(tctx, sid));


-- 
Samba Shared Repository