r14416: Remove deadcode. Coverity #198.
authorJeremy Allison <jra@samba.org>
Wed, 15 Mar 2006 03:00:49 +0000 (03:00 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:15:29 +0000 (11:15 -0500)
Jeremy.
(This used to be commit 7fc61f5a63c982cfd0fbe1838979ba7be8f69fca)

source3/utils/net_rpc_printer.c

index 9bae6a9b4e35093fe143b9bd2982ebeef604316c..8808d549ac591a4ebfe6f2d5e0c6edc86d66704c 100644 (file)
@@ -1922,7 +1922,6 @@ NTSTATUS rpc_printer_migrate_printers_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(nt_status))
                return nt_status;
 
-
        /* enum printers */
        if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr_enum)) {
                nt_status = NT_STATUS_UNSUCCESSFUL;
@@ -1951,7 +1950,6 @@ NTSTATUS rpc_printer_migrate_printers_internals(const DOM_SID *domain_sid,
                d_printf("migrating printer queue for:    [%s] / [%s]\n", 
                        printername, sharename);
 
-
                /* open dst printer handle */
                if (!net_spoolss_open_printer_ex(pipe_hnd_dst, mem_ctx, sharename, 
                        PRINTER_ALL_ACCESS, cli->user_name, &hnd_dst)) {
@@ -1961,18 +1959,12 @@ NTSTATUS rpc_printer_migrate_printers_internals(const DOM_SID *domain_sid,
                        got_hnd_dst = True;
                }
 
-
                /* check for existing dst printer */
                if (!net_spoolss_getprinter(pipe_hnd_dst, mem_ctx, &hnd_dst, level, &ctr_dst)) {
                        printf ("could not get printer, creating printer.\n");
                } else {
                        DEBUG(1,("printer already exists: %s\n", sharename));
-                       /* close printer handles here */
-                       if (got_hnd_src) {
-                               rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src);
-                               got_hnd_src = False;
-                       }
-
+                       /* close printer handle here - dst only, not got src yet. */
                        if (got_hnd_dst) {
                                rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst);
                                got_hnd_dst = False;
@@ -1980,7 +1972,6 @@ NTSTATUS rpc_printer_migrate_printers_internals(const DOM_SID *domain_sid,
                        continue;
                }
 
-
                /* now get again src printer ctr via getprinter, 
                   we first need a handle for that */
 
@@ -1995,7 +1986,6 @@ NTSTATUS rpc_printer_migrate_printers_internals(const DOM_SID *domain_sid,
                if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd_src, level, &ctr_src)) 
                        goto done;
 
-
                /* copy each src printer to a dst printer 1:1, 
                   maybe some values have to be changed though */
                d_printf("creating printer: %s\n", printername);