s4-smbtorture: activate all keys in SetPrinterData keys test.

(just skip some of them still against s3).

Guenther

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index aa708d1ec049d89149b9b4fd523167b60591e5b9..0e9e466e751bd2c4d9f254a3d61e8257625dcc67 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -4806,23 +4806,16 @@ static bool test_SetPrinterDataEx_keys(struct torture_context *tctx,
        const char *keys[] = {
                "torturedataex",
                "torture data ex",
        const char *keys[] = {
                "torturedataex",
                "torture data ex",

-#if 0
-       /* FIXME: not working with s3 atm. */

                "torturedataex_with_subkey\\subkey",
                "torturedataex_with_subkey\\subkey:0",
                "torturedataex_with_subkey\\subkey:1",
                "torturedataex_with_subkey\\subkey\\subsubkey",
                "torturedataex_with_subkey\\subkey\\subsubkey:0",
                "torturedataex_with_subkey\\subkey\\subsubkey:1",
                "torturedataex_with_subkey\\subkey",
                "torturedataex_with_subkey\\subkey:0",
                "torturedataex_with_subkey\\subkey:1",
                "torturedataex_with_subkey\\subkey\\subsubkey",
                "torturedataex_with_subkey\\subkey\\subsubkey:0",
                "torturedataex_with_subkey\\subkey\\subsubkey:1",

-#endif

                "torture,data",
                "torture,data",

-#if 0
-       /* FIXME: not working with s3 atm. */
-

                "torture,data,ex",
                "torture,data\\ex",
                "torture\\data,ex"
                "torture,data,ex",
                "torture,data\\ex",
                "torture\\data,ex"

-#endif

        };
        int i;
 
        };
        int i;
 


@@ -4837,6 +4830,16 @@ static bool test_SetPrinterDataEx_keys(struct torture_context *tctx,
                struct spoolss_PrinterEnumValues *einfo;
                uint32_t needed;
 
                struct spoolss_PrinterEnumValues *einfo;
                uint32_t needed;
 

+               if (torture_setting_bool(tctx, "samba3", false)) {
+                       char *q;
+                       q = strrchr(keys[i], '\\');
+                       if (q) {
+                               torture_skip(tctx,
+                                       talloc_asprintf(tctx, "skipping keyname '%s' including '\\' character against Samba3\n",
+                                               keys[i]));
+                       }
+               }
+

                blob_in = data_blob_talloc(tctx, NULL, 42);
 
                generate_random_buffer(blob_in.data, blob_in.length);
                blob_in = data_blob_talloc(tctx, NULL, 42);
 
                generate_random_buffer(blob_in.data, blob_in.length);