Changeset 751 for trunk/server/source3/printing/nt_printing.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/printing/nt_printing.c (modified) (4 diffs)

trunk/server/source3/printing/nt_printing.c

@@ -1494 +1494 @@
 
 static NTSTATUS driver_unlink_internals(connection_struct *conn,
-                                        const char *name)
-{
+                                        const char *short_arch,
+                                        int vers,
+                                        const char *fname)
+{
+        TALLOC_CTX *tmp_ctx = talloc_new(conn);
         struct smb_filename *smb_fname = NULL;
-        NTSTATUS status;
-
-        status = create_synthetic_smb_fname(talloc_tos(), name, NULL, NULL,
-            &smb_fname);
+        char *print_dlr_path;
+        NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+        print_dlr_path = talloc_asprintf(tmp_ctx, "%s/%d/%s",
+                                         short_arch, vers, fname);
+        if (print_dlr_path == NULL) {
+                goto err_out;
+        }
+
+        status = create_synthetic_smb_fname(tmp_ctx, print_dlr_path,
+                                            NULL, NULL, &smb_fname);
         if (!NT_STATUS_IS_OK(status)) {
-                return status;
+                goto err_out;
         }
 
         status = unlink_internals(conn, NULL, 0, smb_fname, false);
-
-        TALLOC_FREE(smb_fname);
+err_out:
+        talloc_free(tmp_ctx);
         return status;
 }
@@ -1520 +1530 @@
                          const struct spoolss_DriverInfo8 *r)
 {
-        int i = 0;
-        char *s;
-        const char *file;
+        const char *short_arch;
         connection_struct *conn;
         NTSTATUS nt_status;
@@ -1573 +1581 @@
         }
 
-        /* now delete the files; must strip the '\print$' string from
-           fron of path                                                */
+        short_arch = get_short_archi(r->architecture);
+        if (short_arch == NULL) {
+                DEBUG(0, ("bad architecture %s\n", r->architecture));
+                ret = false;
+                goto err_out;
+        }
+
+        /* now delete the files */
 
         if (r->driver_path && r->driver_path[0]) {
-                if ((s = strchr(&r->driver_path[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting driverfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting driverfile [%s]\n", r->driver_path));
+                driver_unlink_internals(conn, short_arch, r->version, r->driver_path);
         }
 
         if (r->config_file && r->config_file[0]) {
-                if ((s = strchr(&r->config_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting configfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting configfile [%s]\n", r->config_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->config_file);
         }
 
         if (r->data_file && r->data_file[0]) {
-                if ((s = strchr(&r->data_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting datafile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting datafile [%s]\n", r->data_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->data_file);
         }
 
         if (r->help_file && r->help_file[0]) {
-                if ((s = strchr(&r->help_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting helpfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
-        }
-
-        /* check if we are done removing files */
+                DEBUG(10,("deleting helpfile [%s]\n", r->help_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->help_file);
+        }
 
         if (r->dependent_files) {
+                int i = 0;
                 while (r->dependent_files[i] && r->dependent_files[i][0]) {
-                        char *p;
-
-                        /* bypass the "\print$" portion of the path */
-
-                        if ((p = strchr(r->dependent_files[i]+1, '\\')) != NULL) {
-                                file = p;
-                                DEBUG(10,("deleting dependent file [%s]\n", file));
-                                driver_unlink_internals(conn, file);
-                        }
-
+                        DEBUG(10,("deleting dependent file [%s]\n", r->dependent_files[i]));
+                        driver_unlink_internals(conn, short_arch, r->version, r->dependent_files[i]);
                         i++;
                 }
@@ -1871 +1864 @@
                                            printer, "");
         if (!W_ERROR_IS_OK(result)) {
-                DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s",
-                          printer));
-        }
-}
+                DEBUG(0, ("nt_printer_remove: failed to remove printer %s: "
+                          "%s\n", printer, win_errstr(result)));
+        }
+}
+
+void nt_printer_add(TALLOC_CTX *mem_ctx,
+                    const struct auth_serversupplied_info *session_info,
+                    struct messaging_context *msg_ctx,
+                    const char *printer)
+{
+        WERROR result;
+
+        result = winreg_create_printer_internal(mem_ctx, session_info, msg_ctx,
+                                                printer);
+        if (!W_ERROR_IS_OK(result)) {
+                DEBUG(0, ("nt_printer_add: failed to add printer %s: %s\n",
+                          printer, win_errstr(result)));
+        }
+}