[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-178-g4b13708
Andrew Bartlett
abartlet at samba.org
Mon Jul 28 10:51:23 GMT 2008
The branch, v4-0-test has been updated
via 4b137085c8b89773d4639372bbffd516a41dfc8f (commit)
via bace931ad674b5071d53bf9c99c383f1d8957e1b (commit)
via b1d05e7d14c65133e8ab0ff9d41a26fa7e3d41d3 (commit)
via 486891bb5167034e54b7477ba09e8f5f914b93e4 (commit)
via 31a303c099e26423160010c48b305434d4cbea25 (commit)
via e23333d16397606d38e90684d2d916b5b967cde4 (commit)
via b8770a4fd8408473593fa4c6600bce056183958d (commit)
from 88970c4d4192635544cf63e79e929e9bb05ecb5f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 4b137085c8b89773d4639372bbffd516a41dfc8f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 20:51:02 2008 +1000
We don't use EXTENSIBLEOBJECT any more.
commit bace931ad674b5071d53bf9c99c383f1d8957e1b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 20:26:14 2008 +1000
Make it even clearer what to do next in the LDAP backend setup
commit b1d05e7d14c65133e8ab0ff9d41a26fa7e3d41d3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 20:18:17 2008 +1000
Always print the slapd startup command
commit 486891bb5167034e54b7477ba09e8f5f914b93e4
Merge: 31a303c099e26423160010c48b305434d4cbea25 88970c4d4192635544cf63e79e929e9bb05ecb5f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 18:39:37 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit 31a303c099e26423160010c48b305434d4cbea25
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 08:04:43 2008 +1000
Remove unused variable
commit e23333d16397606d38e90684d2d916b5b967cde4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 08:04:15 2008 +1000
Remove unused function and make sensitive directories private.
commit b8770a4fd8408473593fa4c6600bce056183958d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 28 08:02:18 2008 +1000
Fix warnings in new prefixMap code
-----------------------------------------------------------------------
Summary of changes:
source/dsdb/samdb/ldb_modules/schema_fsmo.c | 1 -
source/dsdb/schema/schema_init.c | 5 ++-
source/scripting/python/samba/provision.py | 36 ++++++--------------------
3 files changed, 12 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/samdb/ldb_modules/schema_fsmo.c b/source/dsdb/samdb/ldb_modules/schema_fsmo.c
index 2acc5c0..87ada85 100644
--- a/source/dsdb/samdb/ldb_modules/schema_fsmo.c
+++ b/source/dsdb/samdb/ldb_modules/schema_fsmo.c
@@ -150,7 +150,6 @@ static int schema_fsmo_add(struct ldb_module *module, struct ldb_request *req)
static int schema_fsmo_extended(struct ldb_module *module, struct ldb_request *req)
{
- WERROR status;
struct ldb_dn *schema_dn;
struct dsdb_schema *schema;
char *error_string = NULL;
diff --git a/source/dsdb/schema/schema_init.c b/source/dsdb/schema/schema_init.c
index 9b89594..85fdbe9 100644
--- a/source/dsdb/schema/schema_init.c
+++ b/source/dsdb/schema/schema_init.c
@@ -566,9 +566,10 @@ WERROR dsdb_read_prefixes_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
return WERR_NOMEM;
}
for (i=0; i < blob->ctr.dsdb.num_mappings; i++) {
+ char *oid;
(*prefixes)[i].id = blob->ctr.dsdb.mappings[i].id_prefix<<16;
- (*prefixes)[i].oid = talloc_strdup(mem_ctx, blob->ctr.dsdb.mappings[i].oid.oid);
- (*prefixes)[i].oid = talloc_asprintf_append((*prefixes)[i].oid, ".");
+ oid = talloc_strdup(mem_ctx, blob->ctr.dsdb.mappings[i].oid.oid);
+ (*prefixes)[i].oid = talloc_asprintf_append(oid, ".");
(*prefixes)[i].oid_len = strlen(blob->ctr.dsdb.mappings[i].oid.oid);
}
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 0119f40..441d662 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -133,26 +133,6 @@ findnss_uid = lambda names: findnss(pwd.getpwnam, names)[2]
findnss_gid = lambda names: findnss(grp.getgrnam, names)[2]
-def open_ldb(session_info, credentials, lp, dbname):
- """Open a LDB, thrashing it if it is corrupt.
-
- :param session_info: auth session information
- :param credentials: credentials
- :param lp: Loadparm context
- :param dbname: Path of the database to open.
- :return: a Ldb object
- """
- assert session_info is not None
- try:
- return Ldb(dbname, session_info=session_info, credentials=credentials,
- lp=lp)
- except LdbError, e:
- print e
- os.unlink(dbname)
- return Ldb(dbname, session_info=session_info, credentials=credentials,
- lp=lp)
-
-
def read_and_sub_file(file, subst_vars):
"""Read a file and sub in variables found in it
@@ -799,7 +779,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
setup_add_ldif(samdb, setup_path("provision_configuration_basedn.ldif"), {
"CONFIGDN": names.configdn,
"ACI": aci,
- "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
})
message("Modifying configuration container")
setup_modify_ldif(samdb, setup_path("provision_configuration_basedn_modify.ldif"), {
@@ -811,7 +790,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
setup_add_ldif(samdb, setup_path("provision_schema_basedn.ldif"), {
"SCHEMADN": names.schemadn,
"ACI": aci,
- "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
})
message("Modifying schema container")
@@ -1195,7 +1173,7 @@ def provision_backend(setup_dir=None, message=None,
paths = provision_paths_from_lp(lp, names.dnsdomain)
if not os.path.isdir(paths.ldapdir):
- os.makedirs(paths.ldapdir)
+ os.makedirs(paths.ldapdir, 0700)
schemadb_path = os.path.join(paths.ldapdir, "schema-tmp.ldb")
try:
os.unlink(schemadb_path)
@@ -1209,7 +1187,6 @@ def provision_backend(setup_dir=None, message=None,
setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"),
{"SCHEMADN": names.schemadn,
"ACI": "#",
- "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
})
setup_modify_ldif(schemadb,
setup_path("provision_schema_basedn_modify.ldif"), \
@@ -1252,6 +1229,8 @@ def provision_backend(setup_dir=None, message=None,
slapdcommand="Initailise Fedora DS with: setup-ds.pl --file=%s" % paths.fedoradsinf
+ ldapuser = "--simple-bind-dn=" + names.ldapmanagerdn
+
elif ldap_backend_type == "openldap":
attrs = ["linkID", "lDAPDisplayName"]
res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
@@ -1290,7 +1269,7 @@ def provision_backend(setup_dir=None, message=None,
setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "schema"))
if not os.path.exists(os.path.join(paths.ldapdir, "db", "samba", "cn=samba")):
- os.makedirs(os.path.join(paths.ldapdir, "db", "samba", "cn=samba"))
+ os.makedirs(os.path.join(paths.ldapdir, "db", "samba", "cn=samba"), 0700)
setup_file(setup_path("cn=samba.ldif"),
os.path.join(paths.ldapdir, "db", "samba", "cn=samba.ldif"),
@@ -1310,7 +1289,10 @@ def provision_backend(setup_dir=None, message=None,
server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
else:
server_port_string = ""
- slapdcommand="Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
+
+ slapdcommand="Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
+
+ ldapuser = "--username=samba-admin"
schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
@@ -1330,7 +1312,7 @@ def provision_backend(setup_dir=None, message=None,
message("LDAP admin password: %s" % adminpass)
message(slapdcommand)
-
+ message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser)
def create_phpldapadmin_config(path, setup_path, ldapi_uri):
"""Create a PHP LDAP admin configuration file.
--
Samba Shared Repository
More information about the samba-cvs
mailing list