[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Thu Jun 10 17:48:34 MDT 2010
The branch, master has been updated
via 4690ebf... Add missing stub functions.
via c446fbc... s4-python: Fix formatting.
from a53ca94... s3:rpc improve handles memory hierarchy and use better name.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4690ebf0f47ec435e2e63687dce257b6b2bd5464
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jun 11 01:47:45 2010 +0200
Add missing stub functions.
commit c446fbc3bfa345c8bc748a162dedb24857272aab
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 10 23:12:53 2010 +0200
s4-python: Fix formatting.
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/__init__.py | 29 ++--
source4/scripting/python/samba/idmap.py | 19 +-
source4/scripting/python/samba/ntacls.py | 21 ++-
source4/scripting/python/samba/provision.py | 9 +-
source4/scripting/python/samba/provisionbackend.py | 208 ++++++++++++--------
source4/scripting/python/samba/schema.py | 7 +-
source4/scripting/python/samba/upgradehelpers.py | 25 ++-
7 files changed, 185 insertions(+), 133 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index dcb80a7..d870879 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -154,7 +154,11 @@ class Ldb(_Ldb):
raise
def erase_except_schema_controlled(self):
- """Erase this ldb, removing all records, except those that are controlled by Samba4's schema."""
+ """Erase this ldb.
+
+ :note: Removes all records, except those that are controlled by
+ Samba4's schema.
+ """
basedn = ""
@@ -173,8 +177,7 @@ class Ldb(_Ldb):
raise
res = self.search(basedn, ldb.SCOPE_SUBTREE,
- "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))",
- [], controls=["show_deleted:0"])
+ "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", [], controls=["show_deleted:0"])
assert len(res) == 0
# delete the specials
@@ -297,20 +300,20 @@ class Ldb(_Ldb):
dsdb.dsdb_set_ntds_invocation_id(self, invocation_id)
def get_invocation_id(self):
- "Get the invocation_id id"
+ """Get the invocation_id id"""
return dsdb.samdb_ntds_invocation_id(self)
def get_ntds_GUID(self):
- "Get the NTDS objectGUID"
+ """Get the NTDS objectGUID"""
return dsdb.samdb_ntds_objectGUID(self)
def server_site_name(self):
- "Get the server site name"
+ """Get the server site name"""
return dsdb.samdb_server_site_name(self)
def substitute_var(text, values):
- """substitute strings of the form ${NAME} in str, replacing
+ """Substitute strings of the form ${NAME} in str, replacing
with substitutions from subobj.
:param text: Text in which to subsitute.
@@ -360,13 +363,15 @@ def setup_file(template, fname, subst_vars=None):
:param fname: Path of the file to create.
:param subst_vars: Substitution variables.
"""
- f = fname
-
- if os.path.exists(f):
- os.unlink(f)
+ if os.path.exists(fname):
+ os.unlink(fname)
data = read_and_sub_file(template, subst_vars)
- open(f, 'w').write(data)
+ f = open(fname, 'w')
+ try:
+ f.write(data)
+ finally:
+ f.close()
def valid_netbios_name(name):
diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py
index c0b20bd..1cb33fd 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/source4/scripting/python/samba/idmap.py
@@ -57,28 +57,27 @@ class IDmapDB(samba.Ldb):
:return xid can that be used for SID/unixid mapping
"""
- res=self.search(expression="dn=CN=CONFIG",base="", scope=ldb.SCOPE_SUBTREE)
- id=res[0].get("xidNumber")
- flag=ldb.FLAG_MOD_REPLACE
- if id == None:
- id=res[0].get("lowerBound")
+ res = self.search(expression="dn=CN=CONFIG", base="",
+ scope=ldb.SCOPE_SUBTREE)
+ id = res[0].get("xidNumber")
+ flag = ldb.FLAG_MOD_REPLACE
+ if id is None:
+ id = res[0].get("lowerBound")
flag = ldb.FLAG_MOD_ADD
newid = int(str(id)) + 1
msg = ldb.Message()
- msg.dn = ldb.Dn(self,"CN=CONFIG")
- msg["xidNumber"] = ldb.MessageElement(str(newid),flag,"xidNumber")
+ msg.dn = ldb.Dn(self, "CN=CONFIG")
+ msg["xidNumber"] = ldb.MessageElement(str(newid), flag, "xidNumber")
self.modify(msg)
-
return id
-
def setup_name_mapping(self, sid, type, unixid=None):
"""Setup a mapping between a sam name and a unix name.
:param sid: SID of the NT-side of the mapping.
:param unixname: Unix id to map to, if none supplied the next one will be selected
"""
- if unixid == None:
+ if unixid is None:
unixid = self.increment_xid()
type_string = ""
if type == self.TYPE_UID:
diff --git a/source4/scripting/python/samba/ntacls.py b/source4/scripting/python/samba/ntacls.py
index 478a512..cfdb262 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/source4/scripting/python/samba/ntacls.py
@@ -30,7 +30,7 @@ class XattrBackendError(Exception):
def checkset_backend(lp, backend, eadbfile):
if backend is not None:
if backend == "native":
- lp.set("posix:eadb","")
+ lp.set("posix:eadb", "")
elif backend == "tdb":
if eadbfile != None:
lp.set("posix:eadb", eadbfile)
@@ -56,9 +56,10 @@ def getntacl(lp, file, backend=None, eadbfile=None):
else:
attribute = samba.xattr_native.wrap_getxattr(file,
xattr.XATTR_NTACL_NAME)
- ntacl = ndr_unpack(xattr.NTACL,attribute)
+ ntacl = ndr_unpack(xattr.NTACL, attribute)
return ntacl
+
def setntacl(lp, file, sddl, domsid, backend=None, eadbfile=None):
checkset_backend(lp, backend, eadbfile)
ntacl = xattr.NTACL()
@@ -70,17 +71,21 @@ def setntacl(lp, file, sddl, domsid, backend=None, eadbfile=None):
if eadbname is not None and eadbname != "":
try:
samba.xattr_tdb.wrap_setxattr(eadbname,
- file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
+ file, xattr.XATTR_NTACL_NAME, ndr_pack(ntacl))
except:
# FIXME: Don't catch all exceptions, just those related to opening
# xattrdb
- print "Fail to open %s"%eadbname
- samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
+ print "Fail to open %s" % eadbname
+ samba.xattr_native.wrap_setxattr(file, xattr.XATTR_NTACL_NAME,
+ ndr_pack(ntacl))
else:
- samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
+ samba.xattr_native.wrap_setxattr(file, xattr.XATTR_NTACL_NAME,
+ ndr_pack(ntacl))
+
def ldapmask2filemask(ldm):
- """Takes the access mask of a DS ACE and transform them in a File ACE mask"""
+ """Takes the access mask of a DS ACE and transform them in a File ACE mask.
+ """
RIGHT_DS_CREATE_CHILD = 0x00000001
RIGHT_DS_DELETE_CHILD = 0x00000002
RIGHT_DS_LIST_CONTENTS = 0x00000004
@@ -141,7 +146,7 @@ def dsacl2fsacl(dssddl, domsid):
for files. It's used for Policy object provision
"""
sid = security.dom_sid(domsid)
- ref = security.descriptor.from_sddl(dssddl,sid)
+ ref = security.descriptor.from_sddl(dssddl, sid)
fdescr = security.descriptor()
fdescr.owner_sid = ref.owner_sid
fdescr.group_sid = ref.group_sid
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 089d4e3..c8e082a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -47,12 +47,17 @@ from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008
from samba.dcerpc import security
from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
from samba.idmap import IDmapDB
+from samba.ms_display_specifiers import read_ms_ldif
from samba.ntacls import setntacl, dsacl2fsacl
from samba.ndr import ndr_pack,ndr_unpack
+from samba.provisionbackend import (
+ ExistingBackend,
+ FDSBackend,
+ LDBBackend,
+ OpenLDAPBackend,
+ )
from samba.schema import Schema
from samba.samdb import SamDB
-from ms_display_specifiers import read_ms_ldif
-from samba.provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
__docformat__ = "restructuredText"
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 8d035ab..629bc28 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -70,16 +70,20 @@ class ProvisionBackend(object):
self.ldap_backend_type = backend_type
def init(self):
- pass
+ """Initialize the backend."""
+ raise NotImplementedError(self.init)
def start(self):
- pass
+ """Start the backend."""
+ raise NotImplementedError(self.start)
def shutdown(self):
- pass
+ """Shutdown the backend."""
+ raise NotImplementedError(self.shutdown)
def post_setup(self):
- pass
+ """Post setup."""
+ raise NotImplementedError(self.post_setup)
class LDBBackend(ProvisionBackend):
@@ -91,6 +95,15 @@ class LDBBackend(ProvisionBackend):
# Wipe the old sam.ldb databases away
shutil.rmtree(self.paths.samdb + ".d", True)
+ def start(self):
+ pass
+
+ def shutdown(self):
+ pass
+
+ def post_setup(self):
+ pass
+
class ExistingBackend(ProvisionBackend):
@@ -114,7 +127,8 @@ class ExistingBackend(ProvisionBackend):
# into the long-term database later in the script.
self.secrets_credentials = self.credentials
- self.ldap_backend_type = "openldap" # For now, assume existing backends at least emulate OpenLDAP
+ # For now, assume existing backends at least emulate OpenLDAP
+ self.ldap_backend_type = "openldap"
class LDAPBackend(ProvisionBackend):
@@ -143,7 +157,7 @@ class LDAPBackend(ProvisionBackend):
self.ldap_backend_extra_port = ldap_backend_extra_port
self.ldap_dryrun_mode = ldap_dryrun_mode
- self.ldapi_uri = "ldapi://" + urllib.quote(os.path.join(self.ldapdir, "ldapi"), safe="")
+ self.ldapi_uri = "ldapi://%s" % urllib.quote(os.path.join(self.ldapdir, "ldapi"), safe="")
if not os.path.exists(self.ldapdir):
os.mkdir(self.ldapdir)
@@ -171,7 +185,8 @@ class LDAPBackend(ProvisionBackend):
# XXX: We should never be catching all Ldb errors
pass
- # Try to print helpful messages when the user has not specified the path to slapd
+ # Try to print helpful messages when the user has not specified the
+ # path to slapd
if self.slapd_path is None:
raise ProvisioningError("Warning: LDAP-Backend must be setup with path to slapd, e.g. --slapd-path=\"/usr/local/libexec/slapd\"!")
if not os.path.exists(self.slapd_path):
@@ -195,13 +210,13 @@ class LDAPBackend(ProvisionBackend):
self.credentials = Credentials()
self.credentials.guess(self.lp)
- #Kerberos to an ldapi:// backend makes no sense
+ # Kerberos to an ldapi:// backend makes no sense
self.credentials.set_kerberos_state(DONT_USE_KERBEROS)
self.credentials.set_password(self.ldapadminpass)
self.secrets_credentials = Credentials()
self.secrets_credentials.guess(self.lp)
- #Kerberos to an ldapi:// backend makes no sense
+ # Kerberos to an ldapi:// backend makes no sense
self.secrets_credentials.set_kerberos_state(DONT_USE_KERBEROS)
self.secrets_credentials.set_username("samba-admin")
self.secrets_credentials.set_password(self.ldapadminpass)
@@ -214,7 +229,11 @@ class LDAPBackend(ProvisionBackend):
def start(self):
from samba.provision import ProvisioningError
self.slapd_command_escaped = "\'" + "\' \'".join(self.slapd_command) + "\'"
- open(os.path.join(self.ldapdir, "ldap_backend_startup.sh"), 'w').write("#!/bin/sh\n" + self.slapd_command_escaped + "\n")
+ f = open(os.path.join(self.ldapdir, "ldap_backend_startup.sh"), 'w')
+ try:
+ f.write("#!/bin/sh\n" + self.slapd_command_escaped + "\n")
+ finally:
+ f.close()
# Now start the slapd, so we can provision onto it. We keep the
# subprocess context around, to kill this off at the successful
@@ -239,13 +258,13 @@ class LDAPBackend(ProvisionBackend):
self.message("Could not connect to slapd started with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
raise ProvisioningError("slapd never accepted a connection within 15 seconds of starting")
- self.message("Could not start slapd with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
+ self.message("Could not start slapd with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
raise ProvisioningError("slapd died before we could make a connection to it")
def shutdown(self):
# if an LDAP backend is in use, terminate slapd after final provision and check its proper termination
if self.slapd.poll() is None:
- #Kill the slapd
+ # Kill the slapd
if hasattr(self.slapd, "terminate"):
self.slapd.terminate()
else:
@@ -253,7 +272,7 @@ class LDAPBackend(ProvisionBackend):
import signal
os.kill(self.slapd.pid, signal.SIGTERM)
- #and now wait for it to die
+ # and now wait for it to die
self.slapd.communicate()
@@ -264,7 +283,6 @@ class OpenLDAPBackend(LDAPBackend):
schema=None, hostname=None, ldapadminpass=None, slapd_path=None,
ldap_backend_extra_port=None, ldap_dryrun_mode=False,
ol_mmr_urls=None, nosync=False):
-
super(OpenLDAPBackend, self).__init__( backend_type=backend_type,
paths=paths, setup_path=setup_path, lp=lp,
credentials=credentials, names=names, message=message,
@@ -364,25 +382,28 @@ class OpenLDAPBackend(LDAPBackend):
"LDAPSERVER" : url })
rid=serverid*10
rid=rid+1
- mmr_syncrepl_schema_config += read_and_sub_file(self.setup_path("mmr_syncrepl.conf"),
- { "RID" : str(rid),
- "MMRDN": self.names.schemadn,
- "LDAPSERVER" : url,
- "MMR_PASSWORD": mmr_pass})
-
- rid=rid+1
- mmr_syncrepl_config_config += read_and_sub_file(self.setup_path("mmr_syncrepl.conf"),
- { "RID" : str(rid),
- "MMRDN": self.names.configdn,
- "LDAPSERVER" : url,
- "MMR_PASSWORD": mmr_pass})
+ mmr_syncrepl_schema_config += read_and_sub_file(
+ self.setup_path("mmr_syncrepl.conf"),
+ { "RID" : str(rid),
+ "MMRDN": self.names.schemadn,
+ "LDAPSERVER" : url,
+ "MMR_PASSWORD": mmr_pass})
+
+ rid = rid+1
+ mmr_syncrepl_config_config += read_and_sub_file(
+ self.setup_path("mmr_syncrepl.conf"), {
+ "RID" : str(rid),
+ "MMRDN": self.names.configdn,
+ "LDAPSERVER" : url,
+ "MMR_PASSWORD": mmr_pass})
- rid=rid+1
- mmr_syncrepl_user_config += read_and_sub_file(self.setup_path("mmr_syncrepl.conf"),
- { "RID" : str(rid),
- "MMRDN": self.names.domaindn,
- "LDAPSERVER" : url,
- "MMR_PASSWORD": mmr_pass })
+ rid = rid+1
+ mmr_syncrepl_user_config += read_and_sub_file(
+ self.setup_path("mmr_syncrepl.conf"), {
+ "RID" : str(rid),
+ "MMRDN": self.names.domaindn,
+ "LDAPSERVER" : url,
+ "MMR_PASSWORD": mmr_pass })
# OpenLDAP cn=config initialisation
olc_syncrepl_config = ""
olc_mmr_config = ""
@@ -392,23 +413,24 @@ class OpenLDAPBackend(LDAPBackend):
serverid=0
olc_serverids_config = ""
olc_syncrepl_seed_config = ""
- olc_mmr_config += read_and_sub_file(self.setup_path("olc_mmr.conf"),{})
- rid=500
+ olc_mmr_config += read_and_sub_file(
+ self.setup_path("olc_mmr.conf"), {})
+ rid = 500
for url in url_list:
- serverid=serverid+1
- olc_serverids_config += read_and_sub_file(self.setup_path("olc_serverid.conf"),
- { "SERVERID" : str(serverid),
- "LDAPSERVER" : url })
+ serverid = serverid + 1
+ olc_serverids_config += read_and_sub_file(
+ self.setup_path("olc_serverid.conf"), {
+ "SERVERID" : str(serverid), "LDAPSERVER" : url })
- rid=rid+1
- olc_syncrepl_config += read_and_sub_file(self.setup_path("olc_syncrepl.conf"),
- { "RID" : str(rid),
- "LDAPSERVER" : url,
- "MMR_PASSWORD": mmr_pass})
+ rid = rid + 1
+ olc_syncrepl_config += read_and_sub_file(
+ self.setup_path("olc_syncrepl.conf"), {
+ "RID" : str(rid), "LDAPSERVER" : url,
+ "MMR_PASSWORD": mmr_pass})
- olc_syncrepl_seed_config += read_and_sub_file(self.setup_path("olc_syncrepl_seed.conf"),
- { "RID" : str(rid),
- "LDAPSERVER" : url})
+ olc_syncrepl_seed_config += read_and_sub_file(
+ self.setup_path("olc_syncrepl_seed.conf"), {
+ "RID" : str(rid), "LDAPSERVER" : url})
setup_file(self.setup_path("olc_seed.ldif"), self.olcseedldif,
{"OLC_SERVER_ID_CONF": olc_serverids_config,
@@ -438,23 +460,23 @@ class OpenLDAPBackend(LDAPBackend):
self.setup_db_config(os.path.join(self.ldapdir, "db", "user"))
self.setup_db_config(os.path.join(self.ldapdir, "db", "config"))
self.setup_db_config(os.path.join(self.ldapdir, "db", "schema"))
-
- if not os.path.exists(os.path.join(self.ldapdir, "db", "samba", "cn=samba")):
- os.makedirs(os.path.join(self.ldapdir, "db", "samba", "cn=samba"), 0700)
+
+ if not os.path.exists(os.path.join(self.ldapdir, "db", "samba", "cn=samba")):
+ os.makedirs(os.path.join(self.ldapdir, "db", "samba", "cn=samba"), 0700)
setup_file(self.setup_path("cn=samba.ldif"),
- os.path.join(self.ldapdir, "db", "samba", "cn=samba.ldif"),
+ os.path.join(self.ldapdir, "db", "samba", "cn=samba.ldif"),
{ "UUID": str(uuid.uuid4()),
"LDAPTIME": timestring(int(time.time()))} )
setup_file(self.setup_path("cn=samba-admin.ldif"),
- os.path.join(self.ldapdir, "db", "samba", "cn=samba", "cn=samba-admin.ldif"),
+ os.path.join(self.ldapdir, "db", "samba", "cn=samba", "cn=samba-admin.ldif"),
{"LDAPADMINPASS_B64": b64encode(self.ldapadminpass),
"UUID": str(uuid.uuid4()),
"LDAPTIME": timestring(int(time.time()))} )
if self.ol_mmr_urls is not None:
setup_file(self.setup_path("cn=replicator.ldif"),
- os.path.join(self.ldapdir, "db", "samba", "cn=samba", "cn=replicator.ldif"),
+ os.path.join(self.ldapdir, "db", "samba", "cn=samba", "cn=replicator.ldif"),
{"MMR_PASSWORD_B64": b64encode(mmr_pass),
"UUID": str(uuid.uuid4()),
"LDAPTIME": timestring(int(time.time()))} )
@@ -463,9 +485,15 @@ class OpenLDAPBackend(LDAPBackend):
mapping = "schema-map-openldap-2.3"
backend_schema = "backend-schema.schema"
- backend_schema_data = self.schema.ldb.convert_schema_to_openldap("openldap", open(self.setup_path(mapping), 'r').read())
+ f = open(self.setup_path(mapping), 'r')
+ backend_schema_data = self.schema.ldb.convert_schema_to_openldap(
+ "openldap", f.read())
assert backend_schema_data is not None
- open(os.path.join(self.ldapdir, backend_schema), 'w').write(backend_schema_data)
+ f = open(os.path.join(self.ldapdir, backend_schema), 'w')
+ try:
+ f.write(backend_schema_data)
+ finally:
+ f.close()
# now we generate the needed strings to start slapd automatically,
# first ldapi_uri...
@@ -481,18 +509,16 @@ class OpenLDAPBackend(LDAPBackend):
else:
server_port_string = ""
- # Prepare the 'result' information - the commands to return in particular
- self.slapd_provision_command = [self.slapd_path]
-
- self.slapd_provision_command.append("-F" + self.olcdir)
+ # Prepare the 'result' information - the commands to return in
+ # particular
+ self.slapd_provision_command = [self.slapd_path, "-F" + self.olcdir,
+ "-h"]
- self.slapd_provision_command.append("-h")
-
- # copy this command so we have two version, one with -d0 and only ldapi, and one with all the listen commands
+ # copy this command so we have two version, one with -d0 and only
+ # ldapi, and one with all the listen commands
self.slapd_command = list(self.slapd_provision_command)
- self.slapd_provision_command.append(self.ldapi_uri)
- self.slapd_provision_command.append("-d0")
+ self.slapd_provision_command.extend([self.ldapi_uri, "-d0"])
uris = self.ldapi_uri
if server_port_string is not "":
@@ -500,7 +526,8 @@ class OpenLDAPBackend(LDAPBackend):
self.slapd_command.append(uris)
--
Samba Shared Repository
More information about the samba-cvs
mailing list