[SCM] Samba Shared Repository - branch v4-4-test updated
Karolin Seeger
kseeger at samba.org
Fri Mar 4 13:56:06 UTC 2016
The branch, v4-4-test has been updated
via 2212643 selftest: Add a blackbox test for smbget
via eb40cac selftest: add a helper for the smbget binary
via 83b29fb selftest: Reduce code duplication
via 7ebf660 s3:utils/smbget fix option parsing
via 789c77e WHATSNEW: document removal of -P in smbget
via a51b9a4 s3:utils/smbget update manpage with -P option removal
via 7ea0312 s3:utils/smbget remove -P option
via 5298c36 s3:utils/smbget improve check of write() result
via b24f898 s3:utils/smbget abort recursive download on error
via ac81bbc s3:utils/smbget another int -> bool conversion
via 52033ae samba3.blackbox.smbclient.forceuser_validusers: Add new test for force user option.
via e787720 passdb: add linefeed to debug message
via 1372a32 smbd: ignore SVHDX create context
via 2335e6f winbindd: return trust parameters when listing trusts
via 46c1289 winbindd: initialize foreign domain as AD based on trust
via f9aef97 winbindd: introduce add_trusted_domain_from_tdc()
via 9004fa4 access based share enum: handle permission set in configuration files
via bf4b42c tevent: version 0.9.28
via c5b55c8 lib: tevent: Fix memory leak reported by Pavel Březina <pbrezina at redhat.com> when old signal action restored.
via 77c1e14 tevent: version 0.9.27
via 30d815a Fix ETIME handling for Solaris event ports.
via 30e85f4 ldb: remove outdated comment about type argument in dlist
via 96e0a11 tevent: remove outdated comment about type argument in dlist
via 745e81e dlist: remove outdated comment about type argument
via f20e5b3 dlist: remove unneeded type argument from DLIST_CONCATENATE()
via ac36022 tevent: remove unneeded type argument from DLIST_CONCATENATE()
via 95d89dd ldb: remove unneeded argument type from DLIST_CONCATENATE()
via 9d32594 tevent: remove uneeded type argument from DLIST_DEMOTE()
via 1a7ceca ldb: remove uneeded type argument from DLIST_DEMOTE()
via c373524 dlist: remove unneeded argument from DLIST_DEMOTE()
via 9e06f33 ldb: remove unneeded type arg from DLIST_ADD_END
via 2081969 tevent: remove unneeded type argument from DLIST_ADD_END
via c4536f8 dlist: remove unneeded type argument from DLIST_ADD_END()
via c17b1f6 s3:clispnego: fix confusing warning in spnego_gen_krb5_wrap()
from 6342580 s3:libads: setup the msDS-SupportedEncryptionTypes attribute on ldap_add
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 22126435d33129d425f9d98ac49b372a3ca17206
Author: Christian Ambach <ambi at samba.org>
Date: Sat Feb 6 10:30:29 2016 +0100
selftest: Add a blackbox test for smbget
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Christian Ambach <ambi at samba.org>
Autobuild-Date(master): Fri Feb 26 14:40:55 CET 2016 on sn-devel-144
(cherry picked from commit 39081afbe5f79192f6b42aa5670ebb757c98e875)
The last 11 patches address
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11767
removal of smbget -P option
Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-4-test): Fri Mar 4 14:55:10 CET 2016 on sn-devel-144
commit eb40cac8f3334fd225bf206eb7c88da85d2f638a
Author: Christian Ambach <ambi at samba.org>
Date: Thu Feb 4 21:41:08 2016 +0100
selftest: add a helper for the smbget binary
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 6ceba4def6641c94c794bb62b4c470c0ac60b83a)
commit 83b29fb2b2f10a027ff2b24d7f468376e7457fbb
Author: Christian Ambach <ambi at samba.org>
Date: Thu Feb 18 00:48:04 2016 +0100
selftest: Reduce code duplication
Factor out a createuser sub.
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 2588cf37c05d0247bb7a9ac9572b0ccf11c63ec0)
commit 7ebf6603f565a971b50a6e29ee16c9322b9a44b1
Author: Christian Ambach <ambi at samba.org>
Date: Sat Feb 20 21:11:51 2016 +0100
s3:utils/smbget fix option parsing
* use proper values for val in poptOption
* popt does not support bool, so set them via the switch statement
* abort when option parsing reported errors
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit fcb56e0e1150f995823aff7dbcb0c09b87a39f6d)
commit 789c77efd32a33d07921fccc20e0aae1400589de
Author: Christian Ambach <ambi at samba.org>
Date: Wed Feb 17 22:57:59 2016 +0100
WHATSNEW: document removal of -P in smbget
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit dc0bd62a236e9d58370fb6d2be668f6a75f2998a)
commit a51b9a4b65f8e71cfa5ce1f67902b6fa7ea63733
Author: Christian Ambach <ambi at samba.org>
Date: Wed Feb 17 19:25:59 2016 +0100
s3:utils/smbget update manpage with -P option removal
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 301c69816c87c92184155a59814fd2d6652ea76e)
commit 7ea03124cb6059f9d5dbf95b3d29043dd4db5b72
Author: Christian Ambach <ambi at samba.org>
Date: Mon Feb 15 22:25:11 2016 +0100
s3:utils/smbget remove -P option
as agreed on samba-technical list.
It does not really provide a useful function but can cause confusion
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit dfc35044d81d413b03d5bf2b33c07c82a244ff57)
commit 5298c3624cb4e6a2ccb6781929f3bf33a2be2363
Author: Christian Ambach <ambi at samba.org>
Date: Mon Feb 8 23:27:09 2016 +0100
s3:utils/smbget improve check of write() result
check that all bytes in the buffer have been written
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 113f8dd3d9e0d04b03b61f415b3c410ba75260f5)
commit b24f89890fbbbbad82b55bc813cd7e8ad0f61394
Author: Christian Ambach <ambi at samba.org>
Date: Mon Feb 8 23:25:04 2016 +0100
s3:utils/smbget abort recursive download on error
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 01ba35dca2f721fa5b3c31da7fa991e7d1479cc7)
commit ac81bbc1300bf056ea5e98fee3f416d91a69deba
Author: Christian Ambach <ambi at samba.org>
Date: Mon Feb 8 23:24:36 2016 +0100
s3:utils/smbget another int -> bool conversion
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit c91dde9caec39ac76d50602f8b32b6917dfeefba)
commit 52033ae75f8ace7dd3411aac2d76a099ba15c8b8
Author: Robin Hack <rhack at redhat.com>
Date: Fri Dec 4 14:50:56 2015 +0100
samba3.blackbox.smbclient.forceuser_validusers: Add new test for force user option.
Test covers commit
cf0934caf282f4ade8c8a701b0e40b68a2f17ace
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9878
RH BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1077651
How to test:
$ make -j test TESTS="samba3.blackbox.smbclient.forceuser_validusers"
RESULD: Should PASS
$ git revert cf0934caf282f4ade8c8a701b0e40b68a2f17ace
$ make -j test TESTS="samba3.blackbox.smbclient.forceuser_validusers"
RESULT: Should FAIL
Signed-off-by: Robin Hack <rhack at redhat.com>
Reviewed-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Uri Simchoni <uri at samba.org>
Autobuild-Date(master): Thu Feb 4 03:44:42 CET 2016 on sn-devel-144
(cherry picked from commit e2699685cad6fc341079ac4a677df8d6be26e9d9)
commit e787720dce5ca8c05938b5c124522d9d3735a093
Author: Uri Simchoni <uri at samba.org>
Date: Tue Mar 1 10:36:35 2016 +0200
passdb: add linefeed to debug message
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11763
Signed-off-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Tue Mar 1 15:24:35 CET 2016 on sn-devel-144
(cherry picked from commit fb4778f4e9834af556bd5aac177fc04e7f09f152)
commit 1372a327000064d7383eeb58549fc1bc8fb445b1
Author: Uri Simchoni <uri at samba.org>
Date: Thu Feb 25 07:08:06 2016 +0200
smbd: ignore SVHDX create context
According to discussions with dochelp at microsoft.com, an SMB
server should ignore an SVHDX_OPEN_DEVICE_CONTEXT or
SVHDX_OPEN_DEVICE_CONTEXT_V2 create context if it does not
support the RSVD protocol. This is contrary to [MS-SMB2] rev 48.0
which states (3.3.5.9.14) that the open should fail in this case.
Failing the create fails Windows backup if the SMB dialect is
SMB3.0.2 or higher.
Hopefully a new revision of MS-SMB2 will clear this up in the future.
Meanwhile, this patch modifies smbd to ignore the
SVHDX_OPEN_DEVICE_CONTEXT by default. This can be overriden by a VFS
module if a VFS module adds support for RSVD.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11753
Signed-off-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe at gmail.com>
(cherry picked from commit c11ad90a240a7703e04d290f78c15839ba31d733)
commit 2335e6fa8f2fbd592ccbf50456e1c4cc1f97df39
Author: Uri Simchoni <uri at samba.org>
Date: Wed Feb 10 00:38:11 2016 +0200
winbindd: return trust parameters when listing trusts
When asking a child domain process to list trusts on that domain,
return (along with trust domain names and SID) the trust properties -
flags, type, and attributes.
Use those attributes to initialize domain object.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11691
Signed-off-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Tue Feb 23 22:02:16 CET 2016 on sn-devel-144
(cherry picked from commit 7b4dfd939f417c7d8c4c2c1e8c77f4af9bcd28d7)
commit 46c12895fbeda6f9229d69e874e92a7246d04fe3
Author: Uri Simchoni <uri at samba.org>
Date: Wed Feb 10 00:32:23 2016 +0200
winbindd: initialize foreign domain as AD based on trust
Based on trust parameters, initialize the active_directory
member of domain object to true.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11691
Signed-off-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit d0aa5d057497022aeefffa9882d3ac2b7e18a682)
commit f9aef9705301b7e41931c3e22a5259f8a120e44d
Author: Uri Simchoni <uri at samba.org>
Date: Wed Feb 10 00:26:45 2016 +0200
winbindd: introduce add_trusted_domain_from_tdc()
This is purely a refactoring patch -
Add a routine that adds a winbindd domain object based on
domain trust cache entry. add_trusted_domain() becomes
a wrapper for this new routine.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11691
Signed-off-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit c65841a3bd737b61251603a916a315043703c832)
commit 9004fa428c848a8735fa12d0e47803dfe7c504c2
Author: Alberto Maria Fiaschi <alberto.fiaschi at estar.toscana.it>
Date: Tue Feb 23 18:22:10 2016 +0100
access based share enum: handle permission set in configuration files
change function is_enumeration_allowed to check permissions set by
fields: valid users, invalid users, only user.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=8093
Signed-off-by: Alberto Maria Fiaschi <alberto.fiaschi at estar.toscana.it>
Reviewed-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 5036a0922b7890005bcc8b77368a6635c8ebeb4b)
commit bf4b42c101383f9010a01554e15764feb5c5af5e
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Feb 19 11:46:03 2016 +0100
tevent: version 0.9.28
* Fix memory leak when old signal action restored (bug #11742)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Feb 19 19:12:25 CET 2016 on sn-devel-144
(cherry picked from commit da74d0c317be9ce67eb5d00d232167d466f68a1e)
commit c5b55c8bf9c6222bdca5661411f22a8a623ce761
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 16 14:23:53 2016 -0800
lib: tevent: Fix memory leak reported by Pavel Březina <pbrezina at redhat.com> when old signal action restored.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11742
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Feb 18 01:42:50 CET 2016 on sn-devel-144
(cherry picked from commit 833a2f474367624dd9980abb28227850e95fe976)
commit 77c1e14d6375cb41857375f70822544f8d43369f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 15 11:40:34 2016 +0100
tevent: version 0.9.27
* Fix bug in poll backend - poll_event_loop_poll()
exits the for loop on POLLNVAL instead of
continuing to find an event that is ready.
* Fix ETIME handling for Solaris event ports (bug #11728).
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Tue Feb 16 00:00:51 CET 2016 on sn-devel-144
(cherry picked from commit 2267faddfa9863b205dfad580fbd45182916cb32)
commit 30d815ad4cb10164e5473201dc5a3c689bc6f27b
Author: Nathan Huff <nhuff at acm.org>
Date: Fri Feb 5 13:35:07 2016 -0700
Fix ETIME handling for Solaris event ports.
It is possible for port_getn to return -1 with errno set to ETIME and
still return events. If those events aren't processed the association is
lost by samba since the kernel dissacociated them and samba never
processed them so never reassociated them with the event port. The
patch checks the nget return value in the case of ETIME and if it is non
0 it doesn't return and goes through the event processing loop.
Signed-off-by: Nathan Huff <nhuff at acm.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Sun Feb 7 11:26:35 CET 2016 on sn-devel-144
(cherry picked from commit 4953b1f73f8ec9387516be1058434d71937e1447)
commit 30e85f43002ce56f076d1d7b17cac46d4d90a9c1
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:05:26 2016 +0100
ldb: remove outdated comment about type argument in dlist
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit d44f488317b431317963b42993cc56e2289a4d0d)
commit 96e0a11a89bff080c991555ebe9c68a7fa2d62b9
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:05:06 2016 +0100
tevent: remove outdated comment about type argument in dlist
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 310da05710ed498b1657978286ca409ad8487161)
commit 745e81ed44a95b49ed30427399ce5ac6e1c3561c
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:04:44 2016 +0100
dlist: remove outdated comment about type argument
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 025c59db066dc6d45beade963254b6be52e85f32)
commit f20e5b3063e685f5aa2922e63289c5e72da224ec
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:03:33 2016 +0100
dlist: remove unneeded type argument from DLIST_CONCATENATE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 2fd63ec80abd12a25ba652ff338c237c33668e33)
commit ac360228b3137a3c8832419df18c021476260e7a
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:02:54 2016 +0100
tevent: remove unneeded type argument from DLIST_CONCATENATE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 0f6c00b6aef6ca824696a77d427248d0fa1aad04)
commit 95d89dda455100c4ac0d006d5c8b6dfd9fdc7a0d
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 12:02:26 2016 +0100
ldb: remove unneeded argument type from DLIST_CONCATENATE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 1441824fe6a797e53fb182b00017a0f927ec42bf)
commit 9d325947539004023abd8992abcf191d7c8289a3
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:53:30 2016 +0100
tevent: remove uneeded type argument from DLIST_DEMOTE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit be2a341d43158999667de90f7c84b6c21d6c5dc6)
commit 1a7ceca9045f6eaae9dd5ad3e1a4cf7104c0f9b2
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:53:11 2016 +0100
ldb: remove uneeded type argument from DLIST_DEMOTE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit a1c5d662d4846a66f70d9a48b86fdda95264b30e)
commit c3735243f751f06612a743f49dd547d337746259
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:52:36 2016 +0100
dlist: remove unneeded argument from DLIST_DEMOTE()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit d6f5fc8c2d3db3daa2209850ef0487e822c7bb92)
commit 9e06f33d39942d74e9ad8a5e4062a7192828fac5
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:35:38 2016 +0100
ldb: remove unneeded type arg from DLIST_ADD_END
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 66af807fc45114d422d73c751a94e72117555113)
commit 2081969a4a33f01ea3475a9a704e882cefee64cb
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:37:42 2016 +0100
tevent: remove unneeded type argument from DLIST_ADD_END
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit a091c0ac6891a1ec3e15af7808a9c19533bcfb7c)
commit c4536f8cb4afd2bf95e8e780aab04c5949765361
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 5 11:32:18 2016 +0100
dlist: remove unneeded type argument from DLIST_ADD_END()
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 476672b647e44898a6de8894b23e598ad13b1fcf)
commit c17b1f697c388bd2e0190c4a3574d951b8be483e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 28 15:50:06 2016 +0100
s3:clispnego: fix confusing warning in spnego_gen_krb5_wrap()
asn1_extract_blob() stops further asn1 processing by setting has_error.
Don't call asn1_has_error() after asn1_extract_blob() has been successful
otherwise we get an "Failed to build krb5 wrapper at" message
on success.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11702
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 14f1a94b6fb3a55be1e60fe0d28740f04fd94b3f)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 1 +
ctdb/common/ctdb_io.c | 2 +-
ctdb/server/ctdb_call.c | 4 +-
ctdb/server/ctdb_daemon.c | 2 +-
ctdb/server/ctdb_lock.c | 8 +-
ctdb/server/ctdb_logging.c | 2 +-
docs-xml/manpages/smbget.1.xml | 6 -
lib/ldb/common/ldb_match.c | 2 +-
lib/ldb/common/ldb_modules.c | 6 +-
lib/ldb/include/dlinklist.h | 15 +-
.../ABI/{tevent-0.9.26.sigs => tevent-0.9.27.sigs} | 0
.../ABI/{tevent-0.9.26.sigs => tevent-0.9.28.sigs} | 0
lib/tevent/tevent_immediate.c | 2 +-
lib/tevent/tevent_poll.c | 2 +-
lib/tevent/tevent_port.c | 22 +-
lib/tevent/tevent_queue.c | 2 +-
lib/tevent/tevent_select.c | 2 +-
lib/tevent/tevent_signal.c | 4 +
lib/tevent/tevent_util.h | 15 +-
lib/tevent/wscript | 2 +-
lib/torture/torture.c | 14 +-
lib/util/dlinklist.h | 15 +-
lib/util/tests/dlinklist.c | 8 +-
libcli/cldap/cldap.c | 2 +-
libcli/nbt/nbtsocket.c | 7 +-
libcli/smb/smbXcli_base.c | 6 +-
selftest/selftesthelpers.py | 1 +
selftest/target/Samba3.pm | 66 ++++--
source3/auth/auth.c | 2 +-
source3/auth/pampass.c | 2 +-
source3/lib/events.c | 2 +-
source3/lib/smbldap.c | 2 +-
source3/lib/unix_msg/unix_msg.c | 2 +-
source3/lib/util_ea.c | 2 +-
source3/libsmb/clidfs.c | 2 +-
source3/libsmb/clireadwrite.c | 4 +-
source3/libsmb/clispnego.c | 15 +-
source3/modules/vfs_aio_pthread.c | 2 +-
source3/modules/vfs_default.c | 16 --
source3/nmbd/nmbd_browserdb.c | 2 +-
source3/nmbd/nmbd_packets.c | 2 +-
source3/nmbd/nmbd_responserecordsdb.c | 2 +-
source3/nmbd/nmbd_serverlistdb.c | 2 +-
source3/param/loadparm.c | 2 +-
source3/passdb/passdb.c | 3 +-
source3/printing/notify.c | 2 +-
source3/registry/regfio.c | 2 +-
source3/rpc_server/fss/srv_fss_agent.c | 9 +-
source3/rpc_server/fss/srv_fss_state.c | 12 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 17 +-
source3/script/tests/test_forceuser_validusers.sh | 59 ++++++
source3/script/tests/test_smbget.sh | 236 +++++++++++++++++++++
source3/selftest/tests.py | 2 +
source3/smbd/blocking.c | 2 +-
source3/smbd/notify.c | 3 +-
source3/smbd/posix_acls.c | 12 +-
source3/smbd/process.c | 5 +-
source3/smbd/server.c | 2 +-
source3/smbd/smb2_server.c | 10 +-
source3/smbd/smbXsrv_session.c | 2 +-
source3/smbd/trans2.c | 6 +-
source3/utils/smbget.c | 119 ++++++-----
source3/winbindd/winbindd_misc.c | 11 +-
source3/winbindd/winbindd_util.c | 155 ++++++++++----
source4/auth/ntlm/auth.c | 2 +-
source4/dns_server/dnsserver_common.c | 2 +-
source4/dsdb/common/util_trusts.c | 2 +-
source4/dsdb/kcc/kcc_drs_replica_info.c | 2 +-
source4/dsdb/repl/drepl_notify.c | 2 +-
source4/dsdb/repl/drepl_out_pull.c | 2 +-
source4/dsdb/repl/drepl_partitions.c | 4 +-
source4/dsdb/repl/replicated_objects.c | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 4 +-
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 2 +-
source4/dsdb/samdb/ldb_modules/secrets_tdb_sync.c | 2 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 2 +-
source4/dsdb/schema/schema_query.c | 8 +-
source4/ldap_server/ldap_backend.c | 2 +-
source4/lib/http/http.c | 2 +-
source4/lib/socket/interface.c | 2 +-
source4/lib/stream/packet.c | 2 +-
source4/libcli/dgram/dgramsocket.c | 2 +-
source4/libcli/resolve/resolve.c | 2 +-
source4/librpc/rpc/dcerpc.c | 6 +-
source4/nbt_server/register.c | 2 +-
source4/nbt_server/wins/winsserver.c | 2 +-
source4/ntvfs/ntvfs_base.c | 2 +-
source4/ntvfs/posix/pvfs_notify.c | 2 +-
source4/rpc_server/common/reply.c | 10 +-
source4/rpc_server/dcerpc_server.c | 14 +-
source4/rpc_server/dnsserver/dcerpc_dnsserver.c | 6 +-
source4/rpc_server/dnsserver/dnsdb.c | 6 +-
source4/smb_server/smb2/receive.c | 2 +-
source4/smb_server/smb_server.h | 2 +-
source4/smbd/service.c | 2 +-
source4/torture/local/fsrvp_state.c | 20 +-
source4/torture/nbench/nbio.c | 4 +-
source4/torture/nbt/wins.c | 3 +-
source4/torture/ndr/ndr.c | 4 +-
source4/torture/rpc/spoolss_notify.c | 2 +-
source4/torture/smb2/smb2.c | 4 +-
source4/torture/util_smb.c | 6 +-
source4/torture/vfs/vfs.c | 2 +-
source4/wrepl_server/wrepl_server.c | 4 +-
104 files changed, 745 insertions(+), 356 deletions(-)
copy lib/tevent/ABI/{tevent-0.9.26.sigs => tevent-0.9.27.sigs} (100%)
copy lib/tevent/ABI/{tevent-0.9.26.sigs => tevent-0.9.28.sigs} (100%)
create mode 100755 source3/script/tests/test_forceuser_validusers.sh
create mode 100755 source3/script/tests/test_smbget.sh
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 721eb9c..f6d8d5e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -71,6 +71,7 @@ The -u and -p options for user and password were replaced by the -U option that
accepts username[%password] as in many other tools of the Samba suite.
Similary, smbgetrc files do not accept username and password options any more,
only a single "user" option which also accepts user%password combinations.
+The -P option was removed.
s4-rpc_server
-------------
diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 24968b3..894935e 100644
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -352,7 +352,7 @@ int ctdb_queue_send(struct ctdb_queue *queue, uint8_t *data, uint32_t length)
TEVENT_FD_WRITEABLE(queue->fde);
}
- DLIST_ADD_END(queue->out_queue, pkt, NULL);
+ DLIST_ADD_END(queue->out_queue, pkt);
queue->out_queue_length++;
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index b61754e..2461f95 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -565,7 +565,7 @@ static int dmaster_defer_add(struct ctdb_db_context *ctdb_db,
call->ctdb = ctdb_db->ctdb;
call->hdr = talloc_steal(call, hdr);
- DLIST_ADD_END(ddq->deferred_calls, call, NULL);
+ DLIST_ADD_END(ddq->deferred_calls, call);
return 0;
}
@@ -1876,7 +1876,7 @@ child_finished:
set_close_on_exec(rc->fd[0]);
/* This is an active revokechild child process */
- DLIST_ADD_END(ctdb_db->revokechild_active, rc, NULL);
+ DLIST_ADD_END(ctdb_db->revokechild_active, rc);
rc->fde = tevent_add_fd(ctdb->ev, rc, rc->fd[0], TEVENT_FD_READ,
revokechild_handler, (void *)rc);
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 36dcfad..9a33691 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -590,7 +590,7 @@ static int requeue_duplicate_fetch(struct ctdb_db_context *ctdb_db, struct ctdb_
dfc->w->ctdb = ctdb_db->ctdb;
dfc->w->client_id = client->client_id;
- DLIST_ADD_END(dfq->deferred_calls, dfc, NULL);
+ DLIST_ADD_END(dfq->deferred_calls, dfc);
return 0;
}
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 78ba35c..7962e94 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -902,10 +902,10 @@ static void ctdb_lock_schedule(struct ctdb_context *ctdb)
/* Move the context from pending to current */
if (lock_ctx->type == LOCK_RECORD) {
DLIST_REMOVE(lock_ctx->ctdb_db->lock_pending, lock_ctx);
- DLIST_ADD_END(lock_ctx->ctdb_db->lock_current, lock_ctx, NULL);
+ DLIST_ADD_END(lock_ctx->ctdb_db->lock_current, lock_ctx);
} else {
DLIST_REMOVE(ctdb->lock_pending, lock_ctx);
- DLIST_ADD_END(ctdb->lock_current, lock_ctx, NULL);
+ DLIST_ADD_END(ctdb->lock_current, lock_ctx);
}
CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_pending);
CTDB_INCREMENT_STAT(lock_ctx->ctdb, locks.num_current);
@@ -975,9 +975,9 @@ static struct lock_request *ctdb_lock_internal(TALLOC_CTX *mem_ctx,
* immediately, so keep them at the head of the pending queue.
*/
if (lock_ctx->type == LOCK_RECORD) {
- DLIST_ADD_END(ctdb_db->lock_pending, lock_ctx, NULL);
+ DLIST_ADD_END(ctdb_db->lock_pending, lock_ctx);
} else {
- DLIST_ADD_END(ctdb->lock_pending, lock_ctx, NULL);
+ DLIST_ADD_END(ctdb->lock_pending, lock_ctx);
}
CTDB_INCREMENT_STAT(ctdb, locks.num_pending);
if (ctdb_db) {
diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 29b1982..1819ab7 100644
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -71,7 +71,7 @@ void ctdb_log_register_backend(const char *prefix, ctdb_log_setup_fn_t setup)
b->prefix = prefix;
b->setup = setup;
- DLIST_ADD_END(log_state->backends, b, NULL);
+ DLIST_ADD_END(log_state->backends, b);
}
diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml
index 59e2ffe..d77cb8e 100644
--- a/docs-xml/manpages/smbget.1.xml
+++ b/docs-xml/manpages/smbget.1.xml
@@ -27,7 +27,6 @@
<arg choice="opt">-n, --nonprompt</arg>
<arg choice="opt">-d, --debuglevel=INT</arg>
<arg choice="opt">-D, --dots</arg>
- <arg choice="opt">-P, --keep-permissions</arg>
<arg choice="opt">-o, --outputfile</arg>
<arg choice="opt">-f, --rcfile</arg>
<arg choice="opt">-q, --quiet</arg>
@@ -102,11 +101,6 @@
</varlistentry>
<varlistentry>
- <term>-P, --keep-permissions</term>
- <listitem><para>Set same permissions on local file as are set on remote file.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>-o, --outputfile</term>
<listitem><para>Write the file that is being downloaded to the specified file. Can not be used together with -R.</para></listitem>
</varlistentry>
diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
index c4f5580..e83ad63 100644
--- a/lib/ldb/common/ldb_match.c
+++ b/lib/ldb/common/ldb_match.c
@@ -713,7 +713,7 @@ int ldb_register_extended_match_rule(struct ldb_context *ldb,
return LDB_ERR_OPERATIONS_ERROR;
}
entry->rule = rule;
- DLIST_ADD_END(ldb->extended_match_rules, entry, struct ldb_extended_match_entry);
+ DLIST_ADD_END(ldb->extended_match_rules, entry);
return LDB_SUCCESS;
}
diff --git a/lib/ldb/common/ldb_modules.c b/lib/ldb/common/ldb_modules.c
index 91412a6..2105966 100644
--- a/lib/ldb/common/ldb_modules.c
+++ b/lib/ldb/common/ldb_modules.c
@@ -162,7 +162,7 @@ int ldb_register_backend(const char *url_prefix, ldb_connect_fn connectfn, bool
talloc_free(be);
return LDB_ERR_OPERATIONS_ERROR;
}
- DLIST_ADD_END(ldb_backends, be, struct backends_list_entry);
+ DLIST_ADD_END(ldb_backends, be);
}
be->ops->name = url_prefix;
@@ -240,7 +240,7 @@ int ldb_register_hook(ldb_hook_fn hook_fn)
return LDB_ERR_OPERATIONS_ERROR;
}
lc->hook_fn = hook_fn;
- DLIST_ADD_END(ldb_hooks, lc, struct ldb_hooks);
+ DLIST_ADD_END(ldb_hooks, lc);
return LDB_SUCCESS;
}
@@ -926,7 +926,7 @@ static int ldb_modules_load_path(const char *path, const char *version)
le->st_ino = st.st_ino;
le->st_dev = st.st_dev;
- DLIST_ADD_END(loaded, le, struct loaded);
+ DLIST_ADD_END(loaded, le);
/* if it is a directory, recurse */
if (S_ISDIR(st.st_mode)) {
diff --git a/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
index f640b0f..ef01aec 100644
--- a/lib/ldb/include/dlinklist.h
+++ b/lib/ldb/include/dlinklist.h
@@ -57,10 +57,6 @@
This allows us to find the tail of the list by using
list_head->prev, which means we can add to the end of the list in
O(1) time
-
-
- Note that the 'type' arguments below are no longer needed, but
- are kept for now to prevent an incompatible argument change
*/
@@ -135,9 +131,8 @@ do { \
/*
add to the end of a list.
- Note that 'type' is ignored
*/
-#define DLIST_ADD_END(list, p, type) \
+#define DLIST_ADD_END(list, p) \
do { \
if (!(list)) { \
DLIST_ADD(list, p); \
@@ -155,20 +150,18 @@ do { \
/*
demote an element to the end of a list.
- Note that 'type' is ignored
*/
-#define DLIST_DEMOTE(list, p, type) \
+#define DLIST_DEMOTE(list, p) \
do { \
DLIST_REMOVE(list, p); \
- DLIST_ADD_END(list, p, NULL); \
+ DLIST_ADD_END(list, p); \
} while (0)
/*
concatenate two lists - putting all elements of the 2nd list at the
end of the first list.
- Note that 'type' is ignored
*/
-#define DLIST_CONCATENATE(list1, list2, type) \
+#define DLIST_CONCATENATE(list1, list2) \
do { \
if (!(list1)) { \
(list1) = (list2); \
diff --git a/lib/tevent/ABI/tevent-0.9.26.sigs b/lib/tevent/ABI/tevent-0.9.27.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.26.sigs
copy to lib/tevent/ABI/tevent-0.9.27.sigs
diff --git a/lib/tevent/ABI/tevent-0.9.26.sigs b/lib/tevent/ABI/tevent-0.9.28.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.26.sigs
copy to lib/tevent/ABI/tevent-0.9.28.sigs
diff --git a/lib/tevent/tevent_immediate.c b/lib/tevent/tevent_immediate.c
index 1ac293e..9ff5322 100644
--- a/lib/tevent/tevent_immediate.c
+++ b/lib/tevent/tevent_immediate.c
@@ -88,7 +88,7 @@ void tevent_common_schedule_immediate(struct tevent_immediate *im,
im->cancel_fn = NULL;
im->additional_data = NULL;
- DLIST_ADD_END(ev->immediate_events, im, struct tevent_immediate *);
+ DLIST_ADD_END(ev->immediate_events, im);
talloc_set_destructor(im, tevent_common_immediate_destructor);
tevent_debug(ev, TEVENT_DEBUG_TRACE,
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c
index 9b1781f..e1c305d 100644
--- a/lib/tevent/tevent_poll.c
+++ b/lib/tevent/tevent_poll.c
@@ -601,7 +601,7 @@ static int poll_event_loop_poll(struct tevent_context *ev,
*/
flags &= fde->flags;
if (flags != 0) {
- DLIST_DEMOTE(ev->fd_events, fde, struct tevent_fd);
+ DLIST_DEMOTE(ev->fd_events, fde);
fde->handler(ev, fde, flags, fde->private_data);
return 0;
}
diff --git a/lib/tevent/tevent_port.c b/lib/tevent/tevent_port.c
index 5b487d7..4b524df 100644
--- a/lib/tevent/tevent_port.c
+++ b/lib/tevent/tevent_port.c
@@ -496,10 +496,24 @@ static int port_event_loop(struct port_event_context *port_ev, struct timeval *t
return 0;
}
- if (ret == -1 && port_errno == ETIME && tvalp) {
- /* we don't care about a possible delay here */
- tevent_common_loop_timer_delay(ev);
- return 0;
+ if (ret == -1 && port_errno == ETIME) {
+ /*
+ * If errno is set to ETIME it is possible that we still got an event.
+ * In that case we need to go through the processing loop so that we
+ * reassociate the received event with the port or the association will
+ * be lost so check the value of nget is 0 before returning.
+ */
+ if (nget == 0) {
+ /* we don't care about a possible delay here */
+ tevent_common_loop_timer_delay(ev);
+ return 0;
+ }
+ /*
+ * Set the return value to 0 since we do not actually have an error and we
+ * do have events that need to be processed. This keeps us from getting
+ * caught in the generic error test.
+ */
+ ret = 0;
}
if (ret == -1) {
diff --git a/lib/tevent/tevent_queue.c b/lib/tevent/tevent_queue.c
index 35742e5..cefe91a 100644
--- a/lib/tevent/tevent_queue.c
+++ b/lib/tevent/tevent_queue.c
@@ -195,7 +195,7 @@ static struct tevent_queue_entry *tevent_queue_add_internal(
allow_direct = false;
}
- DLIST_ADD_END(queue->list, e, struct tevent_queue_entry *);
+ DLIST_ADD_END(queue->list, e);
queue->length++;
talloc_set_destructor(e, tevent_queue_entry_destructor);
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
index 40a4dc0..ec7565d 100644
--- a/lib/tevent/tevent_select.c
+++ b/lib/tevent/tevent_select.c
@@ -219,7 +219,7 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru
flags |= TEVENT_FD_WRITE;
}
if (flags) {
- DLIST_DEMOTE(select_ev->ev->fd_events, fde, struct tevent_fd);
+ DLIST_DEMOTE(select_ev->ev->fd_events, fde);
fde->handler(select_ev->ev, fde, flags, fde->private_data);
break;
}
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index 924dc05..9bc11ed 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -212,6 +212,7 @@ static int tevent_signal_destructor(struct tevent_signal *se)
/* restore old handler, if any */
if (sig_state->oldact[se->signum]) {
sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+ talloc_free(sig_state->oldact[se->signum]);
sig_state->oldact[se->signum] = NULL;
}
#ifdef SA_SIGINFO
@@ -342,6 +343,8 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
return NULL;
}
if (sigaction(signum, &act, sig_state->oldact[signum]) == -1) {
+ talloc_free(sig_state->oldact[signum]);
+ sig_state->oldact[signum] = NULL;
talloc_free(se);
return NULL;
}
@@ -505,6 +508,7 @@ void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se)
if (sig_state->sig_handlers[se->signum] == NULL) {
if (sig_state->oldact[se->signum]) {
sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+ talloc_free(sig_state->oldact[se->signum]);
sig_state->oldact[se->signum] = NULL;
}
}
diff --git a/lib/tevent/tevent_util.h b/lib/tevent/tevent_util.h
index 6f91983..e2cdbb8 100644
--- a/lib/tevent/tevent_util.h
+++ b/lib/tevent/tevent_util.h
@@ -53,10 +53,6 @@
This allows us to find the tail of the list by using
list_head->prev, which means we can add to the end of the list in
O(1) time
-
-
- Note that the 'type' arguments below are no longer needed, but
- are kept for now to prevent an incompatible argument change
*/
@@ -131,9 +127,8 @@ do { \
/*
add to the end of a list.
- Note that 'type' is ignored
*/
-#define DLIST_ADD_END(list, p, type) \
+#define DLIST_ADD_END(list, p) \
do { \
if (!(list)) { \
DLIST_ADD(list, p); \
@@ -151,20 +146,18 @@ do { \
/*
demote an element to the end of a list.
- Note that 'type' is ignored
*/
-#define DLIST_DEMOTE(list, p, type) \
+#define DLIST_DEMOTE(list, p) \
do { \
DLIST_REMOVE(list, p); \
- DLIST_ADD_END(list, p, NULL); \
+ DLIST_ADD_END(list, p); \
} while (0)
/*
concatenate two lists - putting all elements of the 2nd list at the
end of the first list.
- Note that 'type' is ignored
*/
-#define DLIST_CONCATENATE(list1, list2, type) \
+#define DLIST_CONCATENATE(list1, list2) \
do { \
if (!(list1)) { \
(list1) = (list2); \
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 103cc06..2bdb5ac 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.26'
+VERSION = '0.9.28'
blddir = 'bin'
diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 78d8261..40807d9 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -277,7 +277,7 @@ struct torture_test *torture_tcase_add_test_const(struct torture_tcase *tcase,
test->dangerous = false;
test->data = data;
- DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+ DLIST_ADD_END(tcase->tests, test);
return test;
}
@@ -296,7 +296,7 @@ bool torture_suite_init_tcase(struct torture_suite *suite,
tcase->fixture_persistent = true;
tcase->tests = NULL;
- DLIST_ADD_END(suite->testcases, tcase, struct torture_tcase *);
+ DLIST_ADD_END(suite->testcases, tcase);
return true;
}
@@ -617,7 +617,7 @@ struct torture_tcase *torture_suite_add_simple_tcase_const(
test->data = data;
test->dangerous = false;
- DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+ DLIST_ADD_END(tcase->tests, test);
return tcase;
}
@@ -651,7 +651,7 @@ struct torture_tcase *torture_suite_add_simple_test(
test->fn = run;
test->dangerous = false;
- DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+ DLIST_ADD_END(tcase->tests, test);
return tcase;
}
@@ -665,7 +665,7 @@ bool torture_suite_add_suite(struct torture_suite *suite,
if (child == NULL)
return false;
- DLIST_ADD_END(suite->children, child, struct torture_suite *);
+ DLIST_ADD_END(suite->children, child);
/* FIXME: Check for duplicates and return false if the
* added suite already exists as a child */
@@ -716,7 +716,7 @@ struct torture_test *torture_tcase_add_simple_test_const(
test->data = NULL;
test->dangerous = false;
- DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+ DLIST_ADD_END(tcase->tests, test);
return test;
}
@@ -747,7 +747,7 @@ struct torture_test *torture_tcase_add_simple_test(struct torture_tcase *tcase,
test->data = NULL;
test->dangerous = false;
- DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+ DLIST_ADD_END(tcase->tests, test);
return test;
}
diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index 5520901..8a1b84d 100644
--- a/lib/util/dlinklist.h
+++ b/lib/util/dlinklist.h
@@ -53,10 +53,6 @@
This allows us to find the tail of the list by using
list_head->prev, which means we can add to the end of the list in
O(1) time
-
-
- Note that the 'type' arguments below are no longer needed, but
- are kept for now to prevent an incompatible argument change
*/
@@ -131,9 +127,8 @@ do { \
/*
add to the end of a list.
- Note that 'type' is ignored
*/
-#define DLIST_ADD_END(list, p, type) \
+#define DLIST_ADD_END(list, p) \
do { \
if (!(list)) { \
DLIST_ADD(list, p); \
@@ -151,20 +146,18 @@ do { \
--
Samba Shared Repository
More information about the samba-cvs
mailing list