sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s4-python: Fix formatting.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-01-25 15:17:56 +01:00
parent 0b7910b8bf
commit 4291e28a93
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,36 +27,31 @@
from base64 import b64encode from base64 import b64encode
import os import os
import sys
import pwd import pwd
import grp import grp
import time import time
import uuid, glue import uuid
import socket import socket
import param import param
import registry import registry
import samba import urllib
import subprocess
import ldb import ldb
from samba.auth import system_session, admin_session
from auth import system_session, admin_session from samba import glue, version, Ldb, substitute_var, valid_netbios_name
from samba import version, Ldb, substitute_var, valid_netbios_name, setup_file from samba import check_all_substituted, read_and_sub_file, setup_file
from samba import check_all_substituted, read_and_sub_file from samba import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008
from samba import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008, DS_DC_FUNCTION_2008
from samba.samdb import SamDB
from samba.idmap import IDmapDB
from samba.dcerpc import security from samba.dcerpc import security
from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
from samba.idmap import IDmapDB
from samba.ntacls import setntacl, dsacl2fsacl from samba.ntacls import setntacl, dsacl2fsacl
from samba.ndr import ndr_pack,ndr_unpack from samba.ndr import ndr_pack,ndr_unpack
import urllib from samba.schema import Schema
from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
from ms_display_specifiers import read_ms_ldif from ms_display_specifiers import read_ms_ldif
from schema import Schema from samba.provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
from provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
from provisionexceptions import ProvisioningError, InvalidNetbiosName from provisionexceptions import ProvisioningError, InvalidNetbiosName
from signal import SIGTERM
from dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
__docformat__ = "restructuredText" __docformat__ = "restructuredText"
def find_setup_dir(): def find_setup_dir():
@ -626,13 +621,13 @@ def secretsdb_self_join(secretsdb, domain,
res = secretsdb.search(base="cn=Primary Domains", res = secretsdb.search(base="cn=Primary Domains",
attrs=attrs, attrs=attrs,
expression=("(&(|(flatname=%s)(realm=%s)(objectSid=%s))(objectclass=primaryDomain))" % (domain, realm, str(domainsid))), expression=("(&(|(flatname=%s)(realm=%s)(objectSid=%s))(objectclass=primaryDomain))" % (domain, realm, str(domainsid))),
scope=SCOPE_ONELEVEL) scope=ldb.SCOPE_ONELEVEL)
for del_msg in res: for del_msg in res:
if del_msg.dn is not msg.dn: if del_msg.dn is not msg.dn:
secretsdb.delete(del_msg.dn) secretsdb.delete(del_msg.dn)
res = secretsdb.search(base=msg.dn, attrs=attrs, scope=SCOPE_BASE) res = secretsdb.search(base=msg.dn, attrs=attrs, scope=ldb.SCOPE_BASE)
if len(res) == 1: if len(res) == 1:
msg["priorSecret"] = res[0]["secret"] msg["priorSecret"] = res[0]["secret"]
@ -816,7 +811,7 @@ def setup_self_join(samdb, names,
# add the NTDSGUID based SPNs # add the NTDSGUID based SPNs
ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn) ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn)
names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID", names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID",
expression="", scope=SCOPE_BASE) expression="", scope=ldb.SCOPE_BASE)
assert isinstance(names.ntdsguid, str) assert isinstance(names.ntdsguid, str)
# Setup fSMORoleOwner entries to point at the newly created DC entry # Setup fSMORoleOwner entries to point at the newly created DC entry
@ -1044,7 +1039,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp,
ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn) ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn)
names.ntdsguid = samdb.searchone(basedn=ntds_dn, names.ntdsguid = samdb.searchone(basedn=ntds_dn,
attribute="objectGUID", expression="", scope=SCOPE_BASE) attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE)
assert isinstance(names.ntdsguid, str) assert isinstance(names.ntdsguid, str)
except: except:
@ -1094,7 +1089,7 @@ def setsysvolacl(samdb,names,netlogon,sysvol,gid,domainsid,lp):
set_gpo_acl(policy_path,dsacl2fsacl(acl,str(domainsid)),lp,str(domainsid)) set_gpo_acl(policy_path,dsacl2fsacl(acl,str(domainsid)),lp,str(domainsid))
res = samdb.search(base="CN=Policies,CN=System,%s"%(names.domaindn), res = samdb.search(base="CN=Policies,CN=System,%s"%(names.domaindn),
attrs=["cn","nTSecurityDescriptor"], attrs=["cn","nTSecurityDescriptor"],
expression="", scope=SCOPE_ONELEVEL) expression="", scope=ldb.SCOPE_ONELEVEL)
for policy in res: for policy in res:
acl = ndr_unpack(security.descriptor,str(policy["nTSecurityDescriptor"])).as_sddl() acl = ndr_unpack(security.descriptor,str(policy["nTSecurityDescriptor"])).as_sddl()
policy_path = os.path.join(sysvol, names.dnsdomain, "Policies", policy_path = os.path.join(sysvol, names.dnsdomain, "Policies",

13
source4/scripting/python/samba/provisionbackend.py
View File

@ -33,15 +33,14 @@ import uuid
import time import time
import shutil import shutil
import subprocess import subprocess
from samba import read_and_sub_file
from samba import Ldb
import urllib import urllib
from ldb import SCOPE_BASE, SCOPE_ONELEVEL, LdbError, timestring from ldb import SCOPE_BASE, SCOPE_ONELEVEL, LdbError, timestring
from credentials import Credentials, DONT_USE_KERBEROS
from samba import setup_file from samba import Ldb, read_and_sub_file, setup_file
from schema import Schema from samba.credentials import Credentials, DONT_USE_KERBEROS
from provisionexceptions import ProvisioningError from samba.schema import Schema
from samba.provisionexceptions import ProvisioningError
def setup_db_config(setup_path, dbdir): def setup_db_config(setup_path, dbdir):
"""Setup a Berkeley database. """Setup a Berkeley database.

6
source4/scripting/python/samba/upgrade.py
View File

@ -9,14 +9,14 @@
__docformat__ = "restructuredText" __docformat__ = "restructuredText"
from provision import provision
import grp import grp
import ldb import ldb
import time import time
import pwd import pwd
import registry
from samba import Ldb from samba import Ldb, registry
from samba.param import LoadParm from samba.param import LoadParm
from samba.provision import provision
def import_sam_policy(samldb, policy, dn): def import_sam_policy(samldb, policy, dn):
"""Import a Samba 3 policy database.""" """Import a Samba 3 policy database."""