summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-10-30 23:35:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:05 -0500
commit89665e87b47e5cc3299c3234bf3c8b0266f9bab2 (patch)
tree7c7e7a8313ab8c68ebe81947a1d62ae069033334 /source4
parent74dd7d90622a518e54bbbdc4e37fa44cd4181e1e (diff)
downloadsamba-89665e87b47e5cc3299c3234bf3c8b0266f9bab2.tar.gz
samba-89665e87b47e5cc3299c3234bf3c8b0266f9bab2.tar.bz2
samba-89665e87b47e5cc3299c3234bf3c8b0266f9bab2.zip
r3396: Rename form_name -> formname. This time, check smbtorture builds before
committing. (-: (This used to be commit c776232d0130638a85cc8ce75e4bbef75952e856)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/idl/spoolss.idl2
-rw-r--r--source4/scripting/swig/torture/spoolss.py5
-rw-r--r--source4/torture/rpc/spoolss.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 88f3a09db7..204a7ec96c 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -487,7 +487,7 @@
/* Function: 0x21 */
WERROR spoolss_SetForm(
[in,ref] policy_handle *handle,
- [in] unistr form_name,
+ [in] unistr formname,
[in] uint32 level,
[in,switch_is(level)] spoolss_AddFormInfo info
);
diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index c1859bf2d4..78c74569f5 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -163,7 +163,10 @@ def test_AddForm(pipe, handle):
(r['info']['info1'], f)
sys.exit(1)
- # TODO: test spoolss_SetForm()
+ r['formname'] = formname
+ r['info']['info1']['unknown'] = 1
+
+ dcerpc.spoolss_SetForm(pipe, r)
test_DeleteForm(pipe, handle, formname)
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 939c13a937..3156ac7b3b 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -248,7 +248,7 @@ static BOOL test_AddForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct spoolss_SetForm sf;
sf.in.handle = handle;
- sf.in.form_name = formname;
+ sf.in.formname = formname;
sf.in.level = 1;
sf.in.info.info1 = &form;
form.width = 1234;