Changeset 988 for vendor/current/source4/param/tests

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/param/tests

Files:

• loadparm.c (modified) (3 diffs)
• share.c (modified) (1 diff)

vendor/current/source4/param/tests/loadparm.c

@@ -22 +22 @@
 #include "param/param.h"
 #include "torture/torture.h"
+#include "torture/local/proto.h"
+#include "libds/common/roles.h"
 
 static bool test_create(struct torture_context *tctx)
@@ -143 +145 @@
         struct loadparm_service *service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), "foo");
         torture_assert(tctx, service == lpcfg_service(lp_ctx, "foo"), "invalid service");
+        return true;
+}
+
+static bool test_server_role_default(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_STANDALONE, "ROLE should be standalone by default");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_USER, "security should be user");
+        return true;
+}
+
+static bool test_server_role_dc_specified(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "server role=domain controller"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_ACTIVE_DIRECTORY_DC, "ROLE should be DC");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_USER, "security should be USER");
+        return true;
+}
+
+static bool test_server_role_member_specified(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "server role=member"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_MEMBER, "ROLE should be member");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_ADS, "security should be ADS");
+        return true;
+}
+
+static bool test_server_role_member_specified2(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "server role=member"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "security=domain"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_MEMBER, "ROLE should be member");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_DOMAIN, "security should be domain");
+        return true;
+}
+
+static bool test_server_role_member_specified3(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "server role=member"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "security=ads"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_MEMBER, "ROLE should be member");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_ADS, "security should be ads");
+        return true;
+}
+
+static bool test_server_role_standalone_specified(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "server role=standalone"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_STANDALONE, "ROLE should be standalone");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_USER, "security should be USER");
+        return true;
+}
+
+static bool test_server_role_dc_domain_logons(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "domain logons=true"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_PDC, "ROLE should be PDC");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_USER, "security should be user");
+        return true;
+}
+
+static bool test_server_role_dc_domain_logons_and_not_master(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "domain logons=true"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "domain master=false"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_BDC, "ROLE should be BDC");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_USER, "security should be user");
+        return true;
+}
+
+static bool test_server_role_security_ads(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "security=ads"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_MEMBER, "ROLE should be MEMBER");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_ADS, "security should be ads");
+        return true;
+}
+
+static bool test_server_role_security_domain(struct torture_context *tctx)
+{
+        struct loadparm_context *lp_ctx = loadparm_init(tctx);
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "security=domain"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_server_role(lp_ctx), ROLE_DOMAIN_MEMBER, "ROLE should be MEMBER");
+        torture_assert_int_equal(tctx, lpcfg_security(lp_ctx), SEC_DOMAIN, "security should be domain");
         return true;
 }
@@ -163 +257 @@
         torture_suite_add_simple_test(suite, "do_global_parameter_var", test_do_global_parameter_var);
         torture_suite_add_simple_test(suite, "do_global_parameter", test_do_global_parameter);
+        torture_suite_add_simple_test(suite, "test_server_role_default", test_server_role_default);
+        torture_suite_add_simple_test(suite, "test_server_role_dc_specified", test_server_role_dc_specified);
+        torture_suite_add_simple_test(suite, "test_server_role_member_specified", test_server_role_member_specified);
+        torture_suite_add_simple_test(suite, "test_server_role_member_specified2", test_server_role_member_specified2);
+        torture_suite_add_simple_test(suite, "test_server_role_member_specified3", test_server_role_member_specified3);
+        torture_suite_add_simple_test(suite, "test_server_role_standalone_specified", test_server_role_standalone_specified);
+        torture_suite_add_simple_test(suite, "test_server_role_dc_domain_logons", test_server_role_dc_domain_logons);
+        torture_suite_add_simple_test(suite, "test_server_role_dc_domain_logons_and_not_master", test_server_role_dc_domain_logons_and_not_master);
+        torture_suite_add_simple_test(suite, "test_server_role_security_ads", test_server_role_security_ads);
+        torture_suite_add_simple_test(suite, "test_server_role_security_domain", test_server_role_security_domain);
 
         return suite;

vendor/current/source4/param/tests/share.c

@@ -24 +24 @@
 #include "param/param.h"
 #include "torture/torture.h"
+#include "torture/local/proto.h"
 
 static bool test_list_empty(struct torture_context *tctx,