The branch, master has been updated
via 1237128 s4:samldb LDB module - remove a disastrous "talloc_free"
via 0939ba4 Revert "s4:util_samr.c - also here we've now the default
primaryGroupID detection working"
via eaa55b4 s4:torture/rpc/samr.c - fix typos in outputs
from 7e9e35d s4:util_samr.c - also here we've now the default
primaryGroupID detection working
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 123712840f99e633ea8eb2a6491dec8767316aa4
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Sep 12 22:26:10 2010 +0200
s4:samldb LDB module - remove a disastrous "talloc_free"
This completely destroys the program logic (async callbacks). Sorry for
introducing this.
commit 0939ba4488c4c4e59ae10ed0b99b3e237c7f9a84
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Sep 12 22:24:42 2010 +0200
Revert "s4:util_samr.c - also here we've now the default primaryGroupID
detection working"
This reverts commit 7e9e35db4126f953e8a2579d992c63b274011119.
Sorry, the logic is working differently here. We do still need this.
commit eaa55b41239eadd302d983879217a0f391ea701b
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Sep 12 22:10:06 2010 +0200
s4:torture/rpc/samr.c - fix typos in outputs
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/common/util_samr.c | 5 ++++-
source4/dsdb/samdb/ldb_modules/samldb.c | 2 --
source4/torture/rpc/samr.c | 14 +++++++-------
3 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 02f31bf..3a6be10 100644
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -115,6 +115,8 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
cn_name[cn_name_len - 1] = '\0';
container = "CN=Computers";
obj_class = "computer";
+ samdb_msg_add_uint(ldb, tmp_ctx, msg,
+ "primaryGroupID", DOMAIN_RID_DOMAIN_MEMBERS);
} else if (acct_flags == ACB_SVRTRUST) {
if (cn_name[cn_name_len - 1] != '$') {
@@ -124,7 +126,8 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
cn_name[cn_name_len - 1] = '\0';
container = "OU=Domain Controllers";
obj_class = "computer";
-
+ samdb_msg_add_uint(ldb, tmp_ctx, msg,
+ "primaryGroupID", DOMAIN_RID_DCS);
} else {
ldb_transaction_cancel(ldb);
talloc_free(tmp_ctx);
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c
b/source4/dsdb/samdb/ldb_modules/samldb.c
index 7fa27e8..38ac5fb 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -1259,8 +1259,6 @@ static int samldb_modify(struct ldb_module *module,
struct ldb_request *req)
}
}
- talloc_free(ac);
-
return ldb_next_request(module, req);
}
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 4161748..7212f1e 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -4724,7 +4724,7 @@ static bool test_user_ops(struct dcerpc_pipe *p,
} else {
uint32_t expected_flags = (base_acct_flags |
ACB_PWNOTREQ | ACB_DISABLED);
if ((info->info5.acct_flags) != expected_flags) {
- torture_warning(tctx, "QuerUserInfo level 5
failed, it returned 0x%08x when we expected flags of 0x%08x\n",
+ torture_warning(tctx, "QueryUserInfo level 5
failed, it returned 0x%08x when we expected flags of 0x%08x\n",
info->info5.acct_flags,
expected_flags);
/* FIXME: GD */
@@ -4733,7 +4733,7 @@ static bool test_user_ops(struct dcerpc_pipe *p,
}
}
if (info->info5.rid != rid) {
- torture_warning(tctx, "QuerUserInfo level 5
failed, it returned %u when we expected rid of %u\n",
+ torture_warning(tctx, "QueryUserInfo level 5
failed, it returned %u when we expected rid of %u\n",
info->info5.rid, rid);
}
@@ -5356,7 +5356,7 @@ static bool test_CreateUser(struct dcerpc_pipe *p, struct
torture_context *tctx,
ret = false;
} else {
if ((info->info16.acct_flags & acct_flags) !=
acct_flags) {
- torture_warning(tctx, "QuerUserInfo level 16
failed, it returned 0x%08x when we expected flags of 0x%08x\n",
+ torture_warning(tctx, "QueryUserInfo level 16
failed, it returned 0x%08x when we expected flags of 0x%08x\n",
info->info16.acct_flags,
acct_flags);
ret = false;
@@ -5497,7 +5497,7 @@ static bool test_CreateUser2(struct dcerpc_pipe *p,
struct torture_context *tctx
expected_flags |= ACB_PW_EXPIRED;
}
if ((info->info5.acct_flags) != expected_flags)
{
- torture_warning(tctx, "QuerUserInfo
level 5 failed, it returned 0x%08x when we expected flags of 0x%08x\n",
+ torture_warning(tctx, "QueryUserInfo
level 5 failed, it returned 0x%08x when we expected flags of 0x%08x\n",
info->info5.acct_flags,
expected_flags);
ret = false;
@@ -5505,21 +5505,21 @@ static bool test_CreateUser2(struct dcerpc_pipe *p,
struct torture_context *tctx
switch (acct_flags) {
case ACB_SVRTRUST:
if (info->info5.primary_gid !=
DOMAIN_RID_DCS) {
- torture_warning(tctx,
"QuerUserInfo level 5: DC should have had Primary Group %d, got %d\n",
+ torture_warning(tctx,
"QueryUserInfo level 5: DC should have had Primary Group %d, got %d\n",
DOMAIN_RID_DCS,
info->info5.primary_gid);
ret = false;
}
break;
case ACB_WSTRUST:
if (info->info5.primary_gid !=
DOMAIN_RID_DOMAIN_MEMBERS) {
- torture_warning(tctx,
"QuerUserInfo level 5: Domain Member should have had Primary Group %d, got
%d\n",
+ torture_warning(tctx,
"QueryUserInfo level 5: Domain Member should have had Primary Group %d, got
%d\n",
DOMAIN_RID_DOMAIN_MEMBERS, info->info5.primary_gid);
ret = false;
}
break;
case ACB_NORMAL:
if (info->info5.primary_gid !=
DOMAIN_RID_USERS) {
- torture_warning(tctx,
"QuerUserInfo level 5: Users should have had Primary Group %d, got %d\n",
+ torture_warning(tctx,
"QueryUserInfo level 5: Users should have had Primary Group %d, got %d\n",
DOMAIN_RID_USERS,
info->info5.primary_gid);
ret = false;
}
--
Samba Shared Repository
