[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-85-g596fc05
Jelmer Vernooij
jelmer at samba.org
Wed Apr 9 01:56:51 GMT 2008
The branch, v4-0-test has been updated
via 596fc05785020cd7bd6d15d91b49172039f83bab (commit)
via f8cac3735c9a19baa313c4b61abee144da303ce1 (commit)
via c96a68b7b7792d30b7b1a0167a0cbf6fe285993c (commit)
via eba5d8b4ce391f56877d5498004edbee8ddc4c33 (commit)
via 7bfda828952eab7f165190cbfd804e28780406c9 (commit)
from 7d45ed0c3ebc57f7131603f768f8e022d7139530 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 596fc05785020cd7bd6d15d91b49172039f83bab
Merge: f8cac3735c9a19baa313c4b61abee144da303ce1 c96a68b7b7792d30b7b1a0167a0cbf6fe285993c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 9 03:51:54 2008 +0200
Merge branch 'openchange' into cprovision
commit f8cac3735c9a19baa313c4b61abee144da303ce1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 9 03:51:41 2008 +0200
Add docstring, PEP8.
commit c96a68b7b7792d30b7b1a0167a0cbf6fe285993c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Apr 4 17:28:32 2008 +0200
Don't install libevents for now, just its headers. It is already part of other libs, and only used as part of those libs.
commit eba5d8b4ce391f56877d5498004edbee8ddc4c33
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Apr 4 17:25:20 2008 +0200
Avoid installing unused header file.
commit 7bfda828952eab7f165190cbfd804e28780406c9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Apr 4 17:20:32 2008 +0200
Don't install talloc manpage from samba, it's already installed from the standalone talloc build.
-----------------------------------------------------------------------
Summary of changes:
source/lib/events/config.mk | 4 +---
source/lib/talloc/config.mk | 3 ---
source/librpc/config.mk | 2 --
source/scripting/python/samba/provision.py | 20 +++++++++++++++-----
4 files changed, 16 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk
index 1e402f8..225a23c 100644
--- a/source/lib/events/config.mk
+++ b/source/lib/events/config.mk
@@ -30,11 +30,9 @@ INIT_FUNCTION = s4_events_standard_init
##############################
# Start SUBSYSTEM LIBEVENTS
-[LIBRARY::LIBEVENTS]
+[SUBSYSTEM::LIBEVENTS]
OBJ_FILES = events.o events_timed.o events_signal.o
PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
-SO_VERSION = 0
-VERSION = 0.0.1
# End SUBSYSTEM LIBEVENTS
##############################
diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 3eab90b..42f8b38 100644
--- a/source/lib/talloc/config.mk
+++ b/source/lib/talloc/config.mk
@@ -2,6 +2,3 @@
OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = talloc.o
CFLAGS = -Ilib/talloc
-
-
-MANPAGES += $(tallocdir)/talloc.3
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index b6f3fda..0a265c7 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -286,8 +286,6 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
OBJ_FILES = gen_ndr/ndr_winbind.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
-PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
-
librpc/idl-deps:
./librpc/idl-deps.pl librpc/idl/*.idl >$@
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 80dcd52..c9cdcdb 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -264,9 +264,11 @@ def provision_paths_from_lp(lp, dnsdomain):
return paths
+
def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None,
rootdn=None, domaindn=None, configdn=None, schemadn=None, serverdn=None,
sitename=None):
+ """Guess configuration settings to use."""
if hostname is None:
hostname = socket.gethostname().split(".")[0].lower()
@@ -400,6 +402,7 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
return lp
+
def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
users_gid, wheel_gid):
"""setup reasonable name mappings for sam names to unix names.
@@ -425,6 +428,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
+
def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
credentials, names,
serverrole, ldap_backend=None,
@@ -637,6 +641,7 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
assert os.path.exists(provision_reg)
reg.diff_apply(provision_reg)
+
def setup_idmapdb(path, setup_path, session_info, credentials, lp):
"""Setup the idmap database.
@@ -656,6 +661,7 @@ def setup_idmapdb(path, setup_path, session_info, credentials, lp):
idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
return idmap_ldb
+
def setup_samdb_rootdse(samdb, setup_path, names):
"""Setup the SamDB rootdse.
@@ -1060,6 +1066,7 @@ def provision(setup_dir, message, session_info,
result.samdb = samdb
return result
+
def provision_become_dc(setup_dir=None,
smbconf=None, targetdir=None, realm=None,
rootdn=None, domaindn=None, schemadn=None, configdn=None,
@@ -1081,7 +1088,11 @@ def provision_become_dc(setup_dir=None,
domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
-def setup_db_config(setup_path, file, dbdir):
+def setup_db_config(setup_path, dbdir):
+ """Setup a Berkeley database.
+
+ :param setup_path: Setup path function.
+ :param dbdir: Database directory."""
if not os.path.isdir(os.path.join(dbdir, "bdb-logs")):
os.makedirs(os.path.join(dbdir, "bdb-logs"), 0700);
if not os.path.isdir(os.path.join(dbdir, "tmp")):
@@ -1211,12 +1222,11 @@ refint_attributes""" + refint_attributes + "\n";
setup_file(setup_path("modules.conf"), paths.modulesconf,
{"REALM": names.realm})
- setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
- setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
- setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
+ setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "user"))
+ setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "config"))
+ setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "schema"))
mapping = "schema-map-openldap-2.3"
backend_schema = "backend-schema.schema"
-
ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
if ldap_backend_port is not None:
--
Samba Shared Repository
More information about the samba-cvs
mailing list