Changeset 594 for vendor/current/source3/printing

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

File:

• vendor/current/source3/printing/nt_printing.c (modified) (2 diffs)

vendor/current/source3/printing/nt_printing.c

@@ -1626 +1626 @@
         char *_p;
 
-        if (!*driver_path || !*data_file || !*config_file) {
+        if (!*driver_path || !*data_file) {
+                return WERR_INVALID_PARAM;
+        }
+
+        if (!strequal(architecture, SPOOLSS_ARCHITECTURE_4_0) && !*config_file) {
                 return WERR_INVALID_PARAM;
         }
@@ -1638 +1642 @@
         strip_driver_path(mem_ctx, *driver_path);
         strip_driver_path(mem_ctx, *data_file);
-        strip_driver_path(mem_ctx, *config_file);
+        if (*config_file) {
+                strip_driver_path(mem_ctx, *config_file);
+        }
         if (help_file) {
                 strip_driver_path(mem_ctx, *help_file);