r26484: Don't rely on removed header.

(This used to be commit 6ca2b350858c0747449671234d54584635512705)

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index e00acf727abb73b492e12d6a7f4a639fbc800f14..a3da5c60546519889a4e5f6d9ef195415fbff94d 100644 (file)
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -128,6 +128,7 @@ struct cli_credentials {
 
 struct ldb_context;
 struct loadparm_context;
+#include "auth/credentials/credentials_krb5.h"
 #include "auth/credentials/credentials_proto.h"
 
 #endif /* __CREDENTIALS_H__ */

diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h
index bf6047edf32f57c286b8438d3ede16cd2739c773..b963fbdca44d7817a0c57a3f16cfe69df983725e 100644 (file)
--- a/source4/auth/credentials/credentials_krb5.h
+++ b/source4/auth/credentials/credentials_krb5.h
@@ -20,6 +20,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __CREDENTIALS_KRB5_H__
+#define __CREDENTIALS_KRB5_H__
+
 #include <gssapi/gssapi.h>
 #include <krb5.h>
 
@@ -29,4 +32,4 @@ struct gssapi_creds_container {
        gss_cred_id_t creds;
 };
 
-#include "auth/credentials/credentials_krb5_proto.h"
+#endif /* __CREDENTIALS_KRB5_H__ */

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index df40c2fb7aa8e13c71a9f517c0ef26b2336f7371..ce496a8bc1c412782aafde78bf401883ffc35e07 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -10,7 +10,7 @@ import os
 import pwd
 import grp
 import time
-import uuid, sid, misc
+import uuid, misc
 from socket import gethostname, gethostbyname
 import param
 import registry
@@ -61,8 +61,8 @@ class ProvisionSettings(object):
                 "SCHEMADN_MOD": "schema_fsmo",
                 "SCHEMADN_MOD2": ",objectguid",
                 "CONFIGDN": self.configdn,
-                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list)
-                "MODULES_LIST2": ",".join(self.modules_list2)
+                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list),
+                "MODULES_LIST2": ",".join(self.modules_list2),
                 "CONFIGDN_LDB": self.configdn_ldb,
                 "DOMAINDN": self.domaindn,
                 "DOMAINDN_LDB": self.domaindn_ldb,