[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Feb 18 22:28:02 MST 2012
The branch, master has been updated
via 5de8bec waf: Use libraries when building.
via 8ce7abd Use uselib in CHECK_HEADER.
via d923068 popt: Use pkg-config file to look for popt.
via ab45440 library_flags: Leave setting of CPPPATH to waf too.
via a977de9 s4-python: Various formatting fixes.
via c29e025 samba.web_server: Fix use of whitespace.
via e33441f pygensec: Fix whitespace.
via 1f29707 waf: Update to new upstream version.
via 580657b wafsamba: Fix some whitespace issues.
from a431f80 s3-secrets: Remove unused secrets_delete_generic()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5de8beca1815ae15eaf44c30185228f1fa5c6d51
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 19 04:48:27 2012 +0100
waf: Use libraries when building.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sun Feb 19 06:27:55 CET 2012 on sn-devel-104
commit 8ce7abd449b3c09a24fd2226d699e87a946dd380
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 19 03:58:32 2012 +0100
Use uselib in CHECK_HEADER.
commit d92306894aeb09788c2be22f5e754d8bf929b7f6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 19 03:10:03 2012 +0100
popt: Use pkg-config file to look for popt.
commit ab454403ebc3dbd16c494063a0513df99f58a26b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 19 02:16:14 2012 +0100
library_flags: Leave setting of CPPPATH to waf too.
commit a977de9fdfc2cad9724fd46995258a17f05d5b73
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 18 23:59:48 2012 +0100
s4-python: Various formatting fixes.
commit c29e0258e0b9d4cbf05e1ff30f8787b314b23b04
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 18 23:54:38 2012 +0100
samba.web_server: Fix use of whitespace.
commit e33441fafdc4421a88a6c48bf1bb06fee79f1ac7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 18 23:52:37 2012 +0100
pygensec: Fix whitespace.
commit 1f29707f57db526f56d65110e12dd0ca33ee7e95
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 18 23:19:51 2012 +0100
waf: Update to new upstream version.
commit 580657bc25ac5379e6a5451c1df92b33f9a8f34b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 18 23:17:59 2012 +0100
wafsamba: Fix some whitespace issues.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafadmin/Tools/preproc.py | 7 ++-
buildtools/wafsamba/samba_autoconf.py | 14 +++--
buildtools/wafsamba/samba_deps.py | 5 +-
lib/popt/wscript | 2 +-
source4/auth/gensec/pygensec.c | 16 +++---
source4/scripting/python/samba/__init__.py | 11 +++-
source4/scripting/python/samba/common.py | 7 ++-
source4/scripting/python/samba/dbchecker.py | 59 +++++---------------
.../python/samba/tests/dcerpc/registry.py | 6 +-
.../python/samba/tests/dcerpc/rpc_talloc.py | 3 +-
source4/scripting/python/samba/tests/strings.py | 1 +
source4/scripting/python/samba/tests/upgrade.py | 9 ++-
.../python/samba/tests/upgradeprovisionneeddc.py | 3 +-
source4/scripting/python/samba/tests/xattr.py | 2 +-
.../scripting/python/samba/web_server/__init__.py | 2 +-
15 files changed, 66 insertions(+), 81 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Tools/preproc.py b/buildtools/wafadmin/Tools/preproc.py
index 5055456..6c49326 100644
--- a/buildtools/wafadmin/Tools/preproc.py
+++ b/buildtools/wafadmin/Tools/preproc.py
@@ -555,8 +555,7 @@ def parse_char(txt):
except KeyError: raise PreprocError("could not parse char literal '%s'" % txt)
@Utils.run_once
-def tokenize(s):
- """convert a string into a list of tokens (shlex.split does not apply to c/c++/d)"""
+def tokenize_private(s):
ret = []
for match in re_clexer.finditer(s):
m = match.group
@@ -591,6 +590,10 @@ def tokenize(s):
break
return ret
+def tokenize(s):
+ """convert a string into a list of tokens (shlex.split does not apply to c/c++/d)"""
+ return tokenize_private(s)[:]
+
@Utils.run_once
def define_name(line):
return re_mac.match(line).group(0)
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 6ed719a..de4632e 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -95,10 +95,13 @@ def CHECK_HEADER(conf, h, add_headers=False, lib=None):
(ccflags, ldflags) = library_flags(conf, lib)
hdrs = hlist_to_string(conf, headers=h)
+ if lib is None:
+ lib = ""
ret = conf.check(fragment='%s\nint main(void) { return 0; }' % hdrs,
type='nolink',
execute=0,
ccflags=ccflags,
+ uselib=lib.upper(),
msg="Checking for header %s" % h)
if not ret:
missing_headers.add(h)
@@ -370,6 +373,8 @@ def CHECK_CODE(conf, code, define,
(ccflags, ldflags) = library_flags(conf, uselib)
+ uselib = [l.upper() for l in uselib]
+
cflags.extend(ccflags)
if on_target:
@@ -468,10 +473,7 @@ def library_flags(self, libs):
ccflags = []
ldflags = []
for lib in TO_LIST(libs):
- inc_path = getattr(self.env, 'CPPPATH_%s' % lib.upper(), [])
- lib_path = getattr(self.env, 'LIBPATH_%s' % lib.upper(), [])
- ccflags.extend(['-I%s' % i for i in inc_path])
- # note that we do not add the -L in here, as that is added by the waf
+ # note that we do not add the -I and -L in here, as that is added by the waf
# core. Adding it here would just change the order that it is put on the link line
# which can cause system paths to be added before internal libraries
extra_ccflags = TO_LIST(getattr(self.env, 'CCFLAGS_%s' % lib.upper(), []))
@@ -509,9 +511,9 @@ int foo()
(ccflags, ldflags) = library_flags(conf, lib)
if shlib:
- res = conf.check(features='cc cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags)
+ res = conf.check(features='cc cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper())
else:
- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags)
+ res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper())
if not res:
if mandatory:
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 0bd2c6c..d342f0b 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -190,8 +190,6 @@ def build_includes(self):
self.sname, self.includes)
-
-
def add_init_functions(self):
'''This builds the right set of init functions'''
@@ -250,7 +248,6 @@ def add_init_functions(self):
self.ccflags = cflags
-
def check_duplicate_sources(bld, tgt_list):
'''see if we are compiling the same source file more than once
without an allow_duplicates attribute'''
@@ -297,7 +294,7 @@ def check_duplicate_sources(bld, tgt_list):
for tname in subsystems[s]:
if len(subsystems[s][tname]) > 1:
raise Utils.WafError("ERROR: source %s is in more than one subsystem of target '%s': %s" % (s, tname, subsystems[s][tname]))
-
+
return ret
diff --git a/lib/popt/wscript b/lib/popt/wscript
index 7fd15ed..6aa8e70 100644
--- a/lib/popt/wscript
+++ b/lib/popt/wscript
@@ -5,7 +5,7 @@ import Options
def configure(conf):
conf.CHECK_HEADERS('float.h')
- if conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h'):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('popt'):
conf.define('USING_SYSTEM_POPT', 1)
def build(bld):
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index acbad5f..5a8744d 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -519,20 +519,21 @@ static PyMethodDef py_gensec_security_methods[] = {
{ "set_credentials", (PyCFunction)py_gensec_set_credentials, METH_VARARGS,
"S.start_client(credentials)" },
{ "session_info", (PyCFunction)py_gensec_session_info, METH_NOARGS,
- "S.session_info() -> info" },
+ "S.session_info() -> info" },
{ "session_key", (PyCFunction)py_gensec_session_key, METH_NOARGS,
- "S.session_key() -> key" },
+ "S.session_key() -> key" },
{ "start_mech_by_name", (PyCFunction)py_gensec_start_mech_by_name, METH_VARARGS,
- "S.start_mech_by_name(name)" },
+ "S.start_mech_by_name(name)" },
{ "start_mech_by_sasl_name", (PyCFunction)py_gensec_start_mech_by_sasl_name, METH_VARARGS,
- "S.start_mech_by_sasl_name(name)" },
- { "start_mech_by_authtype", (PyCFunction)py_gensec_start_mech_by_authtype, METH_VARARGS, "S.start_mech_by_authtype(authtype, level)" },
+ "S.start_mech_by_sasl_name(name)" },
+ { "start_mech_by_authtype", (PyCFunction)py_gensec_start_mech_by_authtype, METH_VARARGS,
+ "S.start_mech_by_authtype(authtype, level)" },
{ "get_name_by_authtype", (PyCFunction)py_get_name_by_authtype, METH_VARARGS,
"S.get_name_by_authtype(authtype) -> name\nLookup an auth type." },
{ "want_feature", (PyCFunction)py_gensec_want_feature, METH_VARARGS,
- "S.want_feature(feature)\n Request that GENSEC negotiate a particular feature." },
+ "S.want_feature(feature)\n Request that GENSEC negotiate a particular feature." },
{ "have_feature", (PyCFunction)py_gensec_have_feature, METH_VARARGS,
- "S.have_feature()\n Return True if GENSEC negotiated a particular feature." },
+ "S.have_feature()\n Return True if GENSEC negotiated a particular feature." },
{ "set_max_update_size", (PyCFunction)py_gensec_set_max_update_size, METH_VARARGS,
"S.set_max_update_size(max_size) \n Some mechs can fragment update packets, needs to be use before the mech is started." },
{ "max_update_size", (PyCFunction)py_gensec_max_update_size, 0,
@@ -543,7 +544,6 @@ static PyMethodDef py_gensec_security_methods[] = {
"S.wrap(blob_in) -> blob_out\nPackage one clear packet into a wrapped GENSEC packet." },
{ "unwrap", (PyCFunction)py_gensec_unwrap, METH_VARARGS,
"S.unwrap(blob_in) -> blob_out\nPerform one wrapped GENSEC packet into a clear packet." },
-
{ NULL }
};
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index d81a25c..20e6e70 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -28,15 +28,17 @@ import os
import sys
import samba.param
+
def source_tree_topdir():
"""Return the top level source directory."""
- paths = [ "../../..", "../../../.." ]
+ paths = ["../../..", "../../../.."]
for p in paths:
topdir = os.path.normpath(os.path.join(os.path.dirname(__file__), p))
if os.path.exists(os.path.join(topdir, 'source4')):
return 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"""
try:
@@ -49,6 +51,7 @@ def in_source_tree():
import ldb
from samba._ldb import Ldb as _Ldb
+
class Ldb(_Ldb):
"""Simple Samba-specific LDB subclass that takes care
of setting up the modules dir, credentials pointers, etc.
@@ -166,7 +169,8 @@ class Ldb(_Ldb):
# Try to delete user/computer accounts to allow deletion of groups
self.erase_users_computers(basedn)
- # Delete the 'visible' records, and the invisble 'deleted' records (if this DB supports it)
+ # Delete the 'visible' records, and the invisble 'deleted' records (if
+ # this DB supports it)
for msg in self.search(basedn, ldb.SCOPE_SUBTREE,
"(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))",
[], controls=["show_deleted:0", "show_recycled:0"]):
@@ -178,7 +182,8 @@ class Ldb(_Ldb):
raise
res = self.search(basedn, ldb.SCOPE_SUBTREE,
- "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", [], controls=["show_deleted:0", "show_recycled:0"])
+ "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))",
+ [], controls=["show_deleted:0", "show_recycled:0"])
assert len(res) == 0
# delete the specials
diff --git a/source4/scripting/python/samba/common.py b/source4/scripting/python/samba/common.py
index b67036c..2ba60a0 100644
--- a/source4/scripting/python/samba/common.py
+++ b/source4/scripting/python/samba/common.py
@@ -18,7 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import ldb, dsdb
+
+import ldb
+import dsdb
+
def confirm(msg, forced=False, allow_all=False):
"""confirm an action with the user
@@ -73,7 +76,7 @@ class dsdb_Dn(object):
syntax_oid = dsdb.DSDB_SYNTAX_STRING_DN
else:
syntax_oid = dsdb.DSDB_SYNTAX_OR_NAME
- if syntax_oid in [ dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_STRING_DN ]:
+ if syntax_oid in [dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_STRING_DN]:
# it is a binary DN
colons = dnstring.split(':')
if len(colons) < 4:
diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py
index ff3fd6e..7f2c979 100644
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/source4/scripting/python/samba/dbchecker.py
@@ -27,11 +27,12 @@ from samba.ndr import ndr_unpack
from samba.dcerpc import drsblobs
from samba.common import dsdb_Dn
+
class dbcheck(object):
"""check a SAM database for errors"""
- def __init__(self, samdb, samdb_schema=None, verbose=False, fix=False, yes=False,
- quiet=False, in_transaction=False):
+ def __init__(self, samdb, samdb_schema=None, verbose=False, fix=False,
+ yes=False, quiet=False, in_transaction=False):
self.samdb = samdb
self.dict_oid_name = None
self.samdb_schema = (samdb_schema or samdb)
@@ -67,20 +68,14 @@ class dbcheck(object):
if error_count != 0 and not self.fix:
self.report("Please use --fix to fix these errors")
-
self.report('Checked %u objects (%u errors)' % (len(res), error_count))
-
return error_count
-
def report(self, msg):
'''print a message unless quiet is set'''
if not self.quiet:
print(msg)
-
- ################################################################
- # a local confirm function that obeys the --fix and --yes options
def confirm(self, msg, allow_all=False, forced=False):
'''confirm a change'''
if not self.fix:
@@ -114,7 +109,6 @@ class dbcheck(object):
return True
return c
-
def do_modify(self, m, controls, msg, validate=True):
'''perform a modify with optional verbose output'''
if self.verbose:
@@ -126,9 +120,6 @@ class dbcheck(object):
return False
return True
-
- ################################################################
- # handle empty attributes
def err_empty_attribute(self, dn, attrname):
'''fix empty attributes'''
self.report("ERROR: Empty attribute %s in %s" % (attrname, dn))
@@ -143,15 +134,13 @@ class dbcheck(object):
"Failed to remove empty attribute %s" % attrname, validate=False):
self.report("Removed empty attribute %s" % attrname)
-
- ################################################################
- # handle normalisation mismatches
def err_normalise_mismatch(self, dn, attrname, values):
'''fix attribute normalisation errors'''
self.report("ERROR: Normalisation error for attribute %s in %s" % (attrname, dn))
mod_list = []
for val in values:
- normalised = self.samdb.dsdb_normalise_attributes(self.samdb_schema, attrname, [val])
+ normalised = self.samdb.dsdb_normalise_attributes(
+ self.samdb_schema, attrname, [val])
if len(normalised) != 1:
self.report("Unable to normalise value '%s'" % val)
mod_list.append((val, ''))
@@ -168,7 +157,8 @@ class dbcheck(object):
(val, nval) = mod_list[i]
m['value_%u' % i] = ldb.MessageElement(val, ldb.FLAG_MOD_DELETE, attrname)
if nval != '':
- m['normv_%u' % i] = ldb.MessageElement(nval, ldb.FLAG_MOD_ADD, attrname)
+ m['normv_%u' % i] = ldb.MessageElement(nval, ldb.FLAG_MOD_ADD,
+ attrname)
if self.do_modify(m, ["relax:0", "show_recycled:1"],
"Failed to normalise attribute %s" % attrname,
@@ -179,10 +169,8 @@ class dbcheck(object):
'''see if a dsdb_Dn is the special Deleted Objects DN'''
return dsdb_dn.prefix == "B:32:18E2EA80684F11D2B9AA00C04F79F805:"
-
- ################################################################
- # handle a DN pointing to a deleted object
def err_deleted_dn(self, dn, attrname, val, dsdb_dn, correct_dn):
+ """handle a DN pointing to a deleted object"""
self.report("ERROR: target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
self.report("Target GUID points at deleted DN %s" % correct_dn)
if not self.confirm_all('Remove DN link?', 'remove_all_deleted_DN_links'):
@@ -195,9 +183,8 @@ class dbcheck(object):
"Failed to remove deleted DN attribute %s" % attrname):
self.report("Removed deleted DN on attribute %s" % attrname)
- ################################################################
- # handle a missing target DN (both GUID and DN string form are missing)
def err_missing_dn_GUID(self, dn, attrname, val, dsdb_dn):
+ """handle a missing target DN (both GUID and DN string form are missing)"""
# check if its a backlink
linkID = self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname)
if (linkID & 1 == 0) and str(dsdb_dn).find('DEL\\0A') == -1:
@@ -205,10 +192,8 @@ class dbcheck(object):
return
self.err_deleted_dn(dn, attrname, val, dsdb_dn, dsdb_dn)
-
- ################################################################
- # handle a missing GUID extended DN component
def err_incorrect_dn_GUID(self, dn, attrname, val, dsdb_dn, errstr):
+ """handle a missing GUID extended DN component"""
self.report("ERROR: %s component for %s in object %s - %s" % (errstr, attrname, dn, val))
controls=["extended_dn:1:1", "show_recycled:1"]
try:
@@ -236,10 +221,8 @@ class dbcheck(object):
"Failed to fix %s on attribute %s" % (errstr, attrname)):
self.report("Fixed %s on attribute %s" % (errstr, attrname))
-
- ################################################################
- # handle a DN string being incorrect
def err_dn_target_mismatch(self, dn, attrname, val, dsdb_dn, correct_dn, errstr):
+ """handle a DN string being incorrect"""
self.report("ERROR: incorrect DN string component for %s in object %s - %s" % (attrname, dn, val))
dsdb_dn.dn = correct_dn
@@ -254,8 +237,6 @@ class dbcheck(object):
"Failed to fix incorrect DN string on attribute %s" % attrname):
self.report("Fixed incorrect DN string on attribute %s" % (attrname))
- ################################################################
- # handle an unknown attribute error
def err_unknown_attribute(self, obj, attrname):
'''handle an unknown attribute error'''
self.report("ERROR: unknown attribute '%s' in %s" % (attrname, obj.dn))
@@ -269,9 +250,6 @@ class dbcheck(object):
"Failed to remove unknown attribute %s" % attrname):
self.report("Removed unknown attribute %s" % (attrname))
-
- ################################################################
- # handle a missing backlink
def err_missing_backlink(self, obj, attrname, val, backlink_name, target_dn):
'''handle a missing backlink value'''
self.report("ERROR: missing backlink attribute '%s' in %s for link %s in %s" % (backlink_name, target_dn, attrname, obj.dn))
@@ -286,9 +264,6 @@ class dbcheck(object):
"Failed to fix missing backlink %s" % backlink_name):
self.report("Fixed missing backlink %s" % (backlink_name))
-
- ################################################################
- # handle a orphaned backlink
def err_orphaned_backlink(self, obj, attrname, val, link_name, target_dn):
'''handle a orphaned backlink value'''
self.report("ERROR: orphaned backlink attribute '%s' in %s for link %s in %s" % (attrname, obj.dn, link_name, target_dn))
@@ -302,9 +277,6 @@ class dbcheck(object):
"Failed to fix orphaned backlink %s" % link_name):
self.report("Fixed orphaned backlink %s" % (link_name))
-
- ################################################################
- # specialised checking for a dn attribute
def check_dn(self, obj, attrname, syntax_oid):
'''check a DN attribute for correctness'''
error_count = 0
@@ -315,12 +287,13 @@ class dbcheck(object):
guid = dsdb_dn.dn.get_extended_component("GUID")
if guid is None:
error_count += 1
- self.err_incorrect_dn_GUID(obj.dn, attrname, val, dsdb_dn, "missing GUID")
+ self.err_incorrect_dn_GUID(obj.dn, attrname, val, dsdb_dn,
+ "missing GUID")
continue
guidstr = str(misc.GUID(guid))
- attrs=['isDeleted']
+ attrs = ['isDeleted']
linkID = self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname)
reverse_link_name = self.samdb_schema.get_backlink_from_lDAPDisplayName(attrname)
if reverse_link_name is not None:
@@ -415,9 +388,6 @@ class dbcheck(object):
"Failed to fix metadata for attribute %s" % attr):
self.report("Fixed metadata for attribute %s" % attr)
-
- ################################################################
- # check one object - calls to individual error handlers above
def check_object(self, dn, attrs=['*']):
'''check one object'''
if self.verbose:
@@ -454,7 +424,6 @@ class dbcheck(object):
got_repl_property_meta_data = True
continue
-
# check for empty attributes
for val in obj[attrname]:
if val == '':
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index b5495c7..c3b2852 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -27,15 +27,15 @@ class WinregTests(RpcInterfaceTestCase):
def setUp(self):
super(WinregTests, self).setUp()
- self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(),
+ self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(),
self.get_credentials())
def get_hklm(self):
- return self.conn.OpenHKLM(None,
+ return self.conn.OpenHKLM(None,
winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
def test_hklm(self):
- handle = self.conn.OpenHKLM(None,
+ handle = self.conn.OpenHKLM(None,
winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
self.conn.CloseKey(handle)
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py b/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
index 9ee2850..41286c6 100755
--- a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
@@ -37,6 +37,7 @@ import talloc
talloc.enable_null_tracking()
+
class TallocTests(samba.tests.TestCase):
'''test talloc behaviour of pidl generated python code'''
@@ -54,7 +55,7 @@ class TallocTests(samba.tests.TestCase):
# we expect one block for the object, and one for the structure
self.check_blocks(partial_attribute_set, 2)
- attids = [ 1, 2, 3]
+ attids = [1, 2, 3]
partial_attribute_set.version = 1
partial_attribute_set.attids = attids
partial_attribute_set.num_attids = len(attids)
diff --git a/source4/scripting/python/samba/tests/strings.py b/source4/scripting/python/samba/tests/strings.py
index 0c96f5c..48ad242 100644
--- a/source4/scripting/python/samba/tests/strings.py
+++ b/source4/scripting/python/samba/tests/strings.py
@@ -67,6 +67,7 @@ class strcasecmp_m_Tests(samba.tests.TestCase):
class strstr_m_Tests(samba.tests.TestCase):
"""strstr_m tests in simple ASCII and unicode strings"""
+
def test_strstr_m(self):
# A, B, strstr_m(A, B)
cases = [('hello', 'hello', 'hello'),
diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
index f522831..1348ca6 100644
--
Samba Shared Repository
More information about the samba-cvs
mailing list