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

Try to get a bit further with provisioning

Browse Source 
(This used to be commit 649f6c0c10)
This commit is contained in:
Simo Sorce
2008-06-16 17:51:42 -04:00
parent 4a33e5e41b
commit 370f95acfc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,6 +1180,8 @@ def provision_backend(setup_dir=None, message=None,
schemadb = Ldb(schemadb_path, lp=lp) schemadb = Ldb(schemadb_path, lp=lp)
prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"), setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"),
{"SCHEMADN": names.schemadn, {"SCHEMADN": names.schemadn,
"ACI": "#", "ACI": "#",
@ -1191,7 +1193,8 @@ def provision_backend(setup_dir=None, message=None,
"NETBIOSNAME": names.netbiosname, "NETBIOSNAME": names.netbiosname,
"DEFAULTSITE": DEFAULTSITE, "DEFAULTSITE": DEFAULTSITE,
"CONFIGDN": names.configdn, "CONFIGDN": names.configdn,
"SERVERDN": names.serverdn "SERVERDN": names.serverdn,
"PREFIXMAP_B64": b64encode(prefixmap)
}) })
setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"), setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"),

2
source4/selftest/target/Samba4.pm
View File

@ -757,7 +757,7 @@ nogroup:x:65534:nobody
if (defined($self->{ldap})) { if (defined($self->{ldap})) {
push (@provision_options, "--ldap-backend=$ldap_uri"); push (@provision_options, "--ldap-backend=$ldap_uri");
system("$self->{bindir}/smbpython $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed"); system("$self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
if ($self->{ldap} eq "openldap") { if ($self->{ldap} eq "openldap") {
($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories"); ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");