mirror of
https://github.com/samba-team/samba.git
synced 2025-08-02 00:22:11 +03:00
s4-python: Fix some formatting issues.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Tue Sep 13 03:51:13 CEST 2011 on sn-devel-104
This commit is contained in:
@ -29,7 +29,7 @@ import sys
|
||||
import samba.param
|
||||
|
||||
def source_tree_topdir():
|
||||
'''return the top level directory (the one containing the source4 directory)'''
|
||||
"""Return the top level source directory."""
|
||||
paths = [ "../../..", "../../../.." ]
|
||||
for p in paths:
|
||||
topdir = os.path.normpath(os.path.join(os.path.dirname(__file__), p))
|
||||
@ -38,7 +38,7 @@ def source_tree_topdir():
|
||||
raise RuntimeError("unable to find top level source directory")
|
||||
|
||||
def in_source_tree():
|
||||
'''return True if we are running from within the samba source tree'''
|
||||
"""Return True if we are running from within the samba source tree"""
|
||||
try:
|
||||
topdir = source_tree_topdir()
|
||||
except RuntimeError:
|
||||
@ -46,7 +46,6 @@ def in_source_tree():
|
||||
return True
|
||||
|
||||
|
||||
|
||||
import ldb
|
||||
from samba._ldb import Ldb as _Ldb
|
||||
|
||||
|
@ -21,7 +21,8 @@
|
||||
|
||||
__docformat__ = "restructuredText"
|
||||
|
||||
import optparse, os
|
||||
import optparse
|
||||
import os
|
||||
from samba.credentials import (
|
||||
Credentials,
|
||||
DONT_USE_KERBEROS,
|
||||
@ -44,7 +45,8 @@ class SambaOptions(optparse.OptionGroup):
|
||||
type=int, metavar="DEBUGLEVEL", help="debug level",
|
||||
callback=self._set_debuglevel)
|
||||
self.add_option("--option", action="callback",
|
||||
type=str, metavar="OPTION", help="set smb.conf option from command line",
|
||||
type=str, metavar="OPTION",
|
||||
help="set smb.conf option from command line",
|
||||
callback=self._set_option)
|
||||
self.add_option("--realm", action="callback",
|
||||
type=str, metavar="REALM", help="set the realm name",
|
||||
@ -53,7 +55,7 @@ class SambaOptions(optparse.OptionGroup):
|
||||
self._lp = LoadParm()
|
||||
|
||||
def get_loadparm_path(self):
|
||||
"""Return the path to the smb.conf file specified on the command line. """
|
||||
"""Return path to the smb.conf file specified on the command line."""
|
||||
return self._configfile
|
||||
|
||||
def _load_configfile(self, option, opt_str, arg, parser):
|
||||
@ -73,7 +75,7 @@ class SambaOptions(optparse.OptionGroup):
|
||||
self._lp.set(a[0], a[1])
|
||||
|
||||
def get_loadparm(self):
|
||||
"""Return a loadparm object with data specified on the command line. """
|
||||
"""Return loadparm object with data specified on the command line."""
|
||||
if self._configfile is not None:
|
||||
self._lp.load(self._configfile)
|
||||
elif os.getenv("SMB_CONF_PATH") is not None:
|
||||
@ -124,7 +126,8 @@ class CredentialsOptions(optparse.OptionGroup):
|
||||
help="Use Kerberos", callback=self._set_kerberos)
|
||||
self.add_option("", "--ipaddress", metavar="IPADDRESS",
|
||||
action="callback", type=str,
|
||||
help="IP address of server", callback=self._set_ipaddress)
|
||||
help="IP address of server",
|
||||
callback=self._set_ipaddress)
|
||||
self.creds = Credentials()
|
||||
|
||||
def _parse_username(self, option, opt_str, arg, parser):
|
||||
@ -171,6 +174,7 @@ class CredentialsOptions(optparse.OptionGroup):
|
||||
|
||||
return self.creds
|
||||
|
||||
|
||||
class CredentialsOptionsDouble(CredentialsOptions):
|
||||
"""Command line options for specifying credentials of two servers."""
|
||||
def __init__(self, parser):
|
||||
@ -180,13 +184,16 @@ class CredentialsOptionsDouble(CredentialsOptions):
|
||||
callback=self._set_simple_bind_dn2, type=str,
|
||||
help="DN to use for a simple bind")
|
||||
self.add_option("--password2", metavar="PASSWORD2", action="callback",
|
||||
help="Password", type=str, callback=self._set_password2)
|
||||
help="Password", type=str,
|
||||
callback=self._set_password2)
|
||||
self.add_option("--username2", metavar="USERNAME2",
|
||||
action="callback", type=str,
|
||||
help="Username for second server", callback=self._parse_username2)
|
||||
help="Username for second server",
|
||||
callback=self._parse_username2)
|
||||
self.add_option("--workgroup2", metavar="WORKGROUP2",
|
||||
action="callback", type=str,
|
||||
help="Workgroup for second server", callback=self._parse_workgroup2)
|
||||
help="Workgroup for second server",
|
||||
callback=self._parse_workgroup2)
|
||||
self.add_option("--no-pass2", action="store_true",
|
||||
help="Don't ask for a password for the second server")
|
||||
self.add_option("--kerberos2", metavar="KERBEROS2",
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
def ndr_pack(object):
|
||||
"""Pack a NDR object.
|
||||
|
||||
|
||||
:param object: Object to pack
|
||||
:return: String object with marshalled object.
|
||||
"""
|
||||
|
@ -26,6 +26,7 @@ from ldb import FLAG_MOD_REPLACE, SCOPE_BASE
|
||||
from samba.ndr import ndr_pack, ndr_unpack
|
||||
from samba.dcerpc import security
|
||||
|
||||
|
||||
class SDUtils(object):
|
||||
"""Some utilities for manipulation of security descriptors
|
||||
on objects"""
|
||||
@ -69,7 +70,8 @@ class SDUtils(object):
|
||||
if ace in desc_sddl:
|
||||
return
|
||||
if desc_sddl.find("(") >= 0:
|
||||
desc_sddl = desc_sddl[:desc_sddl.index("(")] + ace + desc_sddl[desc_sddl.index("("):]
|
||||
desc_sddl = (desc_sddl[:desc_sddl.index("(")] + ace +
|
||||
desc_sddl[desc_sddl.index("("):])
|
||||
else:
|
||||
desc_sddl = desc_sddl + ace
|
||||
self.modify_sd_on_dn(object_dn, desc_sddl)
|
||||
|
@ -35,6 +35,7 @@ from samba import dsdb
|
||||
from samba.ndr import ndr_pack
|
||||
from samba import unix2nttime
|
||||
|
||||
|
||||
def import_sam_policy(samdb, policy, logger):
|
||||
"""Import a Samba 3 policy.
|
||||
|
||||
@ -53,14 +54,15 @@ def import_sam_policy(samdb, policy, logger):
|
||||
|
||||
m = ldb.Message()
|
||||
m.dn = samdb.get_default_basedn()
|
||||
m['a01'] = ldb.MessageElement(str(policy['min password length']), ldb.FLAG_MOD_REPLACE,
|
||||
'minPwdLength')
|
||||
m['a02'] = ldb.MessageElement(str(policy['password history']), ldb.FLAG_MOD_REPLACE,
|
||||
'pwdHistoryLength')
|
||||
m['a01'] = ldb.MessageElement(str(policy['min password length']),
|
||||
ldb.FLAG_MOD_REPLACE, 'minPwdLength')
|
||||
m['a02'] = ldb.MessageElement(str(policy['password history']),
|
||||
ldb.FLAG_MOD_REPLACE, 'pwdHistoryLength')
|
||||
|
||||
min_pw_age_unix = policy['minimum password age']
|
||||
min_pw_age_nt = 0 - unix2nttime(min_pw_age_unix)
|
||||
m['a03'] = ldb.MessageElement(str(min_pw_age_nt), ldb.FLAG_MOD_REPLACE, 'minPwdAge')
|
||||
m['a03'] = ldb.MessageElement(str(min_pw_age_nt), ldb.FLAG_MOD_REPLACE,
|
||||
'minPwdAge')
|
||||
|
||||
max_pw_age_unix = policy['maximum password age']
|
||||
if (max_pw_age_unix == 0xFFFFFFFF):
|
||||
@ -74,8 +76,8 @@ def import_sam_policy(samdb, policy, logger):
|
||||
lockout_duration_mins = policy['lockout duration']
|
||||
lockout_duration_nt = unix2nttime(lockout_duration_mins * 60)
|
||||
|
||||
m['a05'] = ldb.MessageElement(str(lockout_duration_nt), ldb.FLAG_MOD_REPLACE,
|
||||
'lockoutDuration')
|
||||
m['a05'] = ldb.MessageElement(str(lockout_duration_nt),
|
||||
ldb.FLAG_MOD_REPLACE, 'lockoutDuration')
|
||||
|
||||
try:
|
||||
samdb.modify(m)
|
||||
@ -103,12 +105,15 @@ def add_idmap_entry(idmapdb, sid, xid, xid_type, logger):
|
||||
try:
|
||||
m = ldb.Message()
|
||||
m.dn = msg[0]['dn']
|
||||
m['xidNumber'] = ldb.MessageElement(str(xid), ldb.FLAG_MOD_REPLACE, 'xidNumber')
|
||||
m['type'] = ldb.MessageElement(xid_type, ldb.FLAG_MOD_REPLACE, 'type')
|
||||
m['xidNumber'] = ldb.MessageElement(
|
||||
str(xid), ldb.FLAG_MOD_REPLACE, 'xidNumber')
|
||||
m['type'] = ldb.MessageElement(
|
||||
xid_type, ldb.FLAG_MOD_REPLACE, 'type')
|
||||
idmapdb.modify(m)
|
||||
except ldb.LdbError, e:
|
||||
logger.warn('Could not modify idmap entry for sid=%s, id=%s, type=%s (%s)',
|
||||
str(sid), str(xid), xid_type, str(e))
|
||||
logger.warn(
|
||||
'Could not modify idmap entry for sid=%s, id=%s, type=%s (%s)',
|
||||
str(sid), str(xid), xid_type, str(e))
|
||||
else:
|
||||
try:
|
||||
idmapdb.add({"dn": "CN=%s" % str(sid),
|
||||
@ -118,8 +123,9 @@ def add_idmap_entry(idmapdb, sid, xid, xid_type, logger):
|
||||
"type": xid_type,
|
||||
"xidNumber": str(xid)})
|
||||
except ldb.LdbError, e:
|
||||
logger.warn('Could not add idmap entry for sid=%s, id=%s, type=%s (%s)',
|
||||
str(sid), str(xid), xid_type, str(e))
|
||||
logger.warn(
|
||||
'Could not add idmap entry for sid=%s, id=%s, type=%s (%s)',
|
||||
str(sid), str(xid), xid_type, str(e))
|
||||
|
||||
|
||||
def import_idmap(idmapdb, samba3, logger):
|
||||
@ -142,8 +148,10 @@ def import_idmap(idmapdb, samba3, logger):
|
||||
|
||||
m = ldb.Message()
|
||||
m.dn = ldb.Dn(idmapdb, 'CN=CONFIG')
|
||||
m['lowerbound'] = ldb.MessageElement(str(lowerbound), ldb.FLAG_MOD_REPLACE, 'lowerBound')
|
||||
m['xidNumber'] = ldb.MessageElement(str(currentxid), ldb.FLAG_MOD_REPLACE, 'xidNumber')
|
||||
m['lowerbound'] = ldb.MessageElement(
|
||||
str(lowerbound), ldb.FLAG_MOD_REPLACE, 'lowerBound')
|
||||
m['xidNumber'] = ldb.MessageElement(
|
||||
str(currentxid), ldb.FLAG_MOD_REPLACE, 'xidNumber')
|
||||
idmapdb.modify(m)
|
||||
|
||||
for id_type, xid in samba3_idmap.ids():
|
||||
@ -169,7 +177,8 @@ def add_group_from_mapping_entry(samdb, groupmap, logger):
|
||||
|
||||
# First try to see if we already have this entry
|
||||
try:
|
||||
msg = samdb.search(base='<SID=%s>' % str(groupmap.sid), scope=ldb.SCOPE_BASE)
|
||||
msg = samdb.search(
|
||||
base='<SID=%s>' % str(groupmap.sid), scope=ldb.SCOPE_BASE)
|
||||
found = True
|
||||
except ldb.LdbError, (ecode, emsg):
|
||||
if ecode == ldb.ERR_NO_SUCH_OBJECT:
|
||||
@ -183,7 +192,7 @@ def add_group_from_mapping_entry(samdb, groupmap, logger):
|
||||
else:
|
||||
if groupmap.sid_name_use == lsa.SID_NAME_WKN_GRP:
|
||||
# In a lot of Samba3 databases, aliases are marked as well known groups
|
||||
(group_dom_sid, rid) = group.sid.split()
|
||||
(group_dom_sid, rid) = groupmap.sid.split()
|
||||
if (group_dom_sid != security.dom_sid(security.SID_BUILTIN)):
|
||||
return
|
||||
|
||||
@ -238,7 +247,7 @@ def import_wins(samba4_winsdb, samba3_winsdb):
|
||||
version_id = 0
|
||||
|
||||
for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
|
||||
version_id+=1
|
||||
version_id += 1
|
||||
|
||||
type = int(name.split("#", 1)[1], 16)
|
||||
|
||||
@ -260,7 +269,7 @@ def import_wins(samba4_winsdb, samba3_winsdb):
|
||||
else:
|
||||
rState = 0x1 # released
|
||||
|
||||
nType = ((nb_flags & 0x60)>>5)
|
||||
nType = ((nb_flags & 0x60) >> 5)
|
||||
|
||||
samba4_winsdb.add({"dn": "name=%s,type=0x%s" % tuple(name.split("#")),
|
||||
"type": name.split("#")[1],
|
||||
@ -279,6 +288,7 @@ def import_wins(samba4_winsdb, samba3_winsdb):
|
||||
"objectClass": "winsMaxVersion",
|
||||
"maxVersion": str(version_id)})
|
||||
|
||||
|
||||
def enable_samba3sam(samdb, ldapurl):
|
||||
"""Enable Samba 3 LDAP URL database.
|
||||
|
||||
@ -387,7 +397,8 @@ smbconf_keep = [
|
||||
"host msdfs",
|
||||
"winbind separator"]
|
||||
|
||||
def upgrade_smbconf(oldconf,mark):
|
||||
|
||||
def upgrade_smbconf(oldconf, mark):
|
||||
"""Remove configuration variables not present in Samba4
|
||||
|
||||
:param oldconf: Old configuration structure
|
||||
@ -408,7 +419,7 @@ def upgrade_smbconf(oldconf,mark):
|
||||
if keep:
|
||||
newconf.set(s, p, oldconf.get(s, p))
|
||||
elif mark:
|
||||
newconf.set(s, "samba3:"+p, oldconf.get(s,p))
|
||||
newconf.set(s, "samba3:" + p, oldconf.get(s, p))
|
||||
|
||||
return newconf
|
||||
|
||||
@ -416,6 +427,7 @@ SAMBA3_PREDEF_NAMES = {
|
||||
'HKLM': registry.HKEY_LOCAL_MACHINE,
|
||||
}
|
||||
|
||||
|
||||
def import_registry(samba4_registry, samba3_regdb):
|
||||
"""Import a Samba 3 registry database into the Samba 4 registry.
|
||||
|
||||
@ -516,7 +528,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=Fa
|
||||
sid, rid = group.sid.split()
|
||||
if sid == domainsid:
|
||||
if rid >= next_rid:
|
||||
next_rid = rid + 1
|
||||
next_rid = rid + 1
|
||||
|
||||
# Get members for each group/alias
|
||||
if group.sid_name_use == lsa.SID_NAME_ALIAS:
|
||||
@ -540,7 +552,6 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=Fa
|
||||
group.nt_name, group.sid_name_use)
|
||||
continue
|
||||
|
||||
|
||||
# Export users from old passdb backend
|
||||
logger.info("Exporting users")
|
||||
userlist = s3db.search_users(0)
|
||||
@ -575,7 +586,7 @@ Please fix this account before attempting to upgrade again
|
||||
"""
|
||||
% (user.acct_flags, username,
|
||||
samr.ACB_NORMAL, samr.ACB_WSTRUST, samr.ACB_SVRTRUST, samr.ACB_DOMTRUST))
|
||||
|
||||
|
||||
userdata[username] = user
|
||||
try:
|
||||
uids[username] = s3db.sid_to_id(user.user_sid)[0]
|
||||
|
Reference in New Issue
Block a user