Changeset 745 for trunk/server/source4/torture/winbind

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/winbind/config.mk (deleted)
• source4/torture/winbind/struct_based.c (modified) (19 diffs)
• source4/torture/winbind/winbind.c (modified) (1 diff)
• source4/torture/winbind/wscript_build (copied) (copied from vendor/current/source4/torture/winbind/wscript_build )

trunk/server/source4/torture/winbind/struct_based.c

@@ -21 +21 @@
 #include "includes.h"
 #include "torture/torture.h"
-#include "torture/winbind/proto.h"
 #include "nsswitch/winbind_client.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "param/param.h"
-#include "auth/ntlm/pam_errors.h"
+#include "../libcli/auth/pam_errors.h"
 
 #define DO_STRUCT_REQ_REP_EXT(op,req,rep,expected,strict,warnaction,cmt) do { \
@@ -124 +123 @@
 
         separator = torture_setting_string(torture,
-                                           "winbindd separator",
-                                           lp_winbind_separator(torture->lp_ctx));
+                                           "winbindd_separator",
+                                           lpcfg_winbind_separator(torture->lp_ctx));
+
         torture_assert_int_equal(torture,
                                  rep.data.info.winbind_separator,
@@ -168 +168 @@
 
         expected = torture_setting_string(torture,
-                                          "winbindd netbios name",
-                                          lp_netbios_name(torture->lp_ctx));
+                                          "winbindd_netbios_name",
+                                          lpcfg_netbios_name(torture->lp_ctx));
         expected = strupper_talloc(torture, expected);
-        
+
         torture_assert_str_equal(torture,
                                  rep.data.netbios_name, expected,
@@ -201 +201 @@
 
         expected = torture_setting_string(torture,
-                                          "winbindd netbios domain",
-                                          lp_workgroup(torture->lp_ctx));
+                                          "winbindd_netbios_domain",
+                                          lpcfg_workgroup(torture->lp_ctx));
 
         get_winbind_domain(torture, &domain);
@@ -475 +475 @@
         bool ok;
         bool strict = torture_setting_bool(torture, "strict mode", false);
+        const char *domain_name = torture_setting_string(torture,
+                                        "winbindd_netbios_domain",
+                                        lpcfg_workgroup(torture->lp_ctx));
         struct torture_trust_domain *listd = NULL;
         uint32_t i, count = 0;
@@ -486 +489 @@
                 struct winbindd_request req;
                 struct winbindd_response rep;
+
+                /* getdcname is not expected to work on "BUILTIN" or our own
+                 * domain */
+                if (strequal(listd[i].netbios_name, "BUILTIN") ||
+                    strequal(listd[i].netbios_name, domain_name)) {
+                        continue;
+                }
 
                 ZERO_STRUCT(req);
@@ -618 +628 @@
 
         ok = get_user_list(torture, &users);
-        torture_assert(torture, ok, "failed to get group list");
+        torture_assert(torture, ok, "failed to get user list");
 
         for (count = 0; users[count]; count++) { }
@@ -627 +637 @@
 }
 
