The branch, v3-4-test has been updated
via edf797fb614271c17bc005a661af8c8e8b913d81 (commit)
via cfb5e97b88aae1780b5ef14baa15d9c692d157ab (commit)
via e9af8e25f2c65decaf1a9e3c452c1a4c38042b48 (commit)
via a0c16dbb46ef334126db771d7adb908d822eac6d (commit)
via ed95e2978dd8b3c4a7e72569419748156ab5c760 (commit)
from 4ee6b7934e91b87122ff7bad4c89a0ab9bdd3bf0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit edf797fb614271c17bc005a661af8c8e8b913d81
Author: Günther Deschner <[email protected]>
Date: Fri Apr 17 01:30:54 2009 +0200
s3-docs: fix typo in smb.conf.5.
Guenther
(cherry picked from commit 05ea8daacabe62b6c20770a8518192c44e7eb763)
commit cfb5e97b88aae1780b5ef14baa15d9c692d157ab
Author: Günther Deschner <[email protected]>
Date: Fri Apr 17 01:30:16 2009 +0200
s3-selftest: enable RPC-LSA-LOOKUPSIDS against samba 3.
Guenther
(cherry picked from commit deb719a62e0909d476b9817c45a32766dc9709d7)
commit e9af8e25f2c65decaf1a9e3c452c1a4c38042b48
Author: Günther Deschner <[email protected]>
Date: Fri Apr 17 01:28:41 2009 +0200
s4-smbtorture: add LSA-LOOKUPSIDS to verify bug #6263.
Guenther
(cherry picked from commit c794ba71b762676c1cfe1eba40b4a254f16ad06a)
commit a0c16dbb46ef334126db771d7adb908d822eac6d
Author: Günther Deschner <[email protected]>
Date: Fri Apr 17 01:26:40 2009 +0200
s4-smbtorture: Fix crash in RPC-LSA-LOOKUP
Guenther
(cherry picked from commit b0a0d2a0ae16929efa392705c3d7823da16f4d55)
commit ed95e2978dd8b3c4a7e72569419748156ab5c760
Author: Günther Deschner <[email protected]>
Date: Thu Apr 16 13:03:35 2009 +0200
s3-docs: document warn_pwd_expire pam_winbind option in manpage.
Andreas, please check.
Guenther
(cherry picked from commit 5517c0bcddfbd8c877fd1f909407824553a20e7f)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/pam_winbind.7.xml | 9 ++-
.../smbdotconf/winbind/winbindnormalizenames.xml | 2 +-
source3/script/tests/test_posix_s3.sh | 2 +-
source4/torture/rpc/lsa_lookup.c | 90 ++++++++++++++++++++
source4/torture/rpc/rpc.c | 1 +
5 files changed, 101 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml
b/docs-xml/manpages-3/pam_winbind.7.xml
index 1d6f0df..ced6174 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.7.xml
@@ -142,8 +142,15 @@
</para></listitem>
</varlistentry>
- </variablelist>
+ <varlistentry>
+ <term>warn_pwd_expire</term>
+ <listitem><para>
+ Defines number of days before pam_winbind starts to warn about
passwords that are
+ going to expire. Defaults to 14 days.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
</para>
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index 5b68bca..ba71686 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -16,7 +16,7 @@
</para>
<para>This feature also enables the name aliasing API which can
- be used to make domain user and group names to a non-qlaified
+ be used to make domain user and group names to a non-qualified
version. Please refer to the manpage for the configured
idmap and nss_info plugin for the specifics on how to configure
name aliasing for a specific configuration. Name aliasing takes
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index b3a66e1..89a7ea7 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -40,7 +40,7 @@ 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="$rpc RPC-SVCCTL RPC-SPOOLSS-WIN RPC-NTSVCS RPC-LSA-LOOKUPSIDS"
# 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/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 0124ce1..0a4c990 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -88,6 +88,7 @@ static NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, uint16_t
level,
{
struct lsa_LookupSids r;
struct lsa_SidArray sidarray;
+ struct lsa_RefDomainList *domains;
uint32_t count = 0;
uint32_t i;
@@ -108,6 +109,7 @@ static NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, uint16_t
level,
r.in.count = &count;
r.out.names = names;
r.out.count = &count;
+ r.out.domains = &domains;
return dcerpc_lsa_LookupSids(p, mem_ctx, &r);
}
@@ -322,3 +324,91 @@ bool torture_rpc_lsa_lookup(struct torture_context
*torture)
return ret;
}
+
+static bool test_LookupSidsReply(struct torture_context *tctx,
+ struct dcerpc_pipe *p)
+{
+ struct policy_handle *handle;
+
+ struct dom_sid **sids;
+ uint32_t num_sids = 1;
+
+ struct lsa_LookupSids r;
+ struct lsa_SidArray sidarray;
+ struct lsa_RefDomainList *domains = NULL;
+ struct lsa_TransNameArray names;
+ uint32_t count = 0;
+
+ uint32_t i;
+ NTSTATUS status;
+ const char *dom_sid = "S-1-5-21-1111111111-2222222222-3333333333";
+ const char *dom_admin_sid;
+
+ if (!open_policy(tctx, p, &handle)) {
+ return false;
+ }
+
+ dom_admin_sid = talloc_asprintf(tctx, "%s-%d", dom_sid, 512);
+
+ sids = talloc_array(tctx, struct dom_sid *, num_sids);
+
+ sids[0] = dom_sid_parse_talloc(tctx, dom_admin_sid);
+
+ names.count = 0;
+ names.names = NULL;
+
+ sidarray.num_sids = num_sids;
+ sidarray.sids = talloc_array(tctx, struct lsa_SidPtr, num_sids);
+
+ for (i=0; i<num_sids; i++) {
+ sidarray.sids[i].sid = sids[i];
+ }
+
+ r.in.handle = handle;
+ r.in.sids = &sidarray;
+ r.in.names = &names;
+ r.in.level = LSA_LOOKUP_NAMES_ALL;
+ r.in.count = &count;
+ r.out.names = &names;
+ r.out.count = &count;
+ r.out.domains = &domains;
+
+ status = dcerpc_lsa_LookupSids(p, tctx, &r);
+
+ torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NONE_MAPPED,
+ "unexpected error code");
+
+ torture_assert_int_equal(tctx, names.count, num_sids,
+ "unexpected names count");
+ torture_assert(tctx, names.names,
+ "unexpected names pointer");
+ torture_assert_str_equal(tctx, names.names[0].name.string,
dom_admin_sid,
+ "unexpected names[0].string");
+
+#if 0
+ /* vista sp1 passes, w2k3 sp2 fails */
+ torture_assert_int_equal(tctx, domains->count, num_sids,
+ "unexpected domains count");
+ torture_assert(tctx, domains->domains,
+ "unexpected domains pointer");
+ torture_assert_str_equal(tctx, dom_sid_string(tctx,
domains->domains[0].sid), dom_sid,
+ "unexpected domain sid");
+#endif
+
+ return true;
+}
+
+/* check for lookup sids results */
+struct torture_suite *torture_rpc_lsa_lookup_sids(TALLOC_CTX *mem_ctx)
+{
+ struct torture_suite *suite;
+ struct torture_rpc_tcase *tcase;
+
+ suite = torture_suite_create(mem_ctx, "LSA-LOOKUPSIDS");
+ tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
+ &ndr_table_lsarpc);
+
+ torture_rpc_tcase_add_test(tcase, "LookupSidsReply",
test_LookupSidsReply);
+
+ return suite;
+}
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 069bb51..5624c32 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -378,6 +378,7 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_simple_test(suite, "LSA", torture_rpc_lsa);
torture_suite_add_simple_test(suite, "LSALOOKUP",
torture_rpc_lsa_lookup);
torture_suite_add_simple_test(suite, "LSA-GETUSER",
torture_rpc_lsa_get_user);
+ torture_suite_add_suite(suite, torture_rpc_lsa_lookup_sids(suite));
torture_suite_add_suite(suite, torture_rpc_lsa_secrets(suite));
torture_suite_add_suite(suite, torture_rpc_echo(suite));
torture_suite_add_simple_test(suite, "DFS", torture_rpc_dfs);
--
Samba Shared Repository
