[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  b57378b s3-spoolss: Fix Bug #7641: handle win9x adddriver calls w/o 
config file.
      from  6857b74 s3-dns Don't use DELEG_FLAG in DNS update, Windows 2008R2 
does not like it (cherry picked from commit 
280caa6b3bb1199939f9349ea5a436a491c81791)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit b57378b3663fb796ed07c2a8c30f9bda27d3aa9c
Author: Günther Deschner <g...@samba.org>
Date:   Mon Nov 29 17:56:40 2010 +0100

    s3-spoolss: Fix Bug #7641: handle win9x adddriver calls w/o config file.
    
    This turned cupsaddsmb to run into an infinite loop.
    
    Guenther
    (cherry picked from commit c62509c8f2589e7b952517626d61ee34b83e96b3)
    (cherry picked from commit 0a0f3b4947689ca4ab7015e9a1ace8d204bab9f3)

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/nt_printing.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f97b746..3d1d4e8 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1625,7 +1625,11 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX 
*mem_ctx,
        WERROR err;
        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;
        }
 
@@ -1637,7 +1641,9 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX 
*mem_ctx,
 
        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);
        }


-- 
Samba Shared Repository