[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Thu Jan 6 08:08:01 MST 2011
The branch, master has been updated
via 4e0d0af acl tests: Fix import.
via b44fe4e Use new style objects.
via 4236ec9 Remove unused imports.
via 24d5a72 tdbrestore: Update to GPLv3+, remove old FSF address.
from 2958a43 s3-waf: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4e0d0af9e89e23a5daea8048deff5c9057f08bb9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jan 6 14:39:46 2011 +0100
acl tests: Fix import.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Thu Jan 6 16:07:49 CET 2011 on sn-devel-104
commit b44fe4e3bbf89943041f4d70d75151e582c46600
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jan 6 14:39:40 2011 +0100
Use new style objects.
commit 4236ec9d6d128467b7f9e5306ed94b2bd025f9ad
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jan 6 12:40:07 2011 +0100
Remove unused imports.
commit 24d5a7202ab521b92eb07c93647ae2d381e181a5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 5 13:52:34 2011 +0100
tdbrestore: Update to GPLv3+, remove old FSF address.
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/tools/tdbrestore.c | 5 ++---
source4/dsdb/tests/python/acl.py | 18 ++++++++++--------
source4/dsdb/tests/python/ldap_syntaxes.py | 7 +------
source4/dsdb/tests/python/passwords.py | 2 +-
source4/dsdb/tests/python/sam.py | 1 -
source4/dsdb/tests/python/sec_descriptor.py | 2 +-
source4/dsdb/tests/python/urgent_replication.py | 2 +-
source4/scripting/python/samba/join.py | 3 ++-
8 files changed, 18 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/tools/tdbrestore.c b/lib/tdb/tools/tdbrestore.c
index 601cd5e..95ee360 100644
--- a/lib/tdb/tools/tdbrestore.c
+++ b/lib/tdb/tools/tdbrestore.c
@@ -5,7 +5,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <assert.h>
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 977221f..d2c4116 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -12,6 +12,7 @@ samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
import samba.getopt as options
+from samba.join import dc_join
from ldb import (
SCOPE_BASE, SCOPE_SUBTREE, LdbError, ERR_NO_SUCH_OBJECT,
@@ -19,12 +20,11 @@ from ldb import (
from ldb import ERR_CONSTRAINT_VIOLATION
from ldb import ERR_OPERATIONS_ERROR
from ldb import Message, MessageElement, Dn
-from ldb import FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE
-from samba.ndr import ndr_pack, ndr_unpack
-from samba.dcerpc import security, drsuapi, misc, netlogon, nbt
+from ldb import FLAG_MOD_REPLACE, FLAG_MOD_ADD
+from samba.dcerpc import security, drsuapi, misc
from samba.auth import system_session
-from samba import gensec, sd_utils, join
+from samba import gensec, sd_utils
from samba.samdb import SamDB
from samba.credentials import Credentials
import samba.tests
@@ -1562,6 +1562,7 @@ class AclExtendedTests(AclTests):
self.assertEqual(len(res),1)
self.assertTrue("nTSecurityDescriptor" in res[0].keys())
+
class AclSPNTests(AclTests):
def setUp(self):
@@ -1573,10 +1574,11 @@ class AclSPNTests(AclTests):
self.computerdn = "CN=%s,CN=computers,%s" % (self.computername, self.base_dn)
self.dc_dn = "CN=%s,OU=Domain Controllers,%s" % (self.dcname, self.base_dn)
self.site = "Default-First-Site-Name"
- self.rodcctx = samba.join.dc_join(server=host, creds=creds, lp=lp, site=self.site, netbios_name=self.rodcname,
- targetdir=None, domain=None)
- self.dcctx = samba.join.dc_join(server=host, creds=creds, lp=lp, site=self.site, netbios_name=self.dcname,
- targetdir=None, domain=None)
+ self.rodcctx = dc_join(server=host, creds=creds, lp=lp,
+ site=self.site, netbios_name=self.rodcname, targetdir=None,
+ domain=None)
+ self.dcctx = dc_join(server=host, creds=creds, lp=lp, site=self.site,
+ netbios_name=self.dcname, targetdir=None, domain=None)
self.ldb_admin.newuser(self.test_user, self.user_pass)
self.ldb_user1 = self.get_ldb_connection(self.test_user, self.user_pass)
self.user_sid1 = self.sd_utils.get_object_sid(self.get_user_dn(self.test_user))
diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 63296c8..04b95d7 100644
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -6,7 +6,6 @@ import optparse
import sys
import time
import random
-import os
import uuid
sys.path.append("bin/python")
@@ -17,15 +16,11 @@ samba.ensure_external_module("subunit", "subunit/python")
import samba.getopt as options
from samba.auth import system_session
-from ldb import SCOPE_ONELEVEL, SCOPE_BASE, SCOPE_SUBTREE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT
+from ldb import SCOPE_BASE, SCOPE_SUBTREE, LdbError
from ldb import ERR_CONSTRAINT_VIOLATION
from ldb import ERR_INVALID_ATTRIBUTE_SYNTAX
from ldb import ERR_ENTRY_ALREADY_EXISTS
-from samba.ndr import ndr_pack, ndr_unpack
-from samba.dcerpc import security
-
from subunit.run import SubunitTestRunner
import unittest
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 28a0776..70bca93 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -24,7 +24,7 @@ import samba.getopt as options
from samba.auth import system_session
from samba.credentials import Credentials
from ldb import SCOPE_BASE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT, ERR_ATTRIBUTE_OR_VALUE_EXISTS
+from ldb import ERR_ATTRIBUTE_OR_VALUE_EXISTS
from ldb import ERR_UNWILLING_TO_PERFORM, ERR_INSUFFICIENT_ACCESS_RIGHTS
from ldb import ERR_NO_SUCH_ATTRIBUTE
from ldb import ERR_CONSTRAINT_VIOLATION
diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 4242fd6..03d6984 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -42,7 +42,6 @@ from samba.dcerpc.security import (DOMAIN_RID_USERS, DOMAIN_RID_DOMAIN_MEMBERS,
from subunit.run import SubunitTestRunner
import unittest
-from samba.ndr import ndr_unpack
from samba.dcerpc import security
from samba.tests import delete_force
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index c24b6e9..c08035b 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -19,7 +19,7 @@ import samba.getopt as options
from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT
# For running the test unit
-from samba.ndr import ndr_pack, ndr_unpack
+from samba.ndr import ndr_pack
from samba.dcerpc import security
from samba import gensec, sd_utils
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 946d7d7..f35dc6d 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -13,7 +13,7 @@ samba.ensure_external_module("subunit", "subunit/python")
import samba.getopt as options
from samba.auth import system_session
-from ldb import (SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT, Message,
+from ldb import (LdbError, ERR_NO_SUCH_OBJECT, Message,
MessageElement, Dn, FLAG_MOD_REPLACE)
from samba.samdb import SamDB
import samba.tests
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 09adf73..6e4cb58 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -36,7 +36,8 @@ import talloc
# this makes debugging easier
talloc.enable_null_tracking()
-class dc_join:
+
+class dc_join(object):
'''perform a DC join'''
def __init__(ctx, server=None, creds=None, lp=None, site=None,
--
Samba Shared Repository
More information about the samba-cvs
mailing list