The branch, master has been updated
via 89616420d8b58847babb7cb83a6f41408993ccdc (commit)
via 9e4b51050447eee4fbcf576debf2c8d261808f31 (commit)
from fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 89616420d8b58847babb7cb83a6f41408993ccdc
Author: Günther Deschner <[email protected]>
Date: Mon Jun 8 10:43:17 2009 +0200
s3-samr: support _samr_SetGroupInfo level 2.
Guenther
commit 9e4b51050447eee4fbcf576debf2c8d261808f31
Author: Günther Deschner <[email protected]>
Date: Sun Jun 7 02:27:50 2009 +0200
s4-smbtorture: exclude oem_information checking for s3 in RPC-SAMR.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_samr_nt.c | 4 ++--
source4/torture/rpc/samr.c | 14 ++++++++++----
2 files changed, 12 insertions(+), 6 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 3e5ae2a..2cdb4c1 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5948,8 +5948,8 @@ NTSTATUS _samr_SetGroupInfo(pipes_struct *p,
switch (r->in.level) {
case 2:
- /* group rename is not supported yet */
- return NT_STATUS_NOT_SUPPORTED;
+ fstrcpy(map.nt_name, r->in.info->name.string);
+ break;
case 3:
break;
case 4:
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index c4ceb91..b5eb0e2 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -5592,7 +5592,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p,
struct torture_context *
if (strcmp(info->general.oem_information.string,
domain_comment) != 0) {
printf("QueryDomainInfo level %u returned
different oem_information (comment) (%s, expected %s)\n",
levels[i],
info->general.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3",
false)) {
+ ret = false;
+ }
}
if (!info->general.primary.string) {
printf("QueryDomainInfo level %u returned no
PDC name\n",
@@ -5609,7 +5611,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p,
struct torture_context *
if (strcmp(info->oem.oem_information.string,
domain_comment) != 0) {
printf("QueryDomainInfo level %u returned
different oem_information (comment) (%s, expected %s)\n",
levels[i],
info->oem.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3",
false)) {
+ ret = false;
+ }
}
break;
case 6:
@@ -5623,7 +5627,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p,
struct torture_context *
if
(strcmp(info->general2.general.oem_information.string, domain_comment) != 0) {
printf("QueryDomainInfo level %u returned
different comment (%s, expected %s)\n",
levels[i],
info->general2.general.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3",
false)) {
+ ret = false;
+ }
}
break;
}
@@ -5927,7 +5933,7 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p,
struct torture_context *t
if (torture_setting_bool(tctx, "samba4", false) ||
torture_setting_bool(tctx, "samba3", false)) {
- torture_comment(tctx, "skipping SetMemberAttributesOfGroup test
against Samba4\n");
+ torture_comment(tctx, "skipping SetMemberAttributesOfGroup test
against Samba\n");
} else {
/* this one is quite strange. I am using random inputs in the
hope of triggering an error that might give us a clue */
--
Samba Shared Repository
