Changeset 920 for trunk/server/source4/torture/basic

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/basic/base.c (modified) (5 diffs)

trunk/server/source4/torture/basic/base.c

@@ -1477 +1477 @@
 {
         bool nt_status_support;
+        bool client_ntlmv2_auth;
         struct smbcli_state *cli_nt = NULL, *cli_dos = NULL;
         bool result = false;
@@ -1486 +1487 @@
 
         nt_status_support = lpcfg_nt_status_support(tctx->lp_ctx);
+        client_ntlmv2_auth = lpcfg_client_ntlmv2_auth(tctx->lp_ctx);
 
         if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support", "yes")) {
@@ -1491 +1493 @@
                 goto fail;
         }
+        if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth", "yes")) {
+                torture_result(tctx, TORTURE_FAIL, "Could not set 'client ntlmv2 auth = yes'\n");
+                goto fail;
+        }
 
         if (!torture_open_connection(&cli_nt, tctx, 0)) {
@@ -1497 +1503 @@
 
         if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support", "no")) {
-                torture_comment(tctx, "Could not set 'nt status support = yes'\n");
+                torture_result(tctx, TORTURE_FAIL, "Could not set 'nt status support = no'\n");
+                goto fail;
+        }
+        if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth", "no")) {
+                torture_result(tctx, TORTURE_FAIL, "Could not set 'client ntlmv2 auth = no'\n");
                 goto fail;
         }
@@ -1507 +1517 @@
         if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support",
                             nt_status_support ? "yes":"no")) {
-                torture_comment(tctx, "Could not reset 'nt status support = yes'");
+                torture_result(tctx, TORTURE_FAIL, "Could not reset 'nt status support'");
+                goto fail;
+        }
+        if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth",
+                               client_ntlmv2_auth ? "yes":"no")) {
+                torture_result(tctx, TORTURE_FAIL, "Could not reset 'client ntlmv2 auth'");
                 goto fail;
         }