[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Jan 25 07:18:25 MST 2010
The branch, master has been updated
via 4291e28... s4-python: Fix formatting.
via 0b7910b... upgrade_from_s3: Remove unused imports.
via 8562bbd... pyxattr: Move to the same directory as the xattr code.
from b35dcd7... s4 includes: Include system/locale.h to get access to <ctype.h>
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4291e28a938695593dd90a30d3c2e49defba3e8b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 25 15:17:56 2010 +0100
s4-python: Fix formatting.
commit 0b7910b8bf32ba983d1b8e35d3eef8a73d7dd1e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jan 22 12:05:18 2010 +1300
upgrade_from_s3: Remove unused imports.
commit 8562bbdce5fd2711f527c3922b684f651f68c7f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jan 22 12:02:51 2010 +1300
pyxattr: Move to the same directory as the xattr code.
-----------------------------------------------------------------------
Summary of changes:
source4/ntvfs/posix/config.mk | 11 +++++
.../posix}/python/pyxattr_native.c | 0
.../posix}/python/pyxattr_tdb.c | 0
source4/scripting/python/config.mk | 21 ----------
source4/scripting/python/samba/provision.py | 41 +++++++++-----------
source4/scripting/python/samba/provisionbackend.py | 13 +++---
source4/scripting/python/samba/upgrade.py | 6 +-
source4/setup/upgrade_from_s3 | 2 -
8 files changed, 38 insertions(+), 56 deletions(-)
rename source4/{scripting => ntvfs/posix}/python/pyxattr_native.c (100%)
rename source4/{scripting => ntvfs/posix}/python/pyxattr_tdb.c (100%)
Changeset truncated at 500 lines:
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 1aaef3f..bf8b573 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -77,3 +77,14 @@ ntvfs_posix_OBJ_FILES = $(addprefix $(ntvfssrcdir)/posix/, \
$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_posix_proto.h,$(ntvfs_posix_OBJ_FILES:.o=.c)))
+[PYTHON::python_xattr_native]
+LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT)
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR
+
+python_xattr_native_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_native.o
+
+[PYTHON::python_xattr_tdb]
+LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT)
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share
+
+python_xattr_tdb_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o
diff --git a/source4/scripting/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c
similarity index 100%
rename from source4/scripting/python/pyxattr_native.c
rename to source4/ntvfs/posix/python/pyxattr_native.c
diff --git a/source4/scripting/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
similarity index 100%
rename from source4/scripting/python/pyxattr_tdb.c
rename to source4/ntvfs/posix/python/pyxattr_tdb.c
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 2aae592..3d255de 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -23,27 +23,6 @@ python_glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o
$(python_glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-[PYTHON::python_xattr_native]
-LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR
-
-python_xattr_native_OBJ_FILES = $(pyscriptsrcdir)/pyxattr_native.o
-
-$(python_xattr_native_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-
-#ntvfs_common pvfs_acl
-#$(ntvfs_posix_OBJ_FILES)
-[PYTHON::python_xattr_tdb]
-LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share
-#dcerpc_server
-
-python_xattr_tdb_OBJ_FILES = $(pyscriptsrcdir)/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o
-#{$(ntvfssrcdir)/ntvfs_interface.o
-#$(ntvfs_posix_OBJ_FILES)
-
-$(python_xattr_tdb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-
_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(subst ../lib/subunit/python,,$(pyfile))),$(pyfile))))
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 036890d..58c172f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -27,36 +27,31 @@
from base64 import b64encode
import os
-import sys
import pwd
import grp
import time
-import uuid, glue
+import uuid
import socket
import param
import registry
-import samba
-import subprocess
-import ldb
+import urllib
+import ldb
-from auth import system_session, admin_session
-from samba import version, Ldb, substitute_var, valid_netbios_name, setup_file
-from samba import check_all_substituted, read_and_sub_file
-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.auth import system_session, admin_session
+from samba import glue, version, Ldb, substitute_var, valid_netbios_name
+from samba import check_all_substituted, read_and_sub_file, setup_file
+from samba import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008
from samba.dcerpc import security
-from samba.ntacls import setntacl,dsacl2fsacl
+from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
+from samba.idmap import IDmapDB
+from samba.ntacls import setntacl, dsacl2fsacl
from samba.ndr import ndr_pack,ndr_unpack
-import urllib
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
+from samba.schema import Schema
from ms_display_specifiers import read_ms_ldif
-from schema import Schema
-from provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
+from samba.provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
from provisionexceptions import ProvisioningError, InvalidNetbiosName
-from signal import SIGTERM
-from dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
+
__docformat__ = "restructuredText"
def find_setup_dir():
@@ -626,13 +621,13 @@ def secretsdb_self_join(secretsdb, domain,
res = secretsdb.search(base="cn=Primary Domains",
attrs=attrs,
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:
if del_msg.dn is not 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:
msg["priorSecret"] = res[0]["secret"]
@@ -816,7 +811,7 @@ def setup_self_join(samdb, names,
# 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)
names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID",
- expression="", scope=SCOPE_BASE)
+ expression="", scope=ldb.SCOPE_BASE)
assert isinstance(names.ntdsguid, str)
# 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)
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)
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))
res = samdb.search(base="CN=Policies,CN=System,%s"%(names.domaindn),
attrs=["cn","nTSecurityDescriptor"],
- expression="", scope=SCOPE_ONELEVEL)
+ expression="", scope=ldb.SCOPE_ONELEVEL)
for policy in res:
acl = ndr_unpack(security.descriptor,str(policy["nTSecurityDescriptor"])).as_sddl()
policy_path = os.path.join(sysvol, names.dnsdomain, "Policies",
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 8241ed6..3dff6ed 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -33,15 +33,14 @@ import uuid
import time
import shutil
import subprocess
-
-from samba import read_and_sub_file
-from samba import Ldb
import urllib
+
from ldb import SCOPE_BASE, SCOPE_ONELEVEL, LdbError, timestring
-from credentials import Credentials, DONT_USE_KERBEROS
-from samba import setup_file
-from schema import Schema
-from provisionexceptions import ProvisioningError
+
+from samba import Ldb, read_and_sub_file, setup_file
+from samba.credentials import Credentials, DONT_USE_KERBEROS
+from samba.schema import Schema
+from samba.provisionexceptions import ProvisioningError
def setup_db_config(setup_path, dbdir):
"""Setup a Berkeley database.
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 29f2f7c..a2c78de 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -9,14 +9,14 @@
__docformat__ = "restructuredText"
-from provision import provision
import grp
import ldb
import time
import pwd
-import registry
-from samba import Ldb
+
+from samba import Ldb, registry
from samba.param import LoadParm
+from samba.provision import provision
def import_sam_policy(samldb, policy, dn):
"""Import a Samba 3 policy database."""
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index 7e1e1fd..b3bf5e7 100755
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import getopt
import optparse
import os, sys
@@ -25,7 +24,6 @@ sys.path.insert(0, "bin/python")
import samba
import samba.getopt as options
-from samba import param
from samba.auth import system_session
from samba.provision import find_setup_dir
from samba.upgrade import upgrade_provision
--
Samba Shared Repository
More information about the samba-cvs
mailing list