diff options
| author | Günther Deschner <gd@samba.org> | 2009-03-06 12:01:54 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-03-06 14:32:46 +0100 |
| commit | 4541aa5f846bc7b38e2873d65b5b6a5614a037b4 (patch) | |
| tree | 2fa00d67c989fd71ad44a34812969a8254e84198 /source3 | |
| parent | f9bf09e255c20672f1565aa9e3c51d1274958dcf (diff) | |
| download | samba-4541aa5f846bc7b38e2873d65b5b6a5614a037b4.tar.gz samba-4541aa5f846bc7b38e2873d65b5b6a5614a037b4.tar.bz2 samba-4541aa5f846bc7b38e2873d65b5b6a5614a037b4.zip | |
s3-spoolss: use form flags from idl in rpcclient and net.
Guenther
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpcclient/cmd_spoolss.c | 12 | ||||
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index c88cf89367..fae5c552c2 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -1848,7 +1848,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c switch (level) { case 1: - info1.flags = FORM_USER; + info1.flags = SPOOLSS_FORM_USER; info1.form_name = argv[2]; info1.size.width = 100; info1.size.height = 100; @@ -1861,7 +1861,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c break; case 2: - info2.flags = FORM_USER; + info2.flags = SPOOLSS_FORM_USER; info2.form_name = argv[2]; info2.size.width = 100; info2.size.height = 100; @@ -1930,7 +1930,7 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c /* Dummy up some values for the form data */ - info1.flags = FORM_PRINTER; + info1.flags = SPOOLSS_FORM_PRINTER; info1.size.width = 100; info1.size.height = 100; info1.area.left = 0; @@ -1963,11 +1963,11 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c static const char *get_form_flag(int form_flag) { switch (form_flag) { - case FORM_USER: + case SPOOLSS_FORM_USER: return "FORM_USER"; - case FORM_BUILTIN: + case SPOOLSS_FORM_BUILTIN: return "FORM_BUILTIN"; - case FORM_PRINTER: + case SPOOLSS_FORM_PRINTER: return "FORM_PRINTER"; default: return "unknown"; diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 108ed50d8a..950ca72ed8 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -1768,7 +1768,7 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, /* only migrate FORM_PRINTER types, according to jerry FORM_BUILTIN-types are hard-coded in samba */ - if (forms[f].info1.flags != FORM_PRINTER) + if (forms[f].info1.flags != SPOOLSS_FORM_PRINTER) continue; if (c->opt_verbose) |