sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r26513: Update substitution dictionary for ldifs.

Browse Source 
(This used to be commit 60fb2de211)
This commit is contained in:
Jelmer Vernooij
2007-12-17 20:03:06 +01:00
committed by Stefan Metzmacher
parent fe6faa4df2
commit ca74c6e6c4
5 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source4/scripting/python/misc.i
View File

@ -59,3 +59,6 @@ bool samdb_set_domain_sid(struct ldb_context *ldb,
const struct dom_sid *dom_sid_in); const struct dom_sid *dom_sid_in);
WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df); WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
%rename(version) samba_version_string;
const char *samba_version_string(void);

1
source4/scripting/python/misc.py
View File

@ -67,5 +67,6 @@ ldb_set_session_info = _misc.ldb_set_session_info
ldb_set_loadparm = _misc.ldb_set_loadparm ldb_set_loadparm = _misc.ldb_set_loadparm
samdb_set_domain_sid = _misc.samdb_set_domain_sid samdb_set_domain_sid = _misc.samdb_set_domain_sid
dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
version = _misc.version

14
source4/scripting/python/misc_wrap.c
View File

@ -3038,6 +3038,19 @@ fail:
} }
SWIGINTERN PyObject *_wrap_version(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
char *result = 0 ;
if (!SWIG_Python_UnpackTuple(args,"version",0,0,0)) SWIG_fail;
result = (char *)samba_version_string();
resultobj = SWIG_FromCharPtr((const char *)result);
return resultobj;
fail:
return NULL;
}
static PyMethodDef SwigMethods[] = { static PyMethodDef SwigMethods[] = {
{ (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
@ -3045,6 +3058,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };

3
source4/scripting/python/samba/__init__.py
View File

@ -122,6 +122,8 @@ def substitute_var(text, values):
for (name, value) in values.items(): for (name, value) in values.items():
text = text.replace("${%s}" % name, value) text = text.replace("${%s}" % name, value)
assert "${" not in text, text
return text return text
@ -133,3 +135,4 @@ def valid_netbios_name(name):
return False return False
return True return True
version = misc.version

6
source4/scripting/python/samba/provision.py
View File

@ -14,6 +14,7 @@ import uuid, misc
from socket import gethostname, gethostbyname from socket import gethostname, gethostbyname
import param import param
import registry import registry
import samba
from samba import Ldb, substitute_var, valid_netbios_name from samba import Ldb, substitute_var, valid_netbios_name
from samba.samdb import SamDB from samba.samdb import SamDB
import security import security
@ -56,6 +57,7 @@ class ProvisionSettings(object):
self.schemedn_ldb = None self.schemedn_ldb = None
self.s4_ldapi_path = None self.s4_ldapi_path = None
self.policyguid = None self.policyguid = None
self.extensibleobject = None
def subst_vars(self): def subst_vars(self):
return {"SCHEMADN": self.schemadn, return {"SCHEMADN": self.schemadn,
@ -77,6 +79,7 @@ class ProvisionSettings(object):
"NETBIOSNAME": self.netbiosname, "NETBIOSNAME": self.netbiosname,
"DNSNAME": self.dnsname, "DNSNAME": self.dnsname,
"ROOTDN": self.rootdn, "ROOTDN": self.rootdn,
"DOMAIN": self.domain,
"DNSDOMAIN": self.dnsdomain, "DNSDOMAIN": self.dnsdomain,
"REALM": self.realm, "REALM": self.realm,
"DEFAULTSITE": self.defaultsite, "DEFAULTSITE": self.defaultsite,
@ -89,6 +92,9 @@ class ProvisionSettings(object):
"POLICYGUID": self.policyguid, "POLICYGUID": self.policyguid,
"RDN_DC": self.rdn_dc, "RDN_DC": self.rdn_dc,
"DOMAINGUID_MOD": self.domainguid_mod, "DOMAINGUID_MOD": self.domainguid_mod,
"VERSION": samba.version(),
"ACI": "# no aci for local ldb",
"EXTENSIBLEOBJECT": self.extensibleobject,
} }
def fix(self, paths): def fix(self, paths):