s3-spoolss: use form flags from idl in rpcclient and net.

Guenther

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index c88cf89367a809e924fed9864d8cbaff3a1d57af..fae5c552c27e1ef20b6fc6092083091994d995d0 100644 (file)
--- 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 108ed50d8a9afed260cdf514afe7073521a543b8..950ca72ed8d3aa3c6cc2944e4f6aa24c66793436 100644 (file)
--- 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)