s3-spoolss: cleanup _spoolss_SetPrinterDataEx a little.

Guenther

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index cd56aa0456572e7af8f452093846aa4ccc13262f..9cde7d2e010d7c8abe486e63d0a6e87cf7f0cde8 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -9068,11 +9068,10 @@ WERROR _spoolss_GetPrinterDataEx(pipes_struct *p,
 WERROR _spoolss_SetPrinterDataEx(pipes_struct *p,
                                 struct spoolss_SetPrinterDataEx *r)
 {
 WERROR _spoolss_SetPrinterDataEx(pipes_struct *p,
                                 struct spoolss_SetPrinterDataEx *r)
 {

-       POLICY_HND              *handle = r->in.handle;

        NT_PRINTER_INFO_LEVEL   *printer = NULL;
        int                     snum = 0;
        NT_PRINTER_INFO_LEVEL   *printer = NULL;
        int                     snum = 0;

-       WERROR                  status = WERR_OK;
-       Printer_entry           *Printer = find_printer_index_by_hnd(p, handle);
+       WERROR                  result = WERR_OK;
+       Printer_entry           *Printer = find_printer_index_by_hnd(p, r->in.handle);

        char                    *oid_string;
 
        DEBUG(4,("_spoolss_SetPrinterDataEx\n"));
        char                    *oid_string;
 
        DEBUG(4,("_spoolss_SetPrinterDataEx\n"));


@@ -9081,19 +9080,20 @@ WERROR _spoolss_SetPrinterDataEx(pipes_struct *p,
            SetPrinterData if key is "PrinterDriverData" */
 
        if (!Printer) {
            SetPrinterData if key is "PrinterDriverData" */
 
        if (!Printer) {

-               DEBUG(2,("_spoolss_SetPrinterDataEx: "
-                       "Invalid handle (%s:%u:%u).\n", OUR_HANDLE(handle)));
+               DEBUG(2,("_spoolss_SetPrinterDataEx: Invalid handle (%s:%u:%u).\n",
+                       OUR_HANDLE(r->in.handle)));

                return WERR_BADFID;
        }
 
                return WERR_BADFID;
        }
 

-       if ( Printer->printer_type == SPLHND_SERVER ) {
+       if (Printer->printer_type == SPLHND_SERVER) {

                DEBUG(10,("_spoolss_SetPrinterDataEx: "
                        "Not implemented for server handles yet\n"));
                return WERR_INVALID_PARAM;
        }
 
                DEBUG(10,("_spoolss_SetPrinterDataEx: "
                        "Not implemented for server handles yet\n"));
                return WERR_INVALID_PARAM;
        }
 

-       if ( !get_printer_snum(p,handle, &snum, NULL) )
+       if (!get_printer_snum(p, r->in.handle, &snum, NULL)) {

                return WERR_BADFID;
                return WERR_BADFID;

+       }

 
        /*
         * Access check : NT returns "access denied" if you make a
 
        /*
         * Access check : NT returns "access denied" if you make a


@@ -9103,38 +9103,38 @@ WERROR _spoolss_SetPrinterDataEx(pipes_struct *p,
         * when connecting to a printer  --jerry
         */
 
         * when connecting to a printer  --jerry
         */
 

-       if (Printer->access_granted != PRINTER_ACCESS_ADMINISTER)
-       {
+       if (Printer->access_granted != PRINTER_ACCESS_ADMINISTER) {

                DEBUG(3, ("_spoolss_SetPrinterDataEx: "
                        "change denied by handle access permissions\n"));
                return WERR_ACCESS_DENIED;
        }
 
                DEBUG(3, ("_spoolss_SetPrinterDataEx: "
                        "change denied by handle access permissions\n"));
                return WERR_ACCESS_DENIED;
        }
 

-       status = get_a_printer(Printer, &printer, 2, lp_servicename(snum));
-       if (!W_ERROR_IS_OK(status))
-               return status;
+       result = get_a_printer(Printer, &printer, 2, lp_servicename(snum));
+       if (!W_ERROR_IS_OK(result)) {
+               return result;
+       }

 
        /* check for OID in valuename */
 
 
        /* check for OID in valuename */
 

-       if ( (oid_string = strchr( r->in.value_name, ',' )) != NULL )
-       {
+       oid_string = strchr(r->in.value_name, ',');
+       if (oid_string) {

                *oid_string = '\0';
                oid_string++;
        }
 
        /* save the registry data */
 
                *oid_string = '\0';
                oid_string++;
        }
 
        /* save the registry data */
 

-       status = set_printer_dataex( printer, r->in.key_name, r->in.value_name,
-                                    r->in.type, r->in.buffer, r->in.offered );
+       result = set_printer_dataex(printer, r->in.key_name, r->in.value_name,
+                                   r->in.type, r->in.buffer, r->in.offered);

 
 

-       if ( W_ERROR_IS_OK(status) )
-       {
+       if (W_ERROR_IS_OK(result)) {

                /* save the OID if one was specified */
                /* save the OID if one was specified */

-               if ( oid_string ) {
+               if (oid_string) {

                        char *str = talloc_asprintf(p->mem_ctx, "%s\\%s",
                                r->in.key_name, SPOOL_OID_KEY);
                        if (!str) {
                        char *str = talloc_asprintf(p->mem_ctx, "%s\\%s",
                                r->in.key_name, SPOOL_OID_KEY);
                        if (!str) {

-                               return WERR_NOMEM;
+                               result = WERR_NOMEM;
+                               goto done;

                        }
 
                        /*
                        }
 
                        /*


@@ -9144,17 +9144,18 @@ WERROR _spoolss_SetPrinterDataEx(pipes_struct *p,
                         * this is right.    --jerry
                         */
 
                         * this is right.    --jerry
                         */
 

-                       set_printer_dataex( printer, str, r->in.value_name,
-                                           REG_SZ, (uint8 *)oid_string,
-                                           strlen(oid_string)+1 );
+                       set_printer_dataex(printer, str, r->in.value_name,
+                                          REG_SZ, (uint8_t *)oid_string,
+                                          strlen(oid_string)+1);

                }
 
                }
 

-               status = mod_a_printer(printer, 2);
+               result = mod_a_printer(printer, 2);

        }
 
        }
 

+ done:

        free_a_printer(&printer, 2);
 
        free_a_printer(&printer, 2);
 

-       return status;
+       return result;

 }
 
 /****************************************************************
 }
 
 /****************************************************************