svn commit: samba r26484 - in branches/SAMBA_4_0: .
source/auth/credentials source/scripting/python/samba
jelmer at samba.org
jelmer at samba.org
Mon Dec 17 04:56:55 GMT 2007
Author: jelmer
Date: 2007-12-17 04:56:54 +0000 (Mon, 17 Dec 2007)
New Revision: 26484
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26484
Log:
Don't rely on removed header.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials.h
branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h
branches/SAMBA_4_0/source/scripting/python/samba/provision.py
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.h
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials.h 2007-12-17 04:22:44 UTC (rev 26483)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.h 2007-12-17 04:56:54 UTC (rev 26484)
@@ -128,6 +128,7 @@
struct ldb_context;
struct loadparm_context;
+#include "auth/credentials/credentials_krb5.h"
#include "auth/credentials/credentials_proto.h"
#endif /* __CREDENTIALS_H__ */
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h 2007-12-17 04:22:44 UTC (rev 26483)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h 2007-12-17 04:56:54 UTC (rev 26484)
@@ -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 @@
gss_cred_id_t creds;
};
-#include "auth/credentials/credentials_krb5_proto.h"
+#endif /* __CREDENTIALS_KRB5_H__ */
Modified: branches/SAMBA_4_0/source/scripting/python/samba/provision.py
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-17 04:22:44 UTC (rev 26483)
+++ branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-17 04:56:54 UTC (rev 26484)
@@ -10,7 +10,7 @@
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 @@
"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,
More information about the samba-cvs
mailing list