[SCM] Samba Shared Repository - branch v4-0-test updated
Jelmer Vernooij
jelmer at samba.org
Thu Dec 23 18:08:48 MST 2010
The branch, v4-0-test has been updated
via 0eded28 Release alpha14.
via 1a20d59 mkrelease: Simplify further.
via 599a7df update whatsnew for alpha14.
via c19a90a WHATSNEW: Fix typo, indentation.
via 8b34a2d wafsamba: Fix handling of nick name in VERSION.
via bfb9ae2 talloc: remove autotools support.
via 9e8a049 tdb: Remove autotools support.
via 0f8f216 MAINTAINERS: List rusty and tridge as maintainers for talloc.
via aeb050b MAINTAINERS: add rusty as the tdb maintainer.
via 64d5c05 MAINTAINERS: List tridge and me as maintainers of wafsamba and the wscripts.
via 821b2a9 testprogs: testspoolss.exe: pretty print FILETIME in driver info 6 and 8.
via 37c4ced s4:acl LDB module - "acl_rename" - memory contexts fixup
via e30299e s4:acl LDB module - add a missing "talloc_free(tmp_ctx)" in an error path
via 46ee690 tdb: add ABI/tdb-1.2.8.sigs
via 42b7827 tevent: add ABI/tevent-0.9.10.sigs
via 78d12e5 s4:torture/ndr/spoolss.c - add a "ULL" suffix for a 64 bit unsigned integer literal
via da78e24 lib/replace/testsuite.c - fix test output
via e9dddc5 s3:libsmb: use 16 zero bytes as channel binding checksum in the gssapi checksum (bug #7883)
via 30d29e6 All calls to event_add_to_select_args() call GetTimeOfDay() and pass this in as the &now parameter. Push this call inside of event_add_to_select_args() to the correct point so it doesn't get called unless needed.
via 03b8b8e s3: Remove unused open_any_socket_out
via 5d4ac40 s3: Use smbsock_any_connect in winbind
via d5188fc s3: Retry *SMBSERVER in nb_connect
via 3ae7ef7 s3: Test smbsock_any_connect
via d8e3d0a s3: Add smbsock_any_connect
via 49cd92b s3: Add an async smbsock_connect
via 02a74fd s3: Add async cli_session_request
via 444dcc5 s3: Add some const to name_mangle()
via 87934d8 s3-waf: fix the build.
via d9be7e9 s3:lib/gencache: fix memory leak in error path
via 94e83e3 s3-printing: fix crash bug in print_spool_open().
via d0e1644 s3-spoolss: handle NTTIME(0) as "01/01/1601" REG_SZ in driver dates.
via a204c45 s4-smbtorture: always skip addprinter{ex} level 1 tests for now.
via 9626487 s4-smbtorture: fix expected driver date REG_SZ string.
via 3931d4a s4-smbtorture: check the returned driver date is equal to the one we passed in.
via 2e2cb8d s4-smbtorture: add torture_assert_nttime_equal macro.
via 340d2df s4-smbtorture: interesting, DriverDate and DriverVersion are different in w2k3 and w2k8r2.
via 6857bbc dsdb:ldap.py - transform a test call into the new "msg.add" syntax
via 07bcf61 lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
via 4ef842c ldb:pyldb.c - remove unused variable
via 935b985 s4-tests: Tests for Validated-SPN implementation.
via 3ba42be s4-acl: Implementation of Validated-SPN validated write
via 9aaacee s4-dsdb: Added a helper function to get the default dns domain as string.
via 2c657d8 s3:libsmb/namequery.c: don't leak 'pserver'
via 987b49c dns: fixed dns record format
via 88c3e50 Fix a warning message.
via e8f7c60 My algorithm for determining whan an incoming sequence number can be allowed is incorrect.
via 718c864 heimdal_build: Use consistent name for heimbase.
via 25ee5b1 heimdal_build: When using system hbase/hcrypto, don't compile our own versions.
via 21b918e heimdal_build: Allow using system hbase and hcrypto.
via 2ce6e64 s4-devel/pfm_verify: Move schemaInfo getter into separate function
via e43de85 wafsamba: Allow newer or the same python module versions to be installed, not older.
via 58206fb tevent: Remove reference to nonexistant configure.developer from autogen.sh.
via 4663a6a talloc: Remove reference to nonexistant configure.developer in autogen.sh.
via e8790b9 tevent: Bump version number after symbol versioning changes.
via c754fad tdb: Bump version number after symbol versioning changes.
via 51e7244 pytdb: Make PyTdb variable static.
via 7a47aed s3:cli_np_tstream: if SMBtrans is desired, the readv needs to wait for the last writev chunk.
via 41c3bda ldb: Add ldb.Message.add and ldb.Message.elements.
via 17d6583 ldb:tools/ldbdel.c - "replace.h" should be the first include
via 901f348 s4-dns: set dwSerial and dwFlags
via f2dea30 s4-dns: fixed name comparison in bind9 module
via e7b1aca dns: cope with trailing '.' in dns_name
via 8466027 s4-dns: return the local hostname as the SOA authority
via f9e2a92 s4-provision: removed an incorrect debug message
via da5c328 s4-dns: disable segfault handling in dlz_bind9
via 71d0fd8 s4:auth/session.h - use a forward declaration for type "struct ldb_context"
via 446f8a1 s4-auth Ensure that we always copy across domain groups
via 6f7423c s4-auth Remove duplicate copies of session_info creation code
via 1961d7a s4-auth rework session_info handling not to require an auth context
via 94a59b7 s4-auth Remove event context from privilage database handling
via becaa18 s4-auth Remove obsolete comment
via 912faf1 s4:dsdb/schema/schema_* - adaptions needed for removed "const" on OIDs
via ef618f5 s4:lib/ldb-samba/ldif_handlers.c - adaption needed for removed "const" on OIDs
via 13fa674 s3/s4:auth SPNEGO - adaptions for the removed "const" from OIDs
via 464b8fa librpc/ndr/ndr_*.c - remove "const" from OIDs
via 3b591ca lib/util/asn1.c - remove the "const" specifier from OID
via 32bae10 s4:dsdb/common/util.c - remove unused variable "ndr_err"
via 89522ea s4:auth/gensec/spnego.c - remove unused variable "principal"
via 0a5f4f5 Keep track of the sparse status of an open file handle. Allows bypass of strict allocation on sparse files. Files opened as POSIX opens are always sparse.
via 4820c97 dns: fixed the padding for dnsp_name fields in LDAP
via 049a16c dns: auto-calculate the wDataLength field in DNS records
via 8c04657 s4-dns: fixed a crash bug in dlz_bind9 code
via b9a2852 dnsp: fixed parsing of dns_name structures
via 8998f4b Added call out to a Linux-compatible fallocate() when we need to extend a file allocation extent without changing end-of-file size.
via 09aea03 CREATE in a compound CREATE/NOTIFY sequence was being passed through set_operation_credits() twice (ultimately perhaps because of bug 7331 involving this compound sequence and the need to be ready for any incoming CANCEL of the NOTIFY). This had the server thinking it had granted more credit than it actually had, which lead to zero-credits being granted in interim NOTIFY responses.
via e7707d5 From metze's work on sparse attributes. FILE_ATTRIBUTE_SPARSE is valid on get but not on set.
via 139e2cb s3-printing: fix printer_list_traverse()
via bfc4fe4 s3: Remove unused "retry" from cli_start_connection
via d096de5 s3: Remove unused "retry" from cli_full_connection
via 6601906 s3: Always retry the DC connection in auth_domain
via 09cccee s3: Remove some unused variables
via 9dce43a s4-smbtorture: run the winreg tests also against an added driver.
via 33a57db s4-pydsdb: Use local memory context in py_dsdb_get_oid_from_attid()
via e1d3de3 dnspython: Merge in new upstream.
via 145868d testtools: Merge in new upstream.
via 49dc973 lib: Protect against tevent nterror mismatches
via fd49ed2 s3: "make etags" should not grow TAGS infinitely...
via c6b5136 s3: Fix bug 7066 -- wbcAuthenticateEx gives unix times
via 92e138f s3: Use the right uid winbindd_raw_kerberos_login()
via a881d6a wb_reqtrans is not used in libwbclient
via c0a7c9f Move wbc_async.[ch] to its only user: smbtorture3
via 6bfd745 libwbclient: Put the wb_reqtrans definitions into wb_reqtrans.h
via a159958 s3: wcache_invalidate_samlogon only needs the SID
via e113b1c s3: netsamlogon_clear_cached_user only needs the SID
via ff5f767 s3: Remove two pointless slprintf calls
via d39feda s3: FreeBSD has getpeereid(), use it
via d082701 s3: Reply correctly to FSCTL_IS_VOLUME_DIRTY
via 356add8 s3: Fix some nonempty blank lines
via cf74a48 s3: Did I say this module is from hell?
via 98a2fff s3: re-add some debugs to check_reduced_name
via 43e42b4 s3: Fix some typos
via a4bcabc s3: Document wbinfo -P/--ping-dc
via af4a5f4 s3: Add -P as an alias for --ping-dc
via d60d49e s3: Fix serverid_exists
via 1ca3534 heimdal: Fix build if using system roken.
via fcecca7 ldb: Bump version after renaming some public symbols which didn't have a ldb_ prefix.
via 2f4bd23 dcesrv_srvsvc: Use constants.
from 716ea73 Rename vfs operation posix_fallocate to just fallocate and add the vfs_fallocate_mode parameter.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 0eded28c2371adb356fc6c48185455fd6257c0c5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 24 02:05:33 2010 +0100
Release alpha14.
-----------------------------------------------------------------------
Summary of changes:
MAINTAINERS.txt | 24 +
WHATSNEW.txt | 4 +-
WHATSNEW4.txt | 7 +-
buildtools/wafsamba/samba_bundled.py | 2 +-
buildtools/wafsamba/samba_version.py | 3 +-
docs-xml/manpages-3/vfs_crossrename.8.xml | 2 +-
docs-xml/manpages-3/wbinfo.1.xml | 10 +
lib/dnspython/ChangeLog | 12 +
lib/dnspython/dns/message.py | 2 +-
lib/dnspython/dns/rdata.py | 4 +
lib/dnspython/dns/resolver.py | 8 +
lib/dnspython/dns/version.py | 2 +-
lib/dnspython/setup.py | 2 +-
lib/replace/test/testsuite.c | 2 +-
lib/talloc/Makefile.in | 62 -
lib/talloc/aclocal.m4 | 1 -
lib/talloc/autogen-autotools.sh | 14 -
lib/talloc/autogen-waf.sh | 11 -
lib/talloc/autogen.sh | 12 +-
lib/talloc/build_macros.m4 | 14 -
lib/talloc/config.guess | 1561 ------------------
lib/talloc/config.sub | 1686 --------------------
lib/talloc/configure.ac | 49 -
lib/talloc/install-sh | 238 ---
lib/talloc/rules.mk | 18 -
lib/talloc/talloc.exports | 68 -
lib/talloc/talloc.mk | 52 -
lib/tdb/ABI/{tdb-1.2.5.sigs => tdb-1.2.8.sigs} | 0
lib/{talloc => tdb}/Makefile | 0
lib/tdb/Makefile.in | 80 -
lib/tdb/aclocal.m4 | 1 -
lib/tdb/autogen-autotools.sh | 14 -
lib/tdb/autogen-waf.sh | 1 -
lib/tdb/autogen.sh | 12 +-
lib/tdb/build_macros.m4 | 14 -
lib/tdb/config.guess | 1561 ------------------
lib/tdb/config.sub | 1686 --------------------
lib/{replace => tdb}/configure | 0
lib/tdb/configure.ac | 51 -
lib/tdb/install-sh | 238 ---
lib/tdb/pytdb.c | 6 +-
lib/tdb/python.mk | 6 -
lib/tdb/rules.mk | 16 -
lib/tdb/tdb.exports | 65 -
lib/tdb/tdb.mk | 109 --
lib/tdb/wscript | 2 +-
lib/testtools/HACKING | 3 +-
lib/testtools/NEWS | 38 +-
lib/testtools/testtools/__init__.py | 2 +-
lib/testtools/testtools/_spinner.py | 1 -
lib/testtools/testtools/compat.py | 28 +
lib/testtools/testtools/matchers.py | 36 +-
lib/testtools/testtools/run.py | 2 +
lib/testtools/testtools/testcase.py | 9 +-
lib/testtools/testtools/testresult/real.py | 26 +-
lib/testtools/testtools/tests/test_matchers.py | 21 +-
lib/testtools/testtools/tests/test_run.py | 9 +-
lib/testtools/testtools/tests/test_spinner.py | 9 +-
lib/testtools/testtools/tests/test_testresult.py | 16 +-
lib/testtools/testtools/tests/test_testtools.py | 4 +
.../ABI/{tevent-0.9.9.sigs => tevent-0.9.10.sigs} | 0
lib/tevent/autogen-waf.sh | 2 +-
lib/tevent/wscript | 2 +-
lib/torture/torture.h | 8 +-
lib/util/asn1.c | 17 +-
lib/util/asn1.h | 6 +-
lib/util/fault.c | 14 +-
lib/util/tests/asn1_tests.c | 4 +-
lib/util/tevent_ntstatus.c | 26 +-
lib/util/time.c | 9 +-
lib/util/util.h | 1 +
libcli/auth/spnego_parse.c | 8 +-
libgpo/gpo_fetch.c | 2 +-
librpc/idl/dnsp.idl | 36 +-
librpc/ndr/ndr_dnsp.c | 29 +-
librpc/ndr/ndr_drsblobs.c | 2 +-
librpc/ndr/ndr_drsuapi.c | 2 +-
nsswitch/libwbclient/wb_reqtrans.c | 446 ------
nsswitch/libwbclient/wbc_async.c | 774 ---------
nsswitch/libwbclient/wbc_async.h | 200 ---
nsswitch/wbinfo.c | 5 +-
script/autobuild.py | 6 +-
source3/Makefile.in | 9 +-
source3/auth/auth_domain.c | 12 +-
source3/auth/server_info.c | 8 +-
source3/client/smbspool.c | 2 +-
source3/configure.in | 47 +
source3/include/async_smb.h | 7 +
source3/include/event.h | 1 -
source3/include/local.h | 1 +
source3/include/ntioctl.h | 1 +
source3/include/proto.h | 35 +-
source3/include/smb.h | 4 +-
source3/lib/events.c | 11 +-
source3/lib/gencache.c | 3 +
source3/lib/serverid.c | 4 +
source3/lib/system.c | 39 +
source3/lib/util_sock.c | 167 +--
source3/lib/wb_reqtrans.c | 446 ++++++
source3/lib/wb_reqtrans.h | 61 +
source3/libnet/libnet_join.c | 6 +-
source3/libsmb/async_smb.c | 127 ++
source3/libsmb/cli_np_tstream.c | 93 +-
source3/libsmb/cliconnect.c | 19 +-
source3/libsmb/clikrb5.c | 30 +-
source3/libsmb/clispnego.c | 4 +-
source3/libsmb/libsmb_server.c | 2 +-
source3/libsmb/namequery.c | 4 +-
source3/libsmb/nmblib.c | 2 +-
source3/libsmb/samlogon_cache.c | 16 +-
source3/libsmb/smbsock_connect.c | 573 +++++++
source3/libsmb/trusts_util.c | 5 +-
source3/modules/vfs_default.c | 7 +-
source3/modules/vfs_shadow_copy2.c | 2 +-
source3/nmbd/nmbd_packets.c | 7 +-
source3/printing/printer_list.c | 2 +-
source3/printing/printspoolss.c | 4 +-
source3/rpc_server/srv_spoolss_nt.c | 2 +-
source3/rpc_server/srv_spoolss_util.c | 17 +-
source3/rpcclient/cmd_spoolss.c | 2 +-
source3/rpcclient/rpcclient.c | 3 +-
source3/smbd/dosmode.c | 5 +-
source3/smbd/fileio.c | 3 +-
source3/smbd/filename.c | 6 +-
source3/smbd/negprot.c | 44 +-
source3/smbd/nttrans.c | 9 +
source3/smbd/open.c | 9 +
source3/smbd/process.c | 9 +-
source3/smbd/smb2_server.c | 47 +-
source3/smbd/vfs.c | 17 +-
source3/torture/locktest2.c | 2 +-
source3/torture/proto.h | 1 +
source3/torture/test_smbsock_any_connect.c | 46 +
source3/torture/torture.c | 11 +-
source3/torture/wbc_async.c | 774 +++++++++
source3/torture/wbc_async.h | 171 ++
source3/utils/net_ads.c | 5 +-
source3/utils/net_util.c | 6 +-
source3/utils/netlookup.c | 3 +-
source3/utils/smbcacls.c | 3 +-
source3/utils/smbcquotas.c | 3 +-
source3/winbindd/idmap_hash/idmap_hash.c | 2 +-
source3/winbindd/winbindd.c | 2 +-
source3/winbindd/winbindd_cache.c | 11 +-
source3/winbindd/winbindd_cm.c | 58 +-
source3/winbindd/winbindd_dual.c | 7 +-
source3/winbindd/winbindd_pam.c | 16 +-
source3/winbindd/winbindd_proto.h | 2 +-
source3/wscript_build | 9 +-
source4/VERSION | 4 +-
source4/auth/auth.h | 5 +-
source4/auth/gensec/gensec.c | 16 +-
source4/auth/gensec/spnego.c | 1 -
source4/auth/ntlm/auth.c | 15 +-
source4/auth/session.c | 47 +-
source4/auth/session.h | 9 +-
source4/auth/system_session.c | 156 +--
source4/dns_server/dlz_bind9.c | 64 +-
source4/dsdb/common/util.c | 20 +-
source4/dsdb/pydsdb.c | 20 +-
source4/dsdb/samdb/ldb_modules/acl.c | 240 +++-
source4/dsdb/samdb/ldb_modules/operational.c | 2 +-
source4/dsdb/samdb/samdb.c | 28 +-
source4/dsdb/samdb/samdb_privilege.c | 8 +-
source4/dsdb/schema/schema_prefixmap.c | 5 +-
source4/dsdb/schema/schema_syntax.c | 2 +-
source4/dsdb/tests/python/acl.py | 288 ++++-
source4/dsdb/tests/python/ldap.py | 13 +-
source4/heimdal_build/wscript_build | 43 +-
source4/heimdal_build/wscript_configure | 3 +
source4/lib/ldb-samba/ldif_handlers.c | 2 +-
source4/lib/ldb/ABI/ldb-0.9.22.sigs | 245 +++
source4/lib/ldb/pyldb.c | 104 +-
source4/lib/ldb/tests/python/api.py | 18 +-
source4/lib/ldb/tools/ldbdel.c | 2 +-
source4/lib/ldb/wscript | 2 +-
source4/libnet/libnet_samsync_ldb.c | 3 +-
source4/param/provision.c | 2 -
source4/rpc_server/lsa/lsa_init.c | 2 +-
source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 6 +-
source4/samba_tool/gpo.c | 11 +-
source4/script/mkrelease.sh | 8 +-
source4/scripting/devel/pfm_verify.py | 16 +-
source4/smbd/server.c | 2 +-
source4/torture/drs/drs_util.c | 5 +-
source4/torture/ndr/spoolss.c | 2 +-
source4/torture/rpc/spoolss.c | 65 +-
testprogs/win32/spoolss/printlib.c | 102 ++-
testprogs/win32/spoolss/printlib_proto.h | 2 +
189 files changed, 4245 insertions(+), 9944 deletions(-)
delete mode 100644 lib/talloc/Makefile.in
delete mode 100644 lib/talloc/aclocal.m4
delete mode 100755 lib/talloc/autogen-autotools.sh
delete mode 100755 lib/talloc/autogen-waf.sh
mode change 120000 => 100755 lib/talloc/autogen.sh
delete mode 100644 lib/talloc/build_macros.m4
delete mode 100755 lib/talloc/config.guess
delete mode 100755 lib/talloc/config.sub
delete mode 100644 lib/talloc/configure.ac
delete mode 100755 lib/talloc/install-sh
delete mode 100644 lib/talloc/rules.mk
delete mode 100644 lib/talloc/talloc.exports
delete mode 100644 lib/talloc/talloc.mk
copy lib/tdb/ABI/{tdb-1.2.5.sigs => tdb-1.2.8.sigs} (100%)
copy lib/{talloc => tdb}/Makefile (100%)
delete mode 100644 lib/tdb/Makefile.in
delete mode 100644 lib/tdb/aclocal.m4
delete mode 100755 lib/tdb/autogen-autotools.sh
delete mode 120000 lib/tdb/autogen-waf.sh
mode change 120000 => 100755 lib/tdb/autogen.sh
delete mode 100644 lib/tdb/build_macros.m4
delete mode 100755 lib/tdb/config.guess
delete mode 100755 lib/tdb/config.sub
copy lib/{replace => tdb}/configure (100%)
delete mode 100644 lib/tdb/configure.ac
delete mode 100755 lib/tdb/install-sh
delete mode 100644 lib/tdb/python.mk
delete mode 100644 lib/tdb/rules.mk
delete mode 100644 lib/tdb/tdb.exports
delete mode 100644 lib/tdb/tdb.mk
copy lib/tevent/ABI/{tevent-0.9.9.sigs => tevent-0.9.10.sigs} (100%)
delete mode 100644 nsswitch/libwbclient/wb_reqtrans.c
delete mode 100644 nsswitch/libwbclient/wbc_async.c
delete mode 100644 nsswitch/libwbclient/wbc_async.h
create mode 100644 source3/lib/wb_reqtrans.c
create mode 100644 source3/lib/wb_reqtrans.h
create mode 100644 source3/libsmb/smbsock_connect.c
create mode 100644 source3/torture/test_smbsock_any_connect.c
create mode 100644 source3/torture/wbc_async.c
create mode 100644 source3/torture/wbc_async.h
create mode 100644 source4/lib/ldb/ABI/ldb-0.9.22.sigs
Changeset truncated at 500 lines:
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 88787b1..466ae54 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -37,6 +37,30 @@ policy:
Larger changes need also discussion on the samba-technical list
and review by all maintainers.
+files: buildtools/**, source4/**/wscript
+maintainers:
+ Andrew Tridgell <tridge at samba.org>
+ Jelmer Vernooij <jelmer at samba.org>
+policy:
+ small commits to master allowed if all existing tests
+ pass. Larger commits require discussion on the samba-technical
+ list and review by the maintainer
+
+files: lib/tdb
+maintainers:
+ Rusty Russell <rusty at samba.org>
+policy:
+ Mail/CC changes to the maintainer, commit the changes
+ unless the maintainer objects.
+
+files: lib/talloc
+maintainers:
+ Andrew Tridgell <tridge at samba.org>
+ Rusty Russell <rusty at samba.org>
+policy:
+ small commits to master allowed if all existing tests
+ pass. Larger commits require discussion on samba-technical
+ list and review by the maintainer
files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py*
maintainers:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5668564..63f35e4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=================================
Release Notes for Samba 3.6.0pre1
- July 28, 2010
+ July 28, 2010
=================================
@@ -16,7 +16,7 @@ Major enhancements in Samba 3.6.0 include:
SMB2 support
------------
-SMB2 support in 3.6.0 is fully functional (with one ommission),
+SMB2 support in 3.6.0 is fully functional (with one omission),
and can be enabled by setting:
max protocol = SMB2
diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index 1741221..6758715 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -78,6 +78,8 @@ Although still in development, samba4 is already used in a couple of production
and such kind of use case is intensifying. This script is intendended for administrators
to allow them to make a periodic backup of the provision in case of problem.
+* the 'net' command has been renamed to 'samba-tool'
+
CHANGES
=======
@@ -114,8 +116,9 @@ KNOWN ISSUES
RUNNING Samba4
==============
-A short guide to setting up Samba 4 can be found in the howto.txt file
-in root of the tarball.
+A short guide to setting up Samba 4 can be found on the wiki:
+
+ http://wiki.samba.org/index.php/Samba4/HOWTO
DEVELOPMENT and FEEDBACK
========================
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 324721f..9e02ca4 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -172,7 +172,7 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
except AttributeError:
found = False
else:
- found = tuple(minversion.split(".")) >= tuple(version.split("."))
+ found = tuple(version.split(".")) >= tuple(minversion.split("."))
if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion))
sys.exit(1)
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 5804afb..8d1bd32 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -167,8 +167,7 @@ also accepted as dictionary entries here
self.STRING = SAMBA_VERSION_STRING
if self.RELEASE_NICKNAME is not None:
- self.STRING_WITH_NICKNAME += (" (" + self.RELEASE_NICKNAME + ")")
- self.RELEASE_NICKNAME = self.RELEASE_NICKNAME
+ self.STRING_WITH_NICKNAME = "%s (%s)" % (self.STRING, self.RELEASE_NICKNAME)
else:
self.STRING_WITH_NICKNAME = self.STRING
diff --git a/docs-xml/manpages-3/vfs_crossrename.8.xml b/docs-xml/manpages-3/vfs_crossrename.8.xml
index f5a4444..ba7c7c8 100644
--- a/docs-xml/manpages-3/vfs_crossrename.8.xml
+++ b/docs-xml/manpages-3/vfs_crossrename.8.xml
@@ -31,7 +31,7 @@
<para>The <command>vfs_crossrename</command> VFS module allows
server side rename operations even if source and target are on
- differen physical devices. A "move" in Explorer is usually a
+ different physical devices. A "move" in Explorer is usually a
rename operation if it is inside of a single share or device.
Usually such a rename operation returns
NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index 720715c..f708508 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -39,6 +39,7 @@
<arg choice="opt">-N netbios-name</arg>
<arg choice="opt">--own-domain</arg>
<arg choice="opt">-p</arg>
+ <arg choice="opt">-P</arg>
<arg choice="opt">-r user</arg>
<arg choice="opt">--remove-uid-mapping uid,sid</arg>
<arg choice="opt">--remove-gid-mapping gid,sid</arg>
@@ -239,6 +240,15 @@
</varlistentry>
<varlistentry>
+ <term>-P|--ping-dc</term>
+ <listitem><para>Issue a no-effect command to our DC. This
+ checks if our secure channel connection to our domain
+ controller is still alive. It has much less impact than
+ wbinfo -t.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-r|--user-groups <replaceable>username</replaceable></term>
<listitem><para>Try to obtain the list of UNIX group ids
to which the user belongs. This only works for users
diff --git a/lib/dnspython/ChangeLog b/lib/dnspython/ChangeLog
index 91e69d3..0fff77f 100644
--- a/lib/dnspython/ChangeLog
+++ b/lib/dnspython/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17 Bob Halley <halley at dnspython.org>
+
+ * dns/message.py (_WireReader._get_section): use "is" and not "=="
+ when testing what section an RR is in. Thanks to James Raftery
+ for reporting this bug.
+
+2010-12-10 Bob Halley <halley at dnspython.org>
+
+ * dns/resolver.py (Resolver.query): disallow metaqueries.
+
+ * dns/rdata.py (Rdata.__hash__): Added a __hash__ method for rdata.
+
2010-11-23 Bob Halley <halley at dnspython.org>
* (Version 1.9.2 released)
diff --git a/lib/dnspython/dns/message.py b/lib/dnspython/dns/message.py
index 5ec711e..a124a3e 100644
--- a/lib/dnspython/dns/message.py
+++ b/lib/dnspython/dns/message.py
@@ -686,7 +686,7 @@ class _WireReader(object):
deleting = None
if deleting == dns.rdataclass.ANY or \
(deleting == dns.rdataclass.NONE and \
- section == self.message.answer):
+ section is self.message.answer):
covers = dns.rdatatype.NONE
rd = None
else:
diff --git a/lib/dnspython/dns/rdata.py b/lib/dnspython/dns/rdata.py
index ce02686..399677e 100644
--- a/lib/dnspython/dns/rdata.py
+++ b/lib/dnspython/dns/rdata.py
@@ -28,6 +28,7 @@ chunk of hexstring that _hexify() produces before whitespace occurs.
import cStringIO
import dns.exception
+import dns.name
import dns.rdataclass
import dns.rdatatype
import dns.tokenizer
@@ -252,6 +253,9 @@ class Rdata(object):
return NotImplemented
return self._cmp(other) > 0
+ def __hash__(self):
+ return hash(self.to_digestable(dns.name.root))
+
def from_text(cls, rdclass, rdtype, tok, origin = None, relativize = True):
"""Build an rdata object from text format.
diff --git a/lib/dnspython/dns/resolver.py b/lib/dnspython/dns/resolver.py
index f803eb6..30977f3 100644
--- a/lib/dnspython/dns/resolver.py
+++ b/lib/dnspython/dns/resolver.py
@@ -61,6 +61,10 @@ class NoRootSOA(dns.exception.DNSException):
This should never happen!"""
pass
+class NoMetaqueries(dns.exception.DNSException):
+ """Metaqueries are not allowed."""
+ pass
+
class Answer(object):
"""DNS stub resolver answer
@@ -571,8 +575,12 @@ class Resolver(object):
qname = dns.name.from_text(qname, None)
if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
+ if dns.rdatatype.is_metatype(rdtype):
+ raise NoMetaqueries
if isinstance(rdclass, (str, unicode)):
rdclass = dns.rdataclass.from_text(rdclass)
+ if dns.rdataclass.is_metaclass(rdclass):
+ raise NoMetaqueries
qnames_to_try = []
if qname.is_absolute():
qnames_to_try.append(qname)
diff --git a/lib/dnspython/dns/version.py b/lib/dnspython/dns/version.py
index fe0e324..46799a7 100644
--- a/lib/dnspython/dns/version.py
+++ b/lib/dnspython/dns/version.py
@@ -17,7 +17,7 @@
MAJOR = 1
MINOR = 9
-MICRO = 2
+MICRO = 3
RELEASELEVEL = 0x0f
SERIAL = 0
diff --git a/lib/dnspython/setup.py b/lib/dnspython/setup.py
index 59bd0eb..f84711f 100755
--- a/lib/dnspython/setup.py
+++ b/lib/dnspython/setup.py
@@ -18,7 +18,7 @@
import sys
from distutils.core import setup
-version = '1.9.2'
+version = '1.9.3'
kwargs = {
'name' : 'dnspython',
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 1f242eb..0e455f2 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -771,7 +771,7 @@ static int test_FUNCTION(void)
{
printf("test: FUNCTION\n");
if (strcmp(__FUNCTION__, "test_FUNCTION") != 0) {
- printf("failure: FAILURE [\nFAILURE invalid\n]\n");
+ printf("failure: FUNCTION [\nFUNCTION invalid\n]\n");
return false;
}
printf("success: FUNCTION\n");
diff --git a/lib/talloc/Makefile.in b/lib/talloc/Makefile.in
deleted file mode 100644
index 94f031a..0000000
--- a/lib/talloc/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!gmake
-#
-prefix = @prefix@
-datarootdir = @datarootdir@
-exec_prefix = @exec_prefix@
-includedir = @includedir@
-libdir = @libdir@
-mandir = @mandir@
-VPATH = @srcdir@:@libreplacedir@
-srcdir = @srcdir@
-builddir = @builddir@
-sharedbuilddir = @sharedbuilddir@
-XSLTPROC = @XSLTPROC@
-INSTALLCMD = @INSTALL@
-CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
-EXTRA_TARGETS = @DOC_TARGET@
-PICFLAG = @PICFLAG@
-TALLOC_VERSION = @TALLOC_VERSION@
-TALLOC_VERSION_MAJOR = @TALLOC_VERSION_MAJOR@
-TALLOC_VERSION_MINOR = @TALLOC_VERSION_MINOR@
-TALLOC_VERSION_RELEASE = @TALLOC_VERSION_RELEASE@
-SHLIBEXT = @SHLIBEXT@
-SHLD = @SHLD@
-SHLD_FLAGS = @SHLD_FLAGS@
-tallocdir = @tallocdir@
-
-LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
-
-SONAMEFLAG = @SONAMEFLAG@
-VERSIONSCRIPT = @VERSIONSCRIPT@
-EXPORTSFILE = @EXPORTSFILE@
-
-all:: showflags $(EXTRA_TARGETS)
-
-include $(tallocdir)/rules.mk
-include $(tallocdir)/talloc.mk
-
- at TALLOC_COMPAT1_MK@
-
-$(TALLOC_SOLIB): $(LIBOBJ)
- $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TALLOC_SONAME)
-
-shared-build: all
- ${INSTALLCMD} -d $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 644 libtalloc.a $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(sharedbuilddir)/lib
- ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/$(TALLOC_SONAME)
- ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/libtalloc.so
- ${INSTALLCMD} -d $(sharedbuilddir)/include
- ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(sharedbuilddir)/include
-
-check: test
-
-installcheck:: test install
-
-distclean:: clean
- rm -f Makefile
- rm -f config.log config.status config.h config.cache
-
-realdistclean:: distclean
- rm -f configure config.h.in
diff --git a/lib/talloc/aclocal.m4 b/lib/talloc/aclocal.m4
deleted file mode 100644
index 5605e47..0000000
--- a/lib/talloc/aclocal.m4
+++ /dev/null
@@ -1 +0,0 @@
-m4_include(libreplace.m4)
diff --git a/lib/talloc/autogen-autotools.sh b/lib/talloc/autogen-autotools.sh
deleted file mode 100755
index bf84eee..0000000
--- a/lib/talloc/autogen-autotools.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-autoconf $IPATHS || exit 1
-autoheader $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh
deleted file mode 100755
index ee95847..0000000
--- a/lib/talloc/autogen-waf.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-p=`dirname $0`
-
-echo "Setting up for waf build"
-
-echo "done. Now run $p/configure or $p/configure.developer then make."
-if [ $p != "." ]; then
- echo "Notice: The build invoke path is not the main directory! Use make with the parameter"
- echo "-C $p. Example: make -C $p all"
-fi
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
deleted file mode 120000
index a229cc9..0000000
--- a/lib/talloc/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen-waf.sh
\ No newline at end of file
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
new file mode 100755
index 0000000..3005239
--- /dev/null
+++ b/lib/talloc/autogen.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+p=`dirname $0`
+
+echo "Setting up for waf build"
+
+echo "done. Now run $p/configure then make."
+if [ $p != "." ]; then
+ echo "Notice: The build invoke path is not the main directory! Use make with the parameter"
+ echo "-C $p. Example: make -C $p all"
+fi
diff --git a/lib/talloc/build_macros.m4 b/lib/talloc/build_macros.m4
deleted file mode 100644
index c036668..0000000
--- a/lib/talloc/build_macros.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR,
- [ AC_ARG_WITH([shared-build-dir],
- [AC_HELP_STRING([--with-shared-build-dir=DIR],
- [temporary build directory where libraries are installed [$srcdir/sharedbuild]])])
-
- sharedbuilddir="$srcdir/sharedbuild"
- if test x"$with_shared_build_dir" != x; then
- sharedbuilddir=$with_shared_build_dir
- CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
- LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
- fi
- AC_SUBST(sharedbuilddir)
- ])
-
diff --git a/lib/talloc/config.guess b/lib/talloc/config.guess
deleted file mode 100755
index da83314..0000000
--- a/lib/talloc/config.guess
+++ /dev/null
@@ -1,1561 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2009-04-27'
-
-# This file 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
--
Samba Shared Repository
More information about the samba-cvs
mailing list