[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Mon Dec 21 03:23:39 MST 2009
The branch, v3-5-stable has been updated
via 61ba90a... WHATSNEW: Update changes since 3.5.0pre2.
via 7f1f838... WHATSNEW: Fix typo.
via acaad79... s3: Fix an error case in cli_negprot (cherry picked from commit 13f8f0c74ea1f34817603beedf8cc4d5e41f958f)
via c62c4c5... Fix release script to work with recent git versions (cherry picked from commit 7f956869ff7a8e481afb9db0c52a0d74d809867a)
via 178c3ab... talloc: Fix exports and increment talloc version (cherry picked from commit 6618a062a19660a718074f6e6155339451b7a5b6)
via 4f48755... talloc: Make abi checks in release script
via f3c36ad... talloc: Move release script under /script too (cherry picked from commit 8e6df560b74d7e9b94dd47625de56bc1dc0bc6d7)
via de15bab... talloc: Change the way mksysms work
via 17ea675... Fix release script with newer versins of git (cherry picked from commit 4334092cbae28181ba0d1cf2ac026961f2192972)
via b4a30e6... tdb tools: Mostly cosmetic adaptions
via 11d50d2... tdb: change version to 1.2.0 after adding TDB_*ALLOW_NESTING
via 61c6d18... tdb: add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior
via 0b43209... New attempt at TDB transaction nesting allow/disallow.
via 13ad49d... tdb: always set tdb->tracefd to -1 to be safe on goto fail
via 01d15e9... tdb: update README a bit
via 37aa2b9... tdb: add tests for double .close() in pytdb
via bf980ca... tdb: reset tdb->fd to -1 in tdb_close()
via a777d88... tdb: fix typo in python's Tdb.get() docstring
via 3f95bb1... tdb: kill last bits from swig
via 460f3c1... tsocket: Fixed tsocket_guide.txt asciidoc syntax. (cherry picked from commit a5bdab8b32768282270315f880f980d99ebb9a2e)
via 855559c... tsocket: Fixed documentation for tsocket_address_bsd_sockaddr(). (cherry picked from commit e33ae22b87597f31caefd5466bb8e8f240405972)
via 8602c2b... tsocket: Fixed typo in LGPL header. (cherry picked from commit ab04dd3be743806bf3c9cf9db4b5326ce0476bf5)
via dec3935... tsocket: add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
via 54ef6a7... tevent: prefix types and defined with tevent_ and TEVENT_
via 9175a09... Output %p as unsigned in snprintf replacement. (cherry picked from commit 8aba573cd9cd1c1f10b8aa9363e0b6dad2933bef)
via 4a90e72... Actually explain the twisty paths of tortured logic behind reply_doserror(), reply_nterror(), and reply_nterror(NT_STATUS_DOS()).
via 1f208f1... reply_doserror() doesn't force DOS errors on the wire.
via 8b30004... reply_force_nterror() is not used anywhere. Remove it. Jeremy. (cherry picked from commit 69d26d25f7f2a46e87337fa50af4ed0a1b11a2b5) (cherry picked from commit a29eff82703e9f309c9b1aa78581dd94d8f8dafd)
via 5f9c86e... s3: re-run make samba3-idl.
via 77b4824... s3-docs: mention pam_winbind.conf(5) manpage in pam_winbind(8) manpage.
via cb800b3... s3-docs: add new pam_winbind.conf(5) manpage.
via 9151116... s4-smbtorture: skip GetAliasMembership against s4.
via 21b63da... s4-smbtorture: add a samr_GetAliasMembership test to RPC-SAMR.
via e76c8b5... tdbtool: avoid using c++ reserved words.
via df0d2bf... s4-smbtorture: fix smbtorture after setprinter IDL fixes.
via 1ff1ab8... s3-spoolss: fix rpcclient after setprinter IDL fixes.
via 794bae1... spoolss: more mork on SetPrinterInfo() levels.
via afd1ef4... spoolss: add spoolss_DriverInfo7.
via c8b9660... s3-pdbedit: allow to call "pdbedit -N description -u user" without specifiyng "-r".
via e5f37cd... s4-smbtorture: run GetPrinterDriver2 tests against each printer's driver.
via cf8907c... Always map EMFILE to ERRDOS, ERRnofids, *NOT* NT_STATUS_TOO_MANY_OPENED_FILES. This is what W2KR3 does for NTCreateX and openX calls. May be the correct fix for bug 6837 - "Too many open files" when trying to access large number of files. Jeremy. (cherry picked from commit 6585621d367d997b79ffb99e0a8743766e6ff6d2) (cherry picked from commit e315849277ef307018d6dc93a1df04792f36a435)
via 082ad52... Vector correctly through reply_openerror() (which uses the same logic). Jeremy. (cherry picked from commit d1a5387580182884d3cc875f3f404ff8377c1e92) (cherry picked from commit 9bef3b2030a9210acc38fd0102fb4274f34ab296)
via c3ea51d... Update default with correct value. Add a note about Win7 behavior here. Jeremy. (cherry picked from commit fbf4923cad17b55bd7a647bf2300b28e23b8cdbb) (cherry picked from commit 8f8c7976f07879036e76fdd9de9d5a42cc57324e)
via 681f633... Fix bug #6939 - mangling method = hash breaks long filenames.
via 5d6a23c... s3: Fix bug 6992, make test for getgrouplist cacheable (cherry picked from commit f0f4e5b9c3b8c640bf1829a9a12bcdfa7d2c153a)
via 2771f3c... Final part of the fix for 6837 - "Too many open files" when trying to access large number of files
via fe2f233... Add helpful debug of DACL for errors on ACL access. Jeremy. (cherry picked from commit b8c87c43dd9309b3d2fed5d5db5b38057a8e4e90) (cherry picked from commit 88d2eca3b3b305a569fdd56936c8a92ee5843e4b)
via 59cffb5... Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned attributes by protocol level.
via 0615b2d... s3: Fix _samr_GetAliasMembership for results with 0 rids (cherry picked from commit 526ceefc9d2df46b5b172a15d196f1f1de6ff6c7)
via a498121... talloc: Fix write behind memory block
from 2b0f402... WHATSNEW: Update changes since 3.5.0pre1.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 61ba90ab5a28002e6b902430adba35db4fcb72e7
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Dec 21 11:22:17 2009 +0100
WHATSNEW: Update changes since 3.5.0pre2.
Karolin
(cherry picked from commit 350e7db17296a7987f5e007b7404c7b82cbf4995)
commit 7f1f838d9116d49d9df74e9018467641fd2c89f2
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Dec 18 12:53:35 2009 +0100
WHATSNEW: Fix typo.
Thanks, Bjoern! :-)
Karolin
(cherry picked from commit f3f1c3ca0878651f02dbe50d439cb1541ef04142)
commit acaad791a3989ee89161c0598d47e3adf7dcf8aa
Author: Volker Lendecke <vl at samba.org>
Date: Sun Dec 20 23:29:32 2009 +0100
s3: Fix an error case in cli_negprot
(cherry picked from commit 13f8f0c74ea1f34817603beedf8cc4d5e41f958f)
commit c62c4c561904595327556090b1fc9b136e94e600
Author: Simo Sorce <idra at samba.org>
Date: Tue Dec 15 09:17:25 2009 -0500
Fix release script to work with recent git versions
(cherry picked from commit 7f956869ff7a8e481afb9db0c52a0d74d809867a)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 6fa974ec35e7c83bbef05f21ee2a20100346ba57)
commit 178c3ab41417c70ff792f21c61c6121b0be7075e
Author: Simo Sorce <idra at samba.org>
Date: Wed Oct 14 10:50:19 2009 -0400
talloc: Fix exports and increment talloc version
(cherry picked from commit 6618a062a19660a718074f6e6155339451b7a5b6)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit fdfe8da31be7f658c3a584eda20e3faeb2a19cac)
commit 4f48755a8be3bb029d20480d02dd84c7101cf806
Author: Simo Sorce <idra at samba.org>
Date: Wed Oct 14 10:57:17 2009 -0400
talloc: Make abi checks in release script
Make always sure the exports and signature files are up to date before
shipping a release.
(cherry picked from commit 8fb483b2964f1222c013df42ba8be544269da612)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c751ceb929c5f025648aa4f3a5e746287eeee726)
commit f3c36ad35e7db8e5bf3730b4d7a55a336377c5cd
Author: Simo Sorce <idra at samba.org>
Date: Wed Oct 14 10:55:11 2009 -0400
talloc: Move release script under /script too
(cherry picked from commit 8e6df560b74d7e9b94dd47625de56bc1dc0bc6d7)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit f4c910b78d475e6b83feb612425ec6b64f596d86)
commit de15babb93d96e2335403502a6783e328450d31b
Author: Simo Sorce <idra at samba.org>
Date: Wed Oct 14 10:20:28 2009 -0400
talloc: Change the way mksysms work
Make sure we always have a sorted (per file) export file.
This way we can directly compare the real export and the check file w/o having
to further sort things.
Also return error code from abi_checks.sh if warnings were reported
(cherry picked from commit 2d6d6bcb5de87ce0dbce13ff6bc775b953438b75)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit fed2560341c6cbbeee512111f1cd7fb544c80c21)
commit 17ea675b61641522357db58a528327dcc2aefa6f
Author: Simo Sorce <idra at samba.org>
Date: Mon Dec 7 09:25:03 2009 -0500
Fix release script with newer versins of git
(cherry picked from commit 4334092cbae28181ba0d1cf2ac026961f2192972)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 636f199b4fc75275c1bd175d1b939b95ad144289)
commit b4a30e6aedb83c545e930793473a2d57e2bee44a
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Fri Oct 16 19:02:02 2009 +0200
tdb tools: Mostly cosmetic adaptions
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 9776cb03450d21da5d454e683bdba29793ba3f67)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 79be7337bda044637940b084a4480bd9a71e41b0)
commit 11d50d2c5ecdacf9ef9097043da6685ae0ef91a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 19 09:49:03 2009 +0100
tdb: change version to 1.2.0 after adding TDB_*ALLOW_NESTING
metze
(cherry picked from commit 5ca0a4bfd6fdbb515835682a12f715283b46cb3e)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 57c5bd874666234419a976d0b4d8a68fda5cf9c5)
commit 61c6d18924de106b4d6f6ecdf810ba815a896485
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 19 09:34:05 2009 +0100
tdb: add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior
We need to keep TDB_ALLOW_NESTING as default behavior,
so that existing code continues to work.
However we may change the default together with a major version
number change in future.
metze
(cherry picked from commit 3b9f19ed919fef2e88b2f92ae541e07bc7379cd1)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 1383e232cc7d20e64a04eb912d7d8a8ae5a5b5a9)
commit 0b43209493db4df6756c9a202f591847ad030e6c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon May 25 17:04:42 2009 +1000
New attempt at TDB transaction nesting allow/disallow.
Make the default be that transaction is not allowed and any attempt to create a nested transaction will fail with TDB_ERR_NESTING.
If an application can cope with transaction nesting and the implicit
semantics of tdb_transaction_commit(), it can enable transaction nesting
by using the TDB_ALLOW_NESTING flag.
(cherry picked from ctdb commit 3e49e41c21eb8c53084aa8cc7fd3557bdd8eb7b6)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 436b55db1ff238ec467b07a74b088f6fcfaf927c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e6669e7f563f7be27ecb9872ea3ef148236dea3c)
commit 13ad49d14484de3fc9f5f458d3cd8723e41cb35a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Nov 19 09:38:48 2009 +0100
tdb: always set tdb->tracefd to -1 to be safe on goto fail
metze
(cherry picked from commit 85449b7bcc4bd7948bea38b5514a02357950a002)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 2159f25dac59966cfa4cd627ddbb544e09d12a07)
commit 01d15e9400ece8ebdfdbb9bd71958164ad4776a6
Author: Kirill Smelkov <kirr at mns.spb.ru>
Date: Wed Oct 21 21:18:58 2009 +0400
tdb: update README a bit
While studying tdb, I've noticed a couple of mismatches between readme
and actual code:
- tdb_open_ex changed it's log_fn argument to log_ctx
- there is now no tdb_update(), which it seems was transformed into
non-exported tdb_update_hash()
There were other mismatches, but I don't remember them now, sorry.
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(cherry picked from commit 83de5c826313aa09c76131ae70550bd81b3521c5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d01b4d0dc8e5715fb4c9f691a2dc7c8653566cad)
commit 37aa2b958cacba19d9149541765124708de8db03
Author: Kirill Smelkov <kirr at mns.spb.ru>
Date: Wed Oct 21 21:18:57 2009 +0400
tdb: add tests for double .close() in pytdb
The reason I do it is that when using older python-tdb as shipped in
Debian Lenny, python interpreter crashes on this test:
(gdb) bt
#0 0xb7f8c424 in __kernel_vsyscall ()
#1 0xb7df5640 in raise () from /lib/i686/cmov/libc.so.6
#2 0xb7df7018 in abort () from /lib/i686/cmov/libc.so.6
#3 0xb7e3234d in __libc_message () from /lib/i686/cmov/libc.so.6
#4 0xb7e38624 in malloc_printerr () from /lib/i686/cmov/libc.so.6
#5 0xb7e3a826 in free () from /lib/i686/cmov/libc.so.6
#6 0xb7b39c84 in tdb_close () from /usr/lib/libtdb.so.1
#7 0xb7b43e14 in ?? () from /var/lib/python-support/python2.5/_tdb.so
#8 0x0a038d08 in ?? ()
#9 0x00000000 in ?? ()
master's pytdb does not (we have a check for self->closed in obj_close()),
but still...
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(cherry picked from commit 71a21393dd1bb61bded82b1581ac6d5bd3b0153c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c739d4c1f56dd8e137123468d13c05f52eeab8b9)
commit bf980ca74b2b51322af266d74dd17c51d21521d9
Author: Kirill Smelkov <kirr at mns.spb.ru>
Date: Wed Oct 21 21:18:56 2009 +0400
tdb: reset tdb->fd to -1 in tdb_close()
So that erroneous double tdb_close() calls do not try to close() same
fd again. This is like SAFE_FREE() but for fd.
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(cherry picked from commit b4424f8234a78a79fb2d71d46ca208b4f12e0f9e)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 4df5dc8c5387707fa0cd628907d68026f0251fb9)
commit a777d88833c98eb63ab474891b9f04a5fc38aa27
Author: Kirill Smelkov <kirr at mns.spb.ru>
Date: Wed Oct 21 21:18:55 2009 +0400
tdb: fix typo in python's Tdb.get() docstring
It's Tdb.get(), not Tdb.fetch().
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(cherry picked from commit cfed5f946de0992a594c189ee3c19cf98e59d380)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 701c5e5a2c14c7c1914a1acf73579b5f7867dc9a)
commit 3f95bb148571f98d992b8e898a2773aefb7c3582
Author: Kirill Smelkov <kirr at mns.spb.ru>
Date: Wed Oct 21 21:18:54 2009 +0400
tdb: kill last bits from swig
We no longer use swig for pytdb, so there is no need for swig make
rules. Also pytdb.c header should be updated.
Signed-off-by: Kirill Smelkov <kirr at mns.spb.ru>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
(cherry picked from commit ecbe5ebd8d1c44a478c613eb1cace0521142d0d3)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 4177155348900c10de3fe2c5799ed4cdc11f282c)
commit 460f3c1b8220f5198bac280d4e400f226b980f52
Author: Andreas Schneider <asn at redhat.com>
Date: Tue Dec 15 12:58:18 2009 +0100
tsocket: Fixed tsocket_guide.txt asciidoc syntax.
(cherry picked from commit a5bdab8b32768282270315f880f980d99ebb9a2e)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ccd782844fc794ad1c1db4205aab1958bfa552a9)
commit 855559ce88bc55d01b0454d0be7e85521d633fcb
Author: Andreas Schneider <asn at redhat.com>
Date: Tue Dec 15 12:57:35 2009 +0100
tsocket: Fixed documentation for tsocket_address_bsd_sockaddr().
(cherry picked from commit e33ae22b87597f31caefd5466bb8e8f240405972)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 797accfd5fb0fdc4ddf69ed2dd71d7926b49cdca)
commit 8602c2baa510f8a41eebe228116125ebe949fd53
Author: Andreas Schneider <asn at redhat.com>
Date: Tue Dec 15 12:56:44 2009 +0100
tsocket: Fixed typo in LGPL header.
(cherry picked from commit ab04dd3be743806bf3c9cf9db4b5326ce0476bf5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d0c59bbb135ebeec71a4b11d41b3b4e5096857af)
commit dec3935b4e98fcc2df2e39bbfe478fa8cb2e10b3
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Nov 4 19:03:41 2009 +0100
tsocket: add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
metze
(cherry picked from commit edbf2caa6f8273227229cd8f1b293e95c6a6122d)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d226fce23c122b515426659b8a9149a29b9e427c)
commit 54ef6a7e1c49847ce3cb52b37accaa35a18d203a
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Dec 20 13:59:03 2009 +0100
tevent: prefix types and defined with tevent_ and TEVENT_
This fixes the build warnings on some build-farm hosts.
metze
(cherry picked from commit 4b7a6b1f8ff9ffe984612e1a303473d7a0865c0c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5a4f0e5e665870f34b5cc7e4f73ed88cf7bcd8c4)
commit 9175a093f623677877157bc96040eede08bead96
Author: Peter Rosin <peda at lysator.liu.se>
Date: Sat Dec 19 19:43:52 2009 +0100
Output %p as unsigned in snprintf replacement.
(cherry picked from commit 8aba573cd9cd1c1f10b8aa9363e0b6dad2933bef)
commit 4a90e7299424d5dc43b7207826ce53b47d5e4a36
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 18 14:28:22 2009 -0800
Actually explain the twisty paths of tortured logic behind
reply_doserror(), reply_nterror(), and reply_nterror(NT_STATUS_DOS()).
Fix the call in rely_openerror() to actually force a DOS error
for "too many open files".
Jeremy.
(cherry picked from commit 32861b926f1beef009d475b5c903a6b703f5bc1e)
(cherry picked from commit 9203d8ecbcda32f74beca6dbf9efd4544db5789f)
commit 1f208f1a4ac3b99e20e4f5f04aa1ecb6a0be3dc6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 18 14:25:39 2009 -0800
reply_doserror() doesn't force DOS errors on the wire.
Start migrating uses of reply_doserror() to reply_nterror() with the
correct mapping. Eventually we'll get to the point where we can
change reply_doserror() to force a DOS error code on the wire,
and can change calls to reply_nterror(req, NT_STATUS_DOS()) - which *does*
force DOS errors on the wire - to reply_doserror(). Which might
actually make the server code look like it's making sense.
Jeremy.
(cherry picked from commit 0dd8c8a6ffed20be89ff1c407ea1d2876bd30792)
(cherry picked from commit 55412366c185f731d5815c58f06745e1f5c8debf)
commit 8b3000443afbccf2efb323b244f9f7f2608c0242
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 18 14:25:07 2009 -0800
reply_force_nterror() is not used anywhere. Remove it.
Jeremy.
(cherry picked from commit 69d26d25f7f2a46e87337fa50af4ed0a1b11a2b5)
(cherry picked from commit a29eff82703e9f309c9b1aa78581dd94d8f8dafd)
commit 5f9c86e2e5f9d9f7465a89c18828a34c2c9e1f45
Author: Günther Deschner <gd at samba.org>
Date: Fri Dec 18 15:49:34 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit 038fb57092132459bbd8aff8836abdf2a0bbaeed)
commit 77b4824ed64eda21371c3219cf470a88dfeba30f
Author: Günther Deschner <gd at samba.org>
Date: Fri Dec 18 13:56:43 2009 +0100
s3-docs: mention pam_winbind.conf(5) manpage in pam_winbind(8) manpage.
Guenther
(cherry picked from commit 72d68acbf59aa8531cc132551cc8e8313b7dc3b7)
(cherry picked from commit 44feb66c4b958947954853ae7a6b7b017ebd9166)
commit cb800b3ef9138e85929a6727ca47b878e9df2d7e
Author: Günther Deschner <gd at samba.org>
Date: Fri Dec 18 13:56:01 2009 +0100
s3-docs: add new pam_winbind.conf(5) manpage.
Guenther
(cherry picked from commit 74816678706b7028fa63a4e552887fcf98322711)
(cherry picked from commit f69c3d57849396a8b31d6b2dfb074c3abe02c6eb)
commit 91511167826270dbca910a83668ac13c3174c498
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 17 18:02:53 2009 +0100
s4-smbtorture: skip GetAliasMembership against s4.
It returns NT_STATUS_INTERNAL_DB_CORRUPTION for unknown sids and I could not
figure out why.
Guenther
(cherry picked from commit dc4c41124228878d2c29fe2b240b23eb49631fe1)
(cherry picked from commit 0d5db6d06bfbc7f52bf3fa61468f6220d63bccc8)
commit 21b63da74ba0332ffe862293835b5885ddf8d528
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 17 15:34:22 2009 +0100
s4-smbtorture: add a samr_GetAliasMembership test to RPC-SAMR.
Guenther
(cherry picked from commit 619ad0c6ecf88a861ad1a1e1d5564bd1f91855cc)
(cherry picked from commit 2365f868a08503945e92193c18eec5fb1ae2dc93)
commit e76c8b5378ef794eb927f1c4a0ad4eecd920d273
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 17 00:13:23 2009 +0100
tdbtool: avoid using c++ reserved words.
Guenther
(cherry picked from commit a23084e1e89a44cf692f6e205263ee53371b80c9)
(cherry picked from commit 600b632d7bf04998e5078153553c48953475202b)
commit df0d2bf0b1309bfe24dcf115766a1c31a19f4cff
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:33:41 2009 +0100
s4-smbtorture: fix smbtorture after setprinter IDL fixes.
Guenther
(cherry picked from commit a9689bb755b4fd22a8c2b651aa90b2f74188edcb)
(cherry picked from commit c79320978f3cdfb698fe7eb060d1678bdac01caa)
commit 1ff1ab8c1e86718ca70353b0a757db6258f8e5bb
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:33:13 2009 +0100
s3-spoolss: fix rpcclient after setprinter IDL fixes.
Guenther
(cherry picked from commit 31cf2b086a9275955b0480b4b9035dc12671761d)
(cherry picked from commit 598d362527a3de7927f905f2a8fa8aba51fefb7d)
commit 794bae1867c30a1d2b74a3db9dbd071c5db88854
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:32:35 2009 +0100
spoolss: more mork on SetPrinterInfo() levels.
Guenther
(cherry picked from commit be95cb6f8357334af08d1502910a429328b85bc5)
(cherry picked from commit 33f47d45f348546313ee743ed6ad48fbcab50e98)
commit afd1ef486c3df0d276dc26bbe0d4133943a47be5
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:39:00 2009 +0100
spoolss: add spoolss_DriverInfo7.
Guenther
(cherry picked from commit 64e588f868c23bf4c836f4029a285885db5d087e)
(cherry picked from commit 3cef8b4862c2564ef5e856aa00bbdaa611d2a57f)
commit c8b9660951e44e4b53e492a4b28ce2be9e41c4ac
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 15:59:04 2009 +0100
s3-pdbedit: allow to call "pdbedit -N description -u user" without specifiyng "-r".
Guenther
(cherry picked from commit d9f93224bdd2b02a8c96667009e43406b47d4c35)
(cherry picked from commit 2f947224076315ebc983e38f993c452c52beb5a7)
commit e5f37cd4579be66187ed9a416e8cdff0cbda0406
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 15 22:26:39 2009 +0100
s4-smbtorture: run GetPrinterDriver2 tests against each printer's driver.
Guenther
(cherry picked from commit 308b50a7bb07a7db6d2119f9ff08f33fce922562)
(cherry picked from commit ea7442720fbde39817abf9a6f312a940d634e6d8)
commit cf8907ced2481857f7388cb0517eb93901ef5ada
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 18:27:54 2009 -0800
Always map EMFILE to ERRDOS, ERRnofids, *NOT* NT_STATUS_TOO_MANY_OPENED_FILES.
This is what W2KR3 does for NTCreateX and openX calls. May be the correct fix
for bug 6837 - "Too many open files" when trying to access large number of files.
Jeremy.
(cherry picked from commit 6585621d367d997b79ffb99e0a8743766e6ff6d2)
(cherry picked from commit e315849277ef307018d6dc93a1df04792f36a435)
commit 082ad52b1ebe26223a7a2b49b7094d5d6eb9b1ac
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 18:26:53 2009 -0800
Vector correctly through reply_openerror() (which uses the same logic).
Jeremy.
(cherry picked from commit d1a5387580182884d3cc875f3f404ff8377c1e92)
(cherry picked from commit 9bef3b2030a9210acc38fd0102fb4274f34ab296)
commit c3ea51d61f61374de968bba49a3d04acff9229dd
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 16:50:35 2009 -0800
Update default with correct value. Add a note about Win7 behavior
here.
Jeremy.
(cherry picked from commit fbf4923cad17b55bd7a647bf2300b28e23b8cdbb)
(cherry picked from commit 8f8c7976f07879036e76fdd9de9d5a42cc57324e)
commit 681f633331d410a20474780f977311595ab85ba1
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 16:14:30 2009 -0800
Fix bug #6939 - mangling method = hash breaks long filenames.
We were returning the wrong sense of the bool. must_mangle()
has to return !NT_STATUS_IS_OK, not NT_STATUS_IS_OK.
Jeremy.
(cherry picked from commit 159c1b860aa4d61acf765c849c63e3bee9f57ad3)
(cherry picked from commit 15747edfe49e9c7909022bd438760c441241fffa)
commit 5d6a23ced49656323c51376f43b9b747e46a0127
Author: Jonas Gorski <jonas.gorski+samba at gmail.com>
Date: Thu Dec 17 11:32:21 2009 +0100
s3: Fix bug 6992, make test for getgrouplist cacheable
(cherry picked from commit f0f4e5b9c3b8c640bf1829a9a12bcdfa7d2c153a)
commit 2771f3c1619d7cdf61c70a0e736afbdcbe744655
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 16 10:20:34 2009 -0800
Final part of the fix for 6837 - "Too many open files" when trying to access large number of files
Win7 needs a min of 16k file handles to work against a
server.
Jeremy.
(cherry picked from commit 776b5192423d02cbdb861c7cb4af325d4958db34)
commit fe2f233f8007f0d5d1522c5275fe6ba387dfef93
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 16 10:09:11 2009 -0800
Add helpful debug of DACL for errors on ACL access.
Jeremy.
(cherry picked from commit b8c87c43dd9309b3d2fed5d5db5b38057a8e4e90)
(cherry picked from commit 88d2eca3b3b305a569fdd56936c8a92ee5843e4b)
commit 59cffb55e1c45a4e08f83dc05f7b52adbd55ddc1
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 15 18:03:47 2009 -0800
Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned attributes by protocol level.
This makes us consistant in returning DOS attrs across all replies. Tested on OS/2 by Günter Kukkukk.
Jeremy.
(cherry picked from commit e831e3ee32ba3f1f492f9918d74a302731fa79a9)
(cherry picked from commit 4c733f139ee93276a410f6470f4c11c4bf75a24a)
commit 0615b2dfa2add9b427700b2a0f2f7938c54e977b
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 15 14:01:43 2009 +0100
s3: Fix _samr_GetAliasMembership for results with 0 rids
(cherry picked from commit 526ceefc9d2df46b5b172a15d196f1f1de6ff6c7)
commit a498121bdb5a0a77a5012a66c384640028b6d931
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Sat Dec 5 21:44:15 2009 +0200
talloc: Fix write behind memory block
If ALWASY_REALLOC is defined and we are to 'shrink' memory block,
memcpy() will write outside memory just allocated.
Signed-off-by: Andrew Tridgell <tridge at samba.org>
(cherry picked from commit 8efabcc8a5dcd83deed8ef8e17826a1d347e6d83)
(cherry picked from commit dd38f159860bc3d7a454992ce56ea3500e81aed4)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 67 +++++-
docs-xml/manpages-3/pam_winbind.8.xml | 6 +-
docs-xml/manpages-3/pam_winbind.conf.5.xml | 190 ++++++++++++++
docs-xml/smbdotconf/tuning/maxopenfiles.xml | 21 +-
lib/replace/snprintf.c | 1 +
lib/talloc/configure.ac | 2 +-
lib/talloc/release-script.sh | 48 ----
lib/talloc/script/abi_checks.sh | 27 +--
lib/talloc/script/mksyms.awk | 19 +--
lib/talloc/script/mksyms.sh | 19 ++-
lib/talloc/script/release-script.sh | 58 +++++
lib/talloc/talloc.c | 2 +-
lib/talloc/talloc.exports | 24 +-
lib/talloc/talloc.signatures | 51 ++--
lib/tdb/common/open.c | 28 ++-
lib/tdb/common/tdb.c | 30 +++
lib/tdb/common/transaction.c | 19 ++
lib/tdb/configure.ac | 2 +-
lib/tdb/docs/README | 13 +-
lib/tdb/include/tdb.h | 5 +-
lib/tdb/pytdb.c | 4 +-
lib/tdb/python/tests/simple.py | 9 +
lib/tdb/release-script.sh | 2 +-
lib/tdb/rules.mk | 5 -
lib/tdb/tools/tdbdump.c | 4 +-
lib/tdb/tools/tdbtool.c | 17 +-
lib/tevent/tevent_signal.c | 76 +++---
lib/tsocket/tsocket.c | 2 +-
lib/tsocket/tsocket.h | 17 ++-
lib/tsocket/tsocket_bsd.c | 56 ++++-
lib/tsocket/tsocket_guide.txt | 317 +++++++++++++-----------
lib/tsocket/tsocket_helpers.c | 2 +-
lib/tsocket/tsocket_internal.h | 2 +-
librpc/gen_ndr/ndr_spoolss.c | 364 +++++++++++++++++++++------
librpc/gen_ndr/ndr_spoolss.h | 6 +
librpc/gen_ndr/spoolss.h | 25 ++-
librpc/idl/spoolss.idl | 25 ++-
source3/configure.in | 6 +-
source3/include/local.h | 24 +-
source3/include/proto.h | 2 -
source3/include/smb_macros.h | 1 -
source3/libsmb/cliconnect.c | 1 +
source3/rpc_server/srv_samr_nt.c | 8 +
source3/rpcclient/cmd_spoolss.c | 4 +-
source3/smbd/dosmode.c | 28 ++-
source3/smbd/error.c | 56 ++++-
source3/smbd/mangle_hash.c | 5 +-
source3/smbd/nttrans.c | 7 +-
source3/smbd/open.c | 12 +-
source3/smbd/reply.c | 20 +-
source3/smbd/trans2.c | 15 +-
source3/utils/pdbedit.c | 6 +-
source4/torture/rpc/samr.c | 51 ++++
source4/torture/rpc/spoolss.c | 70 ++++--
54 files changed, 1348 insertions(+), 533 deletions(-)
create mode 100644 docs-xml/manpages-3/pam_winbind.conf.5.xml
delete mode 100755 lib/talloc/release-script.sh
create mode 100755 lib/talloc/script/release-script.sh
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d165113..84d4680 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,9 +1,9 @@
- =================================
- Release Notes for Samba 3.5.0pre2
- December 15, 2009
- =================================
+ ================================
+ Release Notes for Samba 3.5.0rc1
+ January 7, 2010
+ ================================
-This is the second preview release of Samba 3.5. This is *not*
+This is the first release candidate of Samba 3.5. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -73,7 +73,7 @@ smb.conf changes
New configure options
---------------------
---enable-external-libtalloc Enable external tdb
+--enable-external-libtdb Enable external tdb
--enable-netapi Turn on netapi support
--enable-pthreadpool Enable pthreads pool helper support
--with-cifsumount Include umount.cifs (Linux only) support
@@ -97,6 +97,61 @@ o Stefan Metzmacher <metze at samba.org>
* Implement the new SMB2 protocol (experimental).
+Changes since 3.5.0pre2
+-----------------------
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 6837: Fix "Too many open files" when trying to access large number of
+ files with Windows 7.
+ * BUG 6939: Fix long filenames when "mangling method" is set to "hash".
+ * Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned
+ attributes by protocol level.
+ * Vector correctly through reply_openerror() (which uses the same logic).
+
+
+o Günther Deschner <gd at samba.org>
+ * Allow to call "pdbedit -N description -u user" without specifiyng "-r".
+ * Add spoolss_DriverInfo7.
+ * Fix rpcclient after setprinter IDL fixes.
+
+
+o Jonas Gorski <jonas.gorski+samba at gmail.com>
+ * BUG 6992: make test for getgrouplist cacheable.
+
+
+o Volker Lendecke <vl at samba.org>
+ * Fix _samr_GetAliasMembership for results with 0 rids.
+ * Fix an error case in cli_negprot.
+
+
+o Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
+ * Fix write behind memory block in libtalloc.
+
+
+o Simo Sorce <idra at samba.org>
+ * Change the way mksysms work in libtalloc.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * Add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
+ to tsocket.
+ * Always set tdb->tracefd to -1 to be safe on goto fail in libtdb.
+ * Add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior.
+
+
+o Peter Rosin <peda at lysator.liu.se>
+ * Output %p as unsigned in snprintf replacement.
+
+
+o Ronnie Sahlberg <ronniesahlberg at gmail.com>
+ * New attempt at TDB transaction nesting allow/disallow.
+
+
+o Kirill Smelkov <kirr at mns.spb.ru>
+ * Remove swig stuff from libtdb.
+ * Reset tdb->fd to -1 in tdb_close() in libtdb.
+
+
Changes since 3.5.0pre1
-----------------------
diff --git a/docs-xml/manpages-3/pam_winbind.8.xml b/docs-xml/manpages-3/pam_winbind.8.xml
index ae29c40..47cf998 100644
--- a/docs-xml/manpages-3/pam_winbind.8.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -62,7 +62,9 @@
file situated at
<filename>/etc/security/pam_winbind.conf</filename>. Options
from the PAM configuration file take precedence to those from
- the configuration file.
+ the configuration file. See
+ <citerefentry><refentrytitle>pam_winbind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for further details.
<variablelist>
@@ -231,6 +233,8 @@
<refsect1>
<title>SEE ALSO</title>
<para><citerefentry>
+ <refentrytitle>pam_winbind.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>, <citerefentry>
<refentrytitle>wbinfo</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>, <citerefentry>
<refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/manpages-3/pam_winbind.conf.5.xml b/docs-xml/manpages-3/pam_winbind.conf.5.xml
new file mode 100644
index 0000000..113515c
--- /dev/null
+++ b/docs-xml/manpages-3/pam_winbind.conf.5.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="pam_winbind.conf.5">
+
+<refmeta>
+ <refentrytitle>pam_winbind.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">5</refmiscinfo>
+ <refmiscinfo class="version">3.6</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>pam_winbind.conf</refname>
+ <refpurpose>Configuration file of PAM module for Winbind</refpurpose>
+</refnamediv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This configuration file is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>
+ pam_winbind.conf is the configuration file for the pam_winbind PAM
+ module. See
+ <citerefentry><refentrytitle>pam_winbind</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ for further details.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>SYNOPSIS</title>
+
+ <para>
+ The pam_winbind.conf configuration file is a classic ini-style
+ configuration file. There is only one section (global) where
+ various options are defined.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <para>
+
+ pam_winbind supports several options which can either be set in
+ the PAM configuration files or in the pam_winbind configuration
+ file situated at
+ <filename>/etc/security/pam_winbind.conf</filename>. Options
+ from the PAM configuration file take precedence to those from
+ the pam_winbind.conf configuration file.
+
+ <variablelist>
+
+ <varlistentry>
+ <term>debug = yes|no</term>
+ <listitem><para>Gives debugging output to syslog. Defaults to "no".</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>debug_state = yes|no</term>
+ <listitem><para>Gives detailed PAM state debugging output to syslog. Defaults to "no".</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>require_membership_of = [SID or NAME]</term>
+ <listitem><para>
+ If this option is set, pam_winbind will only succeed if the user is a member of the given SID or NAME. A SID
+ can be either a group-SID, an alias-SID or even an user-SID. It is also possible to give a NAME instead of the
+ SID. That name must have the form: <parameter>MYDOMAIN\\mygroup</parameter> or
+ <parameter>MYDOMAIN\\myuser</parameter>. pam_winbind will, in that case, lookup the SID internally. Note that
+ NAME may not contain any spaces. It is thus recommended to only use SIDs. You can verify the list of SIDs a
+ user is a member of with <command>wbinfo --user-sids=SID</command>. This setting is empty by default.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>try_first_pass = yes|no</term>
+ <listitem><para>
+ By default, pam_winbind tries to get the authentication token from a previous module. If no token is available
+ it asks the user for the old password. With this option, pam_winbind aborts with an error if no authentication
+ token from a previous module is available. If a primary password is not valid, PAM will prompt for a password.
+ Default to "no".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>krb5_auth = yes|no</term>
+ <listitem><para>
+
+ pam_winbind can authenticate using Kerberos when winbindd is
+ talking to an Active Directory domain controller. Kerberos
+ authentication must be enabled with this parameter. When
+ Kerberos authentication can not succeed (e.g. due to clock
+ skew), winbindd will fallback to samlogon authentication over
+ MSRPC. When this parameter is used in conjunction with
+ <parameter>winbind refresh tickets</parameter>, winbind will
+ keep your Ticket Granting Ticket (TGT) uptodate by refreshing
+ it whenever necessary. Defaults to "no".
+
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>krb5_ccache_type = [type]</term>
+ <listitem><para>
+
+ When pam_winbind is configured to try kerberos authentication
+ by enabling the <parameter>krb5_auth</parameter> option, it can
+ store the retrieved Ticket Granting Ticket (TGT) in a
+ credential cache. The type of credential cache can be set with
+ this option. Currently the only supported value is:
+ <parameter>FILE</parameter>. In that case a credential cache in
+ the form of /tmp/krb5cc_UID will be created, where UID is
+ replaced with the numeric user id. Leave empty to just do
+ kerberos authentication without having a ticket cache after the
+ logon has succeeded. This setting is empty by default.
+
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>cached_login = yes|no</term>
+ <listitem><para>
+ Winbind allows to logon using cached credentials when <parameter>winbind offline logon</parameter> is enabled. To use this feature from the PAM module this option must be set. Defaults to "no".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>silent = yes|no</term>
+ <listitem><para>
+ Do not emit any messages. Defaults to "no".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>mkhomedir = yes|no</term>
+ <listitem><para>
+ Create homedirectory for a user on-the-fly, option is valid in
+ PAM session block. Defaults to "no".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>warn_pwd_expire = days</term>
+ <listitem><para>
+ Defines number of days before pam_winbind starts to warn about passwords that are
+ going to expire. Defaults to 14 days.
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </para>
+
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry>
+ <refentrytitle>pam_winbind</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
+ <refentrytitle>wbinfo</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>, <citerefentry>
+ <refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
+ <refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry></para>
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3 of Samba.</para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>
+ The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed by
+ the Samba Team as an Open Source project similar to the way the Linux kernel is developed.
+ </para>
+
+ <para>This manpage was written by Jelmer Vernooij and Guenther Deschner.</para>
+
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/smbdotconf/tuning/maxopenfiles.xml b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
index ea0a339..8c1a49f 100644
--- a/docs-xml/smbdotconf/tuning/maxopenfiles.xml
+++ b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
@@ -4,17 +4,20 @@
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This parameter limits the maximum number of
+ <para>This parameter limits the maximum number of
open files that one <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> file
- serving process may have open for a client at any one time. The
- default for this parameter is set very high (10,000) as Samba uses
- only one bit per unopened file.</para>
-
- <para>The limit of the number of open files is usually set
- by the UNIX per-process file descriptor limit rather than
+ <manvolnum>8</manvolnum></citerefentry> file
+ serving process may have open for a client at any one time. The
+ This parameter can be set very high (16404) as Samba uses
+ only one bit per unopened file. Setting this parameter lower than
+ 16404 will cause Samba to complain and set this value back to
+ the minimum of 16404, as Windows 7 depends on this number of
+ open file handles being available.</para>
+
+ <para>The limit of the number of open files is usually set
+ by the UNIX per-process file descriptor limit rather than
this parameter so you should never need to touch this parameter.</para>
</description>
-<value type="default">10000</value>
+<value type="default">16404</value>
</samba:parameter>
diff --git a/lib/replace/snprintf.c b/lib/replace/snprintf.c
index c54d721..bca7742 100644
--- a/lib/replace/snprintf.c
+++ b/lib/replace/snprintf.c
@@ -504,6 +504,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in
break;
case 'p':
cnk->type = CNK_PTR;
+ cnk->flags |= DP_F_UNSIGNED;
break;
case 'n':
cnk->type = CNK_NUM;
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index a169f79..c1b1d2e 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.50)
-AC_INIT(talloc, 2.0.0)
+AC_INIT(talloc, 2.0.1)
AC_CONFIG_SRCDIR([talloc.c])
AC_SUBST(datarootdir)
AC_CONFIG_HEADER(config.h)
diff --git a/lib/talloc/release-script.sh b/lib/talloc/release-script.sh
deleted file mode 100755
index 6b6c0e7..0000000
--- a/lib/talloc/release-script.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "" ]; then
- echo "Please provide version string, eg: 1.2.0"
- exit 1
-fi
-
-if [ ! -d "lib/talloc" ]; then
- echo "Run this script from the samba base directory."
- exit 1
-fi
-
-git clean -f -x -d lib/talloc
-git clean -f -x -d lib/replace
-
-curbranch=`git-branch |grep "^*" | tr -d "* "`
-
-version=$1
-strver=`echo ${version} | tr "." "-"`
-
-# Checkout the release tag
-git branch -f talloc-release-script-${strver} talloc-${strver}
-if [ ! "$?" = "0" ]; then
- echo "Unable to checkout talloc-${strver} release"
- exit 1
-fi
-
-git checkout talloc-release-script-${strver}
-
-# Test configure agrees with us
-confver=`grep "^AC_INIT" lib/talloc/configure.ac | tr -d "AC_INIT(talloc, " | tr -d ")"`
-if [ ! "$confver" = "$version" ]; then
- echo "Wrong version, requested release for ${version}, found ${confver}"
- exit 1
-fi
-
-# Now build tarball
-cp -a lib/talloc talloc-${version}
-cp -a lib/replace talloc-${version}/libreplace
-pushd talloc-${version}
-./autogen.sh
-popd
-tar cvzf talloc-${version}.tar.gz talloc-${version}
-rm -fr talloc-${version}
-
-#Clean up
-git checkout $curbranch
-git branch -d talloc-release-script-${strver}
diff --git a/lib/talloc/script/abi_checks.sh b/lib/talloc/script/abi_checks.sh
index ba60ed0..66c4e60 100755
--- a/lib/talloc/script/abi_checks.sh
+++ b/lib/talloc/script/abi_checks.sh
@@ -33,6 +33,7 @@ LANG=C; export LANG
LC_ALL=C; export LC_ALL
LC_COLLATE=C; export LC_COLLATE
+exit_status=0
script=$0
dir_name=$(dirname ${script})
@@ -58,34 +59,22 @@ signatures_file_check=${signatures_file}.check
${dir_name}/mksyms.sh awk ${exports_file_check} ${headers} 2>&1 > /dev/null
+cat ${headers} | ${dir_name}/mksigs.pl | sort| uniq > ${signatures_file_check} 2> /dev/null
-cat ${headers} | ${dir_name}/mksigs.pl > ${signatures_file_check} 2> /dev/null
-
-normalize_exports_file() {
- filename=$1
- cat ${filename} \
- | sed -e 's/^[ \t]*//g' \
- | sed -e 's/^$//g' \
- | sed -e 's/^#.*$//g' \
- | sort | uniq > ${filename}.sort
-}
-
-normalize_exports_file ${exports_file}
-normalize_exports_file ${exports_file_check}
-
-normalize_exports_file ${signatures_file}
-normalize_exports_file ${signatures_file_check}
-
-diff -u ${exports_file}.sort ${exports_file_check}.sort
+diff -u ${exports_file} ${exports_file_check}
if test "x$?" != "x0" ; then
echo "WARNING: possible ABI change detected in exports!"
+ let exit_status++
else
echo "exports check: OK"
fi
-diff -u ${signatures_file}.sort ${signatures_file_check}.sort
+diff -u ${signatures_file} ${signatures_file_check}
if test "x$?" != "x0" ; then
echo "WARNING: possible ABI change detected in signatures!"
+ let exit_status++
else
echo "signatures check: OK"
fi
+
+exit $exit_status
diff --git a/lib/talloc/script/mksyms.awk b/lib/talloc/script/mksyms.awk
index ca14da0..8775faf 100644
--- a/lib/talloc/script/mksyms.awk
+++ b/lib/talloc/script/mksyms.awk
@@ -8,25 +8,12 @@
#
BEGIN {
inheader=0;
- current_file="";
- print "#"
- print "# This file is automatically generated with \"make symbols\". DO NOT EDIT "
- print "#"
- print "{"
- print "\tglobal:"
}
END {
- print""
- print "\tlocal: *;"
- print "};"
}
{
- if (FILENAME!=current_file) {
- print "\t\t# The following definitions come from",FILENAME
--
Samba Shared Repository
More information about the samba-cvs
mailing list