summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-22 15:22:03 +0200
committerGünther Deschner <gd@samba.org>2010-06-22 15:57:06 +0200
commite439b6cb8ceb01d930bd8ec2d7b9c79ebca5647e (patch)
tree406ba79ce69907ea131cbf408557751dc0efd320 /source4
parentc31ffaf5872292c610394406cf8e8ce61d8439c5 (diff)
downloadsamba-e439b6cb8ceb01d930bd8ec2d7b9c79ebca5647e.tar.gz
samba-e439b6cb8ceb01d930bd8ec2d7b9c79ebca5647e.tar.bz2
samba-e439b6cb8ceb01d930bd8ec2d7b9c79ebca5647e.zip
s4-smbtorture: activate all keys in SetPrinterData keys test.
(just skip some of them still against s3). Guenther
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/spoolss.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index aa708d1ec0..0e9e466e75 100644
--- 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",
-#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",
-#endif
"torture,data",
-#if 0
- /* FIXME: not working with s3 atm. */
-
"torture,data,ex",
"torture,data\\ex",
"torture\\data,ex"
-#endif
};
int i;
@@ -4837,6 +4830,16 @@ static bool test_SetPrinterDataEx_keys(struct torture_context *tctx,
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);