[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  840cdfa... s4:param remove reference to private header from source4/param/param.h
       via  3ed0cae... s4: Fix missing TLS dir when targetdir is not the default one
      from  4b88598... Remove unused code. Jeremy.

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


- Log -----------------------------------------------------------------
commit 840cdfa2fabbb48d2f18dc3cea65ff8123bf6ca9
Author: Brad Hards <bradh at frogmouth.net>
Date:   Tue Nov 24 13:43:59 2009 +1100

    s4:param remove reference to private header from source4/param/param.h
    
    source4/param/param.h has a
    
    param.h is a public header (and parmlist isn't, even if the relative path
    could work), so I suggest making it a forward declaration in the header, and
    including parmlist.h in the implementation.
    
    (commit message included from e-mail by Andrew Bartlett)
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit 3ed0cae14bdf88387abc016d678127d477d760b7
Author: Matthieu Patou <mat at matws.net>
Date:   Sun Nov 22 20:51:24 2009 +0300

    s4: Fix missing TLS dir when targetdir is not the default one

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

Summary of changes:
 source4/param/generic.c                     |    1 +
 source4/param/loadparm.c                    |    1 +
 source4/param/param.h                       |    2 +-
 source4/scripting/python/samba/provision.py |    2 ++
 4 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/param/generic.c b/source4/param/generic.c
index 41d01de..29b97bc 100644
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
+#include "../lib/util/parmlist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "system/filesys.h"
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index f2e4ace..d65c3f9 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -61,6 +61,7 @@
 #include "smb_server/smb_server.h"
 #include "libcli/raw/signing.h"
 #include "../lib/util/dlinklist.h"
+#include "../lib/util/parmlist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "libcli/raw/libcliraw.h"
diff --git a/source4/param/param.h b/source4/param/param.h
index 3ce5e93..5222425 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -20,7 +20,7 @@
 #ifndef _PARAM_H /* _PARAM_H */
 #define _PARAM_H 
 
-#include "../lib/util/parmlist.h"
+struct parmlist_entry;
 
 struct param_context {
 	struct param_section *sections;
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 01ffc16..242951d 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1130,6 +1130,8 @@ def provision(setup_dir, message, session_info,
 
     if not os.path.exists(paths.private_dir):
         os.mkdir(paths.private_dir)
+    if not os.path.exists(os.path.join(paths.private_dir,"tls")):
+        os.mkdir(os.path.join(paths.private_dir,"tls"))
 
     ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
     


-- 
Samba Shared Repository