diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 04:56:54 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:42 +0100 |
| commit | be999912671de052af909bb88f13c956f12b30e1 (patch) | |
| tree | 7dd9ea2212009222ed8f77e84d06957e1ef05395 | |
| parent | 71e2cafe96f4755b67d01ced497bf5b63aad30f6 (diff) | |
| download | samba-be999912671de052af909bb88f13c956f12b30e1.tar.gz samba-be999912671de052af909bb88f13c956f12b30e1.tar.bz2 samba-be999912671de052af909bb88f13c956f12b30e1.zip | |
r26484: Don't rely on removed header.
(This used to be commit 6ca2b350858c0747449671234d54584635512705)
| -rw-r--r-- | source4/auth/credentials/credentials.h | 1 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.h | 5 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h index e00acf727a..a3da5c6054 100644 --- 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 bf6047edf3..b963fbdca4 100644 --- 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 df40c2fb7a..ce496a8bc1 100644 --- 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, |