[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  8338fe4 s3:idmap_tdb2: fix bug 8368 : correctly initialize "idmap config * : script" with NULL
      from  8158042 s3:libsmb: make cli_session_setup_spnego() static

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8338fe4bfbc935e3cff059383dd07d419f58c696
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 10 13:41:14 2011 +0200

    s3:idmap_tdb2: fix bug 8368 : correctly initialize "idmap config * : script" with NULL
    
    this fixes the fallback to the deprecated spelling idmap:script
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Aug 10 14:59:32 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/winbindd/idmap_tdb2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index d245e44..07b91e5 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -290,7 +290,7 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom)
 		ret = NT_STATUS_NO_MEMORY;
 		goto failed;
 	}
-	ctx->script = lp_parm_const_string(-1, config_option, "script", "NULL");
+	ctx->script = lp_parm_const_string(-1, config_option, "script", NULL);
 	talloc_free(config_option);
 
 	idmap_script = lp_parm_const_string(-1, "idmap", "script", NULL);


-- 
Samba Shared Repository