-static bool get_group_list(struct torture_context *torture, char ***groups)
+static bool get_group_list(struct torture_context *torture,
+                           unsigned int *num_entries,
+                           char ***groups)
 {
         struct winbindd_request req;
@@ -640 +652 @@
 
         DO_STRUCT_REQ_REP(WINBINDD_LIST_GROUPS, &req, &rep);
-
         extra_data = (char *)rep.extra_data.data;
+
+        *num_entries = rep.data.num_entries;
+
+        if (*num_entries == 0) {
+                torture_assert(torture, extra_data == NULL,
+                               "extra data is null for >0 reported entries\n");
+                *groups = NULL;
+                return true;
+        }
+
         torture_assert(torture, extra_data, "NULL extra data");
 
@@ -655 +676 @@
         SAFE_FREE(rep.extra_data.data);
 
+        torture_assert_int_equal(torture, *num_entries, count,
+                                 "Wrong number of group entries reported.");
+
         *groups = g;
         return true;
@@ -667 +691 @@
         torture_comment(torture, "Running WINBINDD_LIST_GROUPS (struct based)\n");
 
-        ok = get_group_list(torture, &groups);
+        ok = get_group_list(torture, &count, &groups);
         torture_assert(torture, ok, "failed to get group list");
-
-        for (count = 0; groups[count]; count++) { }
 
         torture_comment(torture, "got %d groups\n", count);
@@ -761 +783 @@
 
                 torture_assert(torture, s[i].netbios_name,
-                               "more domains recieved in second run");
+                               "more domains received in second run");
                 torture_assert_str_equal(torture, domlist[i].netbios_name,
                                          s[i].netbios_name,
@@ -829 +851 @@
         ZERO_STRUCT(rep);
         req.data.num_entries = 1;
-        DO_STRUCT_REQ_REP(WINBINDD_GETPWENT, &req, &rep);
+        if (torture_setting_bool(torture, "samba3", false)) {
+                bool __noop = false;
+                DO_STRUCT_REQ_REP_EXT(WINBINDD_GETPWENT, &req, &rep,
+                                      NSS_STATUS_SUCCESS, false, __noop=true,
+                                      NULL);
+        } else {
+                DO_STRUCT_REQ_REP(WINBINDD_GETPWENT, &req, &rep);
+        }
         pwent = (struct winbindd_pw *)rep.extra_data.data;
-        torture_assert(torture, (pwent != NULL), "NULL pwent");
-        torture_comment(torture, "name: %s, uid: %d, gid: %d, shell: %s\n",
-                        pwent->pw_name, pwent->pw_uid, pwent->pw_gid,
-                        pwent->pw_shell);
+        if (!torture_setting_bool(torture, "samba3", false)) {
+                torture_assert(torture, (pwent != NULL), "NULL pwent");
+        }
+        if (pwent) {
+                torture_comment(torture, "name: %s, uid: %d, gid: %d, shell: %s\n",
+                                pwent->pw_name, pwent->pw_uid, pwent->pw_gid,
+                                pwent->pw_shell);
+        }
 
         return true;
@@ -895 +928 @@
                 char *sid;
                 char *name;
+                const char *domain_name = torture_setting_string(torture,
+                                                "winbindd_netbios_domain",
+                                                lpcfg_workgroup(torture->lp_ctx));
 
                 ZERO_STRUCT(req);
@@ -913 +949 @@
                 DO_STRUCT_REQ_REP(WINBINDD_LOOKUPSID, &req, &rep);
 
-                name = talloc_asprintf(torture, "%s%c%s",
-                                       rep.data.name.dom_name,
-                                       winbind_separator(torture),
-                                       rep.data.name.name);
+                if (strequal(rep.data.name.dom_name, domain_name)) {
+                        name = talloc_asprintf(torture, "%s",
+                                               rep.data.name.name);
+                } else {
+                        name = talloc_asprintf(torture, "%s%c%s",
+                                               rep.data.name.dom_name,
+                                               winbind_separator(torture),
+                                               rep.data.name.name);
+                }
 
                 torture_assert_casestr_equal(torture, list[count], name,
@@ -937 +978 @@
         uint32_t count;
 
-        for (count = 0; list[count]; count++) {
+        for (count = 0; list && list[count]; count++) {
                 if (strequal(name, list[count])) {
                         return true;
@@ -956 +997 @@
         char **users;
         char **groups;
-        uint32_t count;
+        uint32_t count, num_groups;
         bool ok;
 
@@ -965 +1006 @@
         lookup_name_sid_list(torture, users);
 
-        ok = get_group_list(torture, &groups);
+        ok = get_group_list(torture, &num_groups, &groups);
         torture_assert(torture, ok, "failed to retrieve list of groups");
-        lookup_name_sid_list(torture, groups);
+        if (num_groups > 0) {
+                lookup_name_sid_list(torture, groups);
+        }
 
         ZERO_STRUCT(req);
@@ -1020 +1063 @@
 struct torture_suite *torture_winbind_struct_init(void)
 {
-        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "STRUCT");
-
-        torture_suite_add_simple_test(suite, "INTERFACE_VERSION", torture_winbind_struct_interface_version);
-        torture_suite_add_simple_test(suite, "PING", torture_winbind_struct_ping);
-        torture_suite_add_simple_test(suite, "INFO", torture_winbind_struct_info);
-        torture_suite_add_simple_test(suite, "PRIV_PIPE_DIR", torture_winbind_struct_priv_pipe_dir);
-        torture_suite_add_simple_test(suite, "NETBIOS_NAME", torture_winbind_struct_netbios_name);
-        torture_suite_add_simple_test(suite, "DOMAIN_NAME", torture_winbind_struct_domain_name);
-        torture_suite_add_simple_test(suite, "CHECK_MACHACC", torture_winbind_struct_check_machacc);
-        torture_suite_add_simple_test(suite, "LIST_TRUSTDOM", torture_winbind_struct_list_trustdom);
-        torture_suite_add_simple_test(suite, "DOMAIN_INFO", torture_winbind_struct_domain_info);
-        torture_suite_add_simple_test(suite, "GETDCNAME", torture_winbind_struct_getdcname);
-        torture_suite_add_simple_test(suite, "DSGETDCNAME", torture_winbind_struct_dsgetdcname);
-        torture_suite_add_simple_test(suite, "LIST_USERS", torture_winbind_struct_list_users);
-        torture_suite_add_simple_test(suite, "LIST_GROUPS", torture_winbind_struct_list_groups);
-        torture_suite_add_simple_test(suite, "SHOW_SEQUENCE", torture_winbind_struct_show_sequence);
-        torture_suite_add_simple_test(suite, "SETPWENT", torture_winbind_struct_setpwent);
-        torture_suite_add_simple_test(suite, "GETPWENT", torture_winbind_struct_getpwent);
-        torture_suite_add_simple_test(suite, "ENDPWENT", torture_winbind_struct_endpwent);
-        torture_suite_add_simple_test(suite, "LOOKUP_NAME_SID", torture_winbind_struct_lookup_name_sid);
+        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "struct");
+
+        torture_suite_add_simple_test(suite, "interface_version", torture_winbind_struct_interface_version);
+        torture_suite_add_simple_test(suite, "ping", torture_winbind_struct_ping);
+        torture_suite_add_simple_test(suite, "info", torture_winbind_struct_info);
+        torture_suite_add_simple_test(suite, "priv_pipe_dir", torture_winbind_struct_priv_pipe_dir);
+        torture_suite_add_simple_test(suite, "netbios_name", torture_winbind_struct_netbios_name);
+        torture_suite_add_simple_test(suite, "domain_name", torture_winbind_struct_domain_name);
+        torture_suite_add_simple_test(suite, "check_machacc", torture_winbind_struct_check_machacc);
+        torture_suite_add_simple_test(suite, "list_trustdom", torture_winbind_struct_list_trustdom);
+        torture_suite_add_simple_test(suite, "domain_info", torture_winbind_struct_domain_info);
+        torture_suite_add_simple_test(suite, "getdcname", torture_winbind_struct_getdcname);
+        torture_suite_add_simple_test(suite, "dsgetdcname", torture_winbind_struct_dsgetdcname);
+        torture_suite_add_simple_test(suite, "list_users", torture_winbind_struct_list_users);
+        torture_suite_add_simple_test(suite, "list_groups", torture_winbind_struct_list_groups);
+        torture_suite_add_simple_test(suite, "show_sequence", torture_winbind_struct_show_sequence);
+        torture_suite_add_simple_test(suite, "setpwent", torture_winbind_struct_setpwent);
+        torture_suite_add_simple_test(suite, "getpwent", torture_winbind_struct_getpwent);
+        torture_suite_add_simple_test(suite, "endpwent", torture_winbind_struct_endpwent);
+        torture_suite_add_simple_test(suite, "lookup_name_sid", torture_winbind_struct_lookup_name_sid);
 
         suite->description = talloc_strdup(suite, "WINBIND - struct based protocol tests");

trunk/server/source4/torture/winbind/winbind.c

@@ -24 +24 @@
 NTSTATUS torture_winbind_init(void)
 {
-        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "WINBIND");
+        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "winbind");
 
         torture_suite_add_suite(suite, torture_winbind_struct_init());