[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-2-111-g7bca88a
Karolin Seeger
kseeger at samba.org
Fri Mar 27 14:02:18 GMT 2009
The branch, v3-3-stable has been updated
via 7bca88a1ae2145a9983fcb81e4e926341c5ebd5d (commit)
via d165ae67cb074070c211ee034e5bdc7565c6315c (commit)
via 6ed0324313ab802e22ef635ddc21899b8d297d7c (commit)
via 74603440ec8774167c45107d156efe10ac19a0f8 (commit)
via cb7c54230a00215c30d9ea5b0cdfb0837d3ee47d (commit)
via e26d948fa6efd43cd734494744ee4cd5b7833fea (commit)
via ff258d7afb5feaf60e537ec647a1835f18bb8a1f (commit)
via edb112fe65458ffe765bdb6cc34a4f7d7c106f98 (commit)
via 87db788f029b52cbe9896b240a9d5251372600b7 (commit)
via 90afa009432fe4ad7869a9bd259f9707176ea2c5 (commit)
via ed7e062d27c8100ebcd6418bb3a03a27e62316cf (commit)
via 8824f490f7d0a46544cb0f2397cd2758cba460dd (commit)
via 26516fb613fd1ae8373c0620af7bce563bc9d678 (commit)
via c49d71eef7b293ccb46e3f85aca96a13184646a4 (commit)
via 025c17af90a7f907822ef2f044ec143972d670e8 (commit)
via 239aad47043b34fbbe0d9356be0b3320bbbd32e9 (commit)
via f90a548cea6f86df7d78dcb7eb1e89684335915c (commit)
via 85e7d775dd4f916dd64d6d41ba7df74f2c0fde14 (commit)
via a866c40c15a128725114f5e9345f6c1c90bd4c2f (commit)
via 35832c41fdcbe25aadd4f3ca9885257b872812de (commit)
via 6d704868880be3a60bfcb2bd202c3de4de2de060 (commit)
via 6ac672c7322a0e606ee14eaa522a396fe79b8e13 (commit)
via 47b96596c8f8883b21edf787b9550350ab1f74a4 (commit)
via 814da9e0b9520456618cd75e030697433d9e1322 (commit)
via 02daed33ef26e48be2245cbdf53d63ebe20a3ab6 (commit)
via 4145668c3e56751058a0297ed8c8f7b206f1fdf9 (commit)
via 83ea0c2a3656f6dd50e71ab706eeedc892c9a8ee (commit)
via c5dba69179d752b81e5d06f5df3a82f1d08b3e70 (commit)
via 0de7a08b4c2bb97fd002baea46fb93824d9fa89f (commit)
via c38db71045791fbb41f8652801f314d91ef34a64 (commit)
via c08abca4f0f8c5440471b032565b9bfac9d7d568 (commit)
via 5362a49ea3e248063b43f91e229b3faf50567750 (commit)
via 502991d43dfbcb783117b48a129707bec58c163f (commit)
via 60911e9c61f5f54c162c0fd66dd0c743a1506a04 (commit)
via 5fd43b9399250b4d4946db6c97f3cad3fdc18f72 (commit)
via 8e0f33bb71f665441f51c7bad445c3a02f039712 (commit)
via 6caca3278b0b19ad25253dc181cdb24ef54e667d (commit)
via 44c0273282f92d95d62f01a28674910b25e6514e (commit)
via 12383abc119ea1de4c19072af49535b9251e82d1 (commit)
via 002383ab3e135437d013450f073848658d04aabd (commit)
via e93b41a2725e0322483ca712ffe19a944458a55f (commit)
via dad0a93bbda4f416963cae44c88cecd576ce0449 (commit)
via e5aeda20e754fcaf58eb0e924ba85d340de00931 (commit)
via 859b5db022541c67cc92a5766b8f10ac1137d2db (commit)
via 85cc48151982256bc54abb707380c725f12656c3 (commit)
via 240af281009c5ca4166ed283f8517bc698007eda (commit)
via c3ece39a7bc86ed1f9812ede90c7009e8ed726eb (commit)
via 7a09208f62d9ebd988a0d3fec470607d7d7e3f21 (commit)
via fea0bc19accceeea513f9f2534cc3c26f864666f (commit)
via 1386844f2c985ad88861000b0fd9cef478ea459f (commit)
via c0868398ca5ce7e161ca83bf1fa14842ddb6ae1c (commit)
via bc4d02334060da8d2d8e64bf269f1f6f46ce023c (commit)
via 74c6495d76b78789a4fba38b9a977fe61a855f75 (commit)
via 56cf00d056154553c25feb65f428d5bdb68747fe (commit)
via 3db5490678919a3d966934db4a4eeae1d0e5fc85 (commit)
via a77ffb385c3d06574458ef18f736196ede4a6c05 (commit)
via 583a865d067d7b9542d7aec6d3cb7e8c49637d1e (commit)
via cee5f97d910645a235ede462bd4edcc21fcc0b81 (commit)
via ecc98b7430ac4ef14040837d7b772955e7640d16 (commit)
via 0263c1f7959fcefde38e29fee3942740e546afc0 (commit)
via 80e4fa5545e6d455fe0a324248b42f616a00132f (commit)
via c09dafa872f3298df406c992abb346647911170d (commit)
via 0455bb2fad39027198f1f108ee2a7d56aeed19bc (commit)
via 8d9623056e934ec67f671561f0b88815b50b3cc9 (commit)
via 13388e2709a2316966d05e5458d513750db4548f (commit)
via 468c121c6e0a1984a3b8ef13826d0694ada7430c (commit)
via 85a839665d0649ea6c8e4a3e774e30476cb8df8e (commit)
via 2cbd526e4e746c4a505c30b9d01e0fe755cf5fb5 (commit)
via 9889720d204e27cceb2ef9d26a3647e0bc3b480a (commit)
via 8f6377ce55d4f2170d2fe1aaf13437f417f2183f (commit)
via a7a672ce0bd98514532845727882c4e0a96cd5f8 (commit)
via 209eee39a31dda71b1ccf2589db9af82d910cdb2 (commit)
via dc003037b920a6e0e3d32c291e17e0e0a02a0730 (commit)
via eb928d4c8a573bb3010357c084ae0f9e95cd41a8 (commit)
via b80af20eb310d63263fc77b3556b0a65cfd46d52 (commit)
via 24eb5eb954b66781fffe5c362e173d63ab700a7a (commit)
via 9bbece86506aa4af291c63b8b6f7ef43bf4d4a56 (commit)
via 0439f1c45e75771a6b0ad4bf7291c7feda179902 (commit)
via 72f05fd39cd8e6fecdf5fb5253861315867e5f29 (commit)
via 43ccd3180aca89ca0f0efefdcdb26f2f436a79c1 (commit)
via 14ba88e8a90778709958a79d7efe79ee377cb240 (commit)
via 1b2b26204ab7edddd73a97047f37e36e616c773c (commit)
via 633c1de12c9abf845dc4295dac1718d6ff380fcd (commit)
via 13321351d2184146a40f36f0085cc66181c62926 (commit)
via eb430f51551f2986c7b30d25edeba64ea01b5109 (commit)
via 18bf7cfb775c1d3f368c9034b5f3691d30d46d76 (commit)
via 8ddbb23788f6096f2b255a959344933a7ed33f63 (commit)
via 93eb8cfb1064387a14bc02aa18d79ccf2a888330 (commit)
via 28c94a0630bac04d5c81317af41bc3c5363aa0ee (commit)
via ca2de267334cc6da7b006ff544cdf63ea5b49655 (commit)
via 9803069032aa7710932b6fd905631dc2c9d96067 (commit)
via a5b1d44db7fbdc974d05ad7f50b1eaf4cdddfe5e (commit)
via 6eeb4b2b04f190cef7733bf85443488559d017d8 (commit)
via 46f5b0b4169e22983e3cf2e035f4421a34cfe337 (commit)
via 5c8b18f0d5ab6c938833af61cc079ececd6b53a8 (commit)
via a33308cc8ac024a190b92ca8e8dba92f5d1db7bd (commit)
via 71f516624b98e623e47b8eca1c7da22a5381980e (commit)
via 8139266db4ec881b88d2727d77486f8118c9c545 (commit)
via 3808849499feb58f64f47b6b99001754cfeaaf8e (commit)
via b8ce351d9c45d788e11b6ae7d66650484b016aeb (commit)
via be929d030bd5845aa05f940fd20035dc6e08fdad (commit)
via 4d33970f5d071fd971a75918edb672e4f33b1687 (commit)
via 727b20ac9b25ebe4ff37d68f88a6a260d5fe2535 (commit)
via fd2420d28d57569a676004875879c00461ec2436 (commit)
via 5a7f0dc653cffd8a364835122da61ebaa454b4cd (commit)
via ad32f18adf1cfee6fcb5cc3feef6ff0cf71d19bc (commit)
via e05edadd14052a8fa0ffcc536ba13d3e2b8d8cb0 (commit)
via ce9ba534007ba1eab938be23a1c2c2873a5dd596 (commit)
via aaa74115865a774ad9e5c02449bb69e666639956 (commit)
via 815be319318b2968cde42b49453d17bd9cb428d0 (commit)
via 8202c42e4b1cd08d0845496b0211550e5a0e5867 (commit)
from d277da2671f3be4e74be34d6b91b29e7ed01c195 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 7bca88a1ae2145a9983fcb81e4e926341c5ebd5d
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Mar 27 15:01:04 2009 +0100
WHATSNEW: Update changes since 3.3.2.
Karolin
(cherry picked from commit 81d7d62c339c836ddd7053b5b3624ba36a2c0174)
commit d165ae67cb074070c211ee034e5bdc7565c6315c
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 26 15:33:39 2009 -0700
Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy
(cherry picked from commit 05c038fb86555e2ee26d051ca002eeac1c1669ce)
commit 6ed0324313ab802e22ef635ddc21899b8d297d7c
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 26 12:13:28 2009 -0700
Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs to run elections
Fix logic bug that causes nmbd to wait 5 minutes before
looking for a master browser. This one is *old* :-). Thanks
for Simo for bugging me on this.
Jeremy.
(cherry picked from commit 15718a5d3edc3a65256533dd898ef582ded7f833)
commit 74603440ec8774167c45107d156efe10ac19a0f8
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Mar 26 11:28:37 2009 -0700
s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
(cherry picked from commit e452955c077a761cbadd27bede8d6844edbb2e5e)
commit cb7c54230a00215c30d9ea5b0cdfb0837d3ee47d
Author: Volker Lendecke <vl at samba.org>
Date: Thu Mar 26 12:24:50 2009 +0100
Fix a scary "fill_share_mode_lock failed" message
To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
however a perfectly valid case in get_file_infos() when the file is not open.
Change the corresponding debug message to level 10 and explain more.
(cherry picked from commit 74efc72bca5707ff35df9282c843d62c4cf331c3)
commit e26d948fa6efd43cd734494744ee4cd5b7833fea
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 26 10:35:55 2009 +0100
s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong information.
Guenther
(cherry picked from commit fe102f53d1ac6f888bd559eaf52b6a166d5f78d3)
commit ff258d7afb5feaf60e537ec647a1835f18bb8a1f
Author: Volker Lendecke <vl at samba.org>
Date: Thu Mar 26 10:13:50 2009 +0100
Avahi disables a timer by tv=NULL in avahi_timeout_update(), do not crash
(cherry picked from commit 57301725e1c92676d3dbb62c81a41507ed1adb7b)
commit edb112fe65458ffe765bdb6cc34a4f7d7c106f98
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 25 15:58:20 2009 +0100
s3-libnet: Fix Bug #6193: avoid messing with sync_context in libnet_samsync_delta().
We absolutely need to avoid messing with the sync_context as that breaks the
stream of replication data coming from the DC (only replicates ~350 instead of
~4000 groups).
Guenther
(cherry picked from commit e3f7057b0942793543c215ab45176c4280bd7d51)
(cherry picked from commit efa7f6bff9bec89214dab368ff5efc61fa1cc212)
commit 87db788f029b52cbe9896b240a9d5251372600b7
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 24 15:25:56 2009 -0700
Fix two memleaks in the encryption code
ntlmssp_seal_packet creates its own signature data blob, which we then
have to free.
Jeremy, please check and merge appropriately (Yes, I'm asking you to do the
janitor work, I want you to *look* at this :-))
Volker
(cherry picked from commit 4d0cfb46e449e85646e05df2c4efe7dffa670edd)
commit 90afa009432fe4ad7869a9bd259f9707176ea2c5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 24 12:36:10 2009 -0700
s3:smbd: if we allow trans2 on the IPC$ share, then we have to allow transs2 too.
Otherwise we'll confuse the client signing engine, when we reply an error to each transs2.
metze
(cherry picked from commit 97cdf68a42bd9d5ec312151bcca9830228caeee1)
commit ed7e062d27c8100ebcd6418bb3a03a27e62316cf
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 24 11:07:16 2009 +0100
Fix bug 6097
A client sent a SID with authority 0 and 0 sub-authorities. W2k3 replies with
NT_STATUS_INVALID_SID, even if other SIDs in the list are valid.
Thanks to Pavel <wylda at volny.cz> for the bug report!
(cherry picked from commit c38c80fcd3f63e60450fd95c27d842082e8e00fd)
commit 8824f490f7d0a46544cb0f2397cd2758cba460dd
Author: Björn Jacke <bj at sernet.de>
Date: Mon Mar 23 12:26:03 2009 +0100
s3:dsgetdcname: use parentheses in if condition to make negation clear
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 87b428e424e2e3cca975ecd0efed327e72950a1d)
(cherry picked from commit deba6c883965f99bf70744a5a4fb8124a73910fd)
commit 26516fb613fd1ae8373c0620af7bce563bc9d678
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 22 15:59:33 2009 +0100
Use avahi to register _smb._tcp in smbd
(cherry picked from commit b0ad52693d4ee548a2d3870e28f6499f827bed31)
commit c49d71eef7b293ccb46e3f85aca96a13184646a4
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 20 14:55:05 2009 +0100
Add event avahi binding
(cherry picked from commit cb18c1686b3cd20f0535458f8cee24a772560350)
commit 025c17af90a7f907822ef2f044ec143972d670e8
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 20 14:53:10 2009 +0100
Add avahi detection to configure
(cherry picked from commit dcf1df139f02d54f040e0e649f6b9bf388fdfb00)
commit 239aad47043b34fbbe0d9356be0b3320bbbd32e9
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 20 14:39:19 2009 +0100
Disable dns_sd by default
(cherry picked from commit 28abdd1ee9559bf53cbbc3372d947cbb77ea1cd5)
commit f90a548cea6f86df7d78dcb7eb1e89684335915c
Author: Björn Jacke <bj at sernet.de>
Date: Mon Mar 23 13:02:57 2009 +0100
=?utf-8?q?=D1=953/winbind=5Fpam:=20fix=20gcc=204.4=20compile=20warning
=20(cherry=20picked=20from=20commit=20f4aec7b5907065a2f48d1b19065c6673aff6a190)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit 86abc613f119e7685f0664033317b5d191cc88e8)
commit 85e7d775dd4f916dd64d6d41ba7df74f2c0fde14
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 22 13:14:15 2009 +0100
Only build the dirsort module if we have the dirfd function
Fix the build on HP/UX
(cherry picked from commit a2cb872e58e6db5fe9c5fbd575e0a4776e02b9e5)
commit a866c40c15a128725114f5e9345f6c1c90bd4c2f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 22 11:39:32 2009 +0100
Document the dirsort module
(cherry picked from commit a4badda87bc10a820f3591a1232d840fa4262bf3)
commit 35832c41fdcbe25aadd4f3ca9885257b872812de
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 22 11:39:10 2009 +0100
Use StrCaseCmp in the dirsort module
(cherry picked from commit 9ada8991505b43a81687076b35828f21598b5ca0)
commit 6d704868880be3a60bfcb2bd202c3de4de2de060
Author: Andy Kelk <andy at mopoke.co.uk>
Date: Sun Mar 22 11:06:52 2009 +0100
Add dirsort module
(cherry picked from commit 3bf35e844cc60d911b3b2eff19db0df6348a57b5)
commit 6ac672c7322a0e606ee14eaa522a396fe79b8e13
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 20 11:36:00 2009 +0100
s3-netapi: Fix Coverity #774 (REVERSE_INULL).
Guenther
(cherry picked from commit 9bf3e129605d51483fd5ce47c90642f7e82ac102)
commit 47b96596c8f8883b21edf787b9550350ab1f74a4
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 20 11:34:43 2009 +0100
s3-netapi: Fix Coverity #775 (REVERSE_INULL).
Guenther
(cherry picked from commit 3b0f612c52e992cd130f5176432722bada3c64e4)
commit 814da9e0b9520456618cd75e030697433d9e1322
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 20 11:17:50 2009 +0100
s3-netapi: Fix Coverity #776 (REVERSE_INULL).
Guenther
(cherry picked from commit d2e348b191ada5492538b7bdae1bb7cd3f639aba)
(cherry picked from commit 76c858c6fcb8111e3fd87a2a8aa2606ab06bb90a)
commit 02daed33ef26e48be2245cbdf53d63ebe20a3ab6
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 20 11:11:04 2009 +0100
s3-krb5: Fix Coverity #762 (REVERSE_INULL).
Guenther
(cherry picked from commit 97190ae184dff6450b1390c854f7426e2ee3f980)
(cherry picked from commit 0f7757e94bfa35d22a7349d78578685c0dba22d7)
commit 4145668c3e56751058a0297ed8c8f7b206f1fdf9
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 19 16:42:54 2009 +0100
s3-krb5: Fix Coverity #722 (RESOURCE_LEAK).
Guenther
(cherry picked from commit 1524abd8bf12d82e1fb0063585fc9a465fc7bf9c)
(cherry picked from commit 3517388b5d5439ffe3f9629aaf826fa1dfbb4ba7)
commit 83ea0c2a3656f6dd50e71ab706eeedc892c9a8ee
Author: Michael Adam <obnox at samba.org>
Date: Thu Mar 19 18:29:09 2009 +0100
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
(cherry picked from commit f846e0fcdf62333b44a16e5a392930189b512f9b)
commit c5dba69179d752b81e5d06f5df3a82f1d08b3e70
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 18 07:56:51 2009 +0100
s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
Before we send the secondary requests we need to remove the
old mid=>seqnum mapping and reset cli->mid and make the new
mid=>seqnum mapping "persistent".
The bug we had in cli_send_trans was this:
The first cli_send_smb() incremented cli->mid
and the secondary requests used the incremented mid,
but as cli->outbuf still had the correct mid,
we send the correct mid to the server. The real problem
was that the cli_send_smb() function stored the seqnum
under the wrong mid.
cli_send_nttrans() was totally broken and now follows the
same logic as cli_send_trans().
The good thing is that in practice the problem is unlikely to happen,
because max_xmit is large enough to avoid secondary requests.
metze
(cherry picked from commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b)
(cherry picked from commit 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3)
(cherry picked from commit d01cca5e3ddb925696d49a1ea728013ec1032372)
commit 0de7a08b4c2bb97fd002baea46fb93824d9fa89f
Author: Björn Jacke <bj at sernet.de>
Date: Mon Mar 16 01:51:09 2009 +0100
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
(cherry picked from commit fecb980bc90ba4be1fa95b4a6e2aa6967d036656)
commit c38db71045791fbb41f8652801f314d91ef34a64
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 23 11:43:32 2009 +0100
s3-spoolss: fix notify_printer_status_byname.
This took me almost a week to find, so here a little longer explanation:
When a windows client registers printer *status* change notifies using
spoolss_RemoteFindFirstChangeNotify, it registers them to a print server handle,
not a printer handle. We were then correctly monitoring the printer status
changes but were sending out the spoolss_RouterReplyPrinterEx via the back-channel
connection with job_id set to 0 (which we only may do for monitored printer
change status notifies on printer handlers, not print server handles). Windows
was then showing a new empty dummy printer icon in the explorer as it cannot
route the notify event to the approriate local handle. It also discarded the
content of the notify event message of course. With this, printer change notify for
pausing, resuming and purging printers nicely works again here.
Jerry, Tim and all other printing gurus, please check.
Guenther
(cherry picked from commit 69a8eeb16af7cccdaa524dd85c7e2b648c0547a3)
commit c08abca4f0f8c5440471b032565b9bfac9d7d568
Author: Timur <timur at FreeBSD.org>
Date: Tue Mar 17 22:46:53 2009 +0100
build: fix detection of netinet/ip.h on FreeBSD
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041)
(cherry picked from commit ddcf94787f59cf682c51010b87d3624bbdd6b4a3)
commit 5362a49ea3e248063b43f91e229b3faf50567750
Author: Timur <timur at FreeBSD.org>
Date: Tue Mar 17 22:45:28 2009 +0100
build: format the header check for netinet/ip.h more nicely
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc)
(cherry picked from commit 9baa0c3b119f41c7d65bc13f4f34c6e242ea1abc)
commit 502991d43dfbcb783117b48a129707bec58c163f
Author: Steve Langasek <vorlon at debian.org>
Date: Tue Mar 17 22:08:28 2009 +0100
s3: Fix bugs in the detection of the GNU ld version (Bug #6147)
This bug results in a failure to use linker scripts to limit the set of symbols
exported by our shared libraries.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c6b570ce30b5cc3631c0ed780826d5450f681800)
(cherry picked from commit e1a79d063de536969732b63ed9be24c4fd2aa505)
commit 60911e9c61f5f54c162c0fd66dd0c743a1506a04
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 02:59:07 2009 +0100
s3:registry: tighten the subkey loop in reg_deletekey_recursive()
and loop from the end to the beginning so that we don't need
to rehash the subkeys...
This gets "net conf drop" with 2000 shares down to 14 seconds
on my box.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit db367c32756fcdf669a2ea7dad51d4daf40770e0)
commit 5fd43b9399250b4d4946db6c97f3cad3fdc18f72
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 02:57:59 2009 +0100
s3:registry: use delete_reg_subkey() in reg_deletekey()
This further speeds up net conf drop.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0045eb93bfb8285bcf8165b9cb2c39ade59a0782)
commit 8e0f33bb71f665441f51c7bad445c3a02f039712
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 02:56:50 2009 +0100
s3:registry: implement delete_subkey in the smbconf backend
delegating the call to the db backend
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e574048770d8e40490f949b6e0673f1f44b6e644)
commit 6caca3278b0b19ad25253dc181cdb24ef54e667d
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 02:56:00 2009 +0100
s3:registry: implement delete_subkey in the db backend
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5ad50bd6c0f5e030105b225f15a4e8e1d5c18999)
commit 44c0273282f92d95d62f01a28674910b25e6514e
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 02:54:50 2009 +0100
s3:registry: add a delete_subkey method to the backend ops.
This is to provide a more atomic means of deleting a subkey of a key.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit eced96cf26b08b1fd606381eeced5abec9fac3c4)
commit 12383abc119ea1de4c19072af49535b9251e82d1
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 01:43:58 2009 +0100
s3:registry: refactor deletion of various subkey lists out of regdb_store_keys()
Micheal
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4c0a996876115e2877c3903b7b9953b527175a16)
commit 002383ab3e135437d013450f073848658d04aabd
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 01:22:03 2009 +0100
s3:registry: streamline and cleanup regdb_set_secdesc() somewhat.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5446e47968f1c0ff2f6390e00b5483b6163be78f)
commit e93b41a2725e0322483ca712ffe19a944458a55f
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 26 01:16:07 2009 +0100
s3:registry: refactor deletion of value/secdesc/subkey list tdb records out
of regdb_store_values().
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 22c71fc6f054ffbe73346a8c20cc48b141312d95)
commit dad0a93bbda4f416963cae44c88cecd576ce0449
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 23:13:07 2009 +0100
s3:registry: streamline reg_deletekey() somewhat.
use W_ERROR_... macros and separate assignments from checks
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit ce1051dd5498fb864e959c66b15a16d6d0cadd31)
commit e5aeda20e754fcaf58eb0e924ba85d340de00931
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 22:06:47 2009 +0100
s3:registry: use create_reg_subkey() in reg_createkey().
Instead of calling store_reg_keys()
On my box, importing 2000 shares into an empty smbconf key
now takes some 32 seconds.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit da272a52894314bd12f43fbb52a24c8b9cc024e8)
commit 859b5db022541c67cc92a5766b8f10ac1137d2db
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 22:04:58 2009 +0100
s3:registry: implement create_subkey for the smbconf backend
by delegating to the db backend
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0b99c03824886432a86dcdc161a219a5dbad7c58)
commit 85cc48151982256bc54abb707380c725f12656c3
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 22:04:07 2009 +0100
s3:registry: implement create_subkey for the db backend.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 049d5745cbf2bba954e9a06cc0f255506805ae0f)
commit 240af281009c5ca4166ed283f8517bc698007eda
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 21:59:54 2009 +0100
s3:registry: add a create_subkey method to the backend ops.
This is to provide a more atomic means of adding a subkey of a key.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 453c7e1503f814034765ebc6aac06dd11f89b381)
commit c3ece39a7bc86ed1f9812ede90c7009e8ed726eb
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 16:55:28 2009 +0100
source/include/nt_status.h: add macro W_ERROR_NOT_OK_GOTO(x, y)
a goto destination can be specified as a second parameter.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d316cab3cb5037909121494d57cc2173e4c66a23)
commit 7a09208f62d9ebd988a0d3fec470607d7d7e3f21
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 16:53:05 2009 +0100
s3: move definition of W_ERROR_NOT_OK_GOTO_DONE down to nt_status.h
where all the other W_ERROR_xyz macros are found as well.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 76a460aecab6d5a03af9b8b5d97cba15d364cfde)
commit fea0bc19accceeea513f9f2534cc3c26f864666f
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 14:49:30 2009 +0100
s3:net rpc registry: use regsubkey_ctr_init() instead of using talloc directly.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 7679a4b9179dd32599d3799fa02f42e1acfce3ef)
commit 1386844f2c985ad88861000b0fd9cef478ea459f
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 09:53:16 2009 +0100
s3:registry: hash the list of subkeys in the regsubkey_ctr
This removes many loops over all the arrays
(from regsubkey_ctr_key_exists) and thus
reduces "net conf drop" from 1m55 to 48seconds
and "net conf import" from 1m55 to 58 seconds
for 2000 shares on my box.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 1eaff4f96768912b31795c1c8b6a4741e2e746e1)
commit c0868398ca5ce7e161ca83bf1fa14842ddb6ae1c
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 00:33:24 2009 +0100
s3:registry: remove definition of regsubkey_ctr from the surface.
All access is now through accessor functions in reg_objects.c
This allows for performance tuning under the hood in the next step.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit ed8e84dbda344b19f1c6037a630e60885f722f13)
commit bc4d02334060da8d2d8e64bf269f1f6f46ce023c
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 25 00:32:21 2009 +0100
s3:profiles: use regsubkey_ctr_init() instead of using talloc directly.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5fc572e9e9ddc1c87ddd4622428e41d3503ccc4b)
commit 74c6495d76b78789a4fba38b9a977fe61a855f75
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:28:48 2009 +0100
s3:registry: use regsubkey_ctr_init() in reg_eventlog.c
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a6c9cd899a52cf093f557ddac9a7fb42cbae35d0)
commit 56cf00d056154553c25feb65f428d5bdb68747fe
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:23:04 2009 +0100
s3:services_db: use regsubkey_ctr_init() instead of using talloc directly
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 3e8393af5fc40116305af6f155de9bad203e0a8d)
commit 3db5490678919a3d966934db4a4eeae1d0e5fc85
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:19:35 2009 +0100
s3:registry: use regsubkey_ctr_get_seqnum() in reg_backend_db.c
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit bcbe20b30017f22f1f01d9620f149fdeefe3a9e0)
commit a77ffb385c3d06574458ef18f736196ede4a6c05
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:19:08 2009 +0100
s3:registry: use regsubkey_ctr_set_seqnum() in reg_backend_db.c
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 3a0f670d425a37e435fecf575730834017e30940)
commit 583a865d067d7b9542d7aec6d3cb7e8c49637d1e
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:18:20 2009 +0100
s3:registry: use regsubkey_ctr_init() in reg_backend_db.c
instead of using talloc directly.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 3f2255ad1c67bcea2d812eedbb4def8c35ff110a)
commit cee5f97d910645a235ede462bd4edcc21fcc0b81
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:17:05 2009 +0100
s3:registry: use regsubkey_ctr_init() in reg_api.c
instead of using talloc on struct regsubkey_ctr.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f1c0b65da5cf90740c2013e20991a87f5a16fc2c)
commit ecc98b7430ac4ef14040837d7b772955e7640d16
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:15:55 2009 +0100
s3:registry: add regsubkey_ctr_get_seqnum() to hide implementation
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 811b3fefab29c109c6c134339a438c7e4ffb13fe)
commit 0263c1f7959fcefde38e29fee3942740e546afc0
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 23:10:35 2009 +0100
s3:registry: add regsubkey_ctr_set_seqnum to hide implementation from caller.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d119cd129c6acd2f0eb16fcf3281744d717cd291)
commit 80e4fa5545e6d455fe0a324248b42f616a00132f
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 22:43:47 2009 +0100
s3:registry: add a regsubkey_ctr_init function for allocating a regsubkey_ctr
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit b26f384649b4285748bf0fb78d826651882208e7)
commit c09dafa872f3298df406c992abb346647911170d
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 22:41:40 2009 +0100
s3:registry: fix a comment
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 391027d79eeb897c539d35877f5b27ea90efb40b)
commit 0455bb2fad39027198f1f108ee2a7d56aeed19bc
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 22:16:40 2009 +0100
s3:registry: don't directly access key->subkeys->subkeys[] in reg_backend_db.c
Use the reg_objects accessor regsubkey_ctr_specific_key() instead.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 078d121b4d4d74237ea11c39754fb2ba0dc496a9)
commit 8d9623056e934ec67f671561f0b88815b50b3cc9
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 21:12:26 2009 +0100
s3:registry: don't directly access key->subkeys->subkeys[] in reg_api.c
Use the reg_objects accessor regsubkey_ctr_specific_key() instead.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c861f55a35e315f3561bc9b5a4d4d2e1b782fa31)
commit 13388e2709a2316966d05e5458d513750db4548f
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 17:42:50 2009 +0100
s3:registry: don't directly access key->subkeys->num_subkeys in reg_backend_db.
Use the reg_objects api instead.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 128f91d4c26dd4635a88c4bc8939061300cf81b7)
commit 468c121c6e0a1984a3b8ef13826d0694ada7430c
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 17:30:23 2009 +0100
s3:registry: don't directly access key->subkeys->num_subkeys in reg_api.c
Use the reg_objects api instead.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 6a9c73e5c58837c1a6e0abc03e90e616520cdd91)
commit 85a839665d0649ea6c8e4a3e774e30476cb8df8e
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 15:19:18 2009 +0100
s3:registry: replace typedef "REGSUBKEY_CTR" by "struct regsubkey_ctr"
This paves the way for hiding the typedef and the implementation from the
surface.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9ca48a86fb6cf5fa30b622162877859b0c335f7e)
commit 2cbd526e4e746c4a505c30b9d01e0fe755cf5fb5
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 17:51:09 2009 +0100
Revert "Fix a O(n^2) algorithm in regdb_fetch_keys()"
This reverts commit a13f065bad0f4d21a67e68b743f17f45bf0a4691.
This fix is reverted, because the speedup is going to move
further down into reg_objects.c. The unsorted list of subkey names
is going to be indexed: This O(n^2) search bites us in more places.
This re-establishes the abstraction of reg_objects.c.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit abc457fe4c167bfcd7c8a4a654e13884b8e1ef90)
commit 9889720d204e27cceb2ef9d26a3647e0bc3b480a
Author: Michael Adam <obnox at samba.org>
Date: Wed Mar 4 21:46:32 2009 +0100
s3:net conf: reduce memory usage of "net conf import".
"net conf import" was wrapped in one big transaction.
This lead to MAX_TALLOC_SIZE being exceeded at roughly
1500 shares. This patch resolves that problem by
limiting the top level transactions in "net conf import"
to 100 shares.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 026b72903c852e46012ac60d9d42b14c6860a159)
commit 8f6377ce55d4f2170d2fe1aaf13437f417f2183f
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 10:54:13 2009 +0100
s3:net: wrap net conf import into one big transaction
This speeds up "net conf import" of a file with 2000 shares
from 11 minutest to 1m50s on my box.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e95bcaefc98f4ddc461d60d2f6f812ef24c2f234)
commit a7a672ce0bd98514532845727882c4e0a96cd5f8
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 11:25:44 2009 +0100
s3:libsmbconf: add transactions to the libsmbconf api
This is useful for wrapping higher level aggregate operations
in transactions. The text backend implementations just return
WERR_OK, the registry backend implementatoins use the
regdb_transaction_start|commit|cancel routines just added.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 8dd46903944c48e171837729cbe937f54d9554b7)
commit 209eee39a31dda71b1ccf2589db9af82d910cdb2
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 15:40:05 2009 +0100
s3:registry: wrap deletekey_recursive in one big transaction.
This speeds up "net conf drop" with 2000 shares on my box from
4m40s to 1m50s, leaving virtually only cpu load.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 8353d9b764ec90948fb8a5cb39689ea39acc7f9f)
commit dc003037b920a6e0e3d32c291e17e0e0a02a0730
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 24 11:23:52 2009 +0100
s3:registry: provide transaction_start|commit|cancel fns for the registry tdb
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0509eee47ac2da1042bd1bb0d98695abc8ee44a3)
commit eb928d4c8a573bb3010357c084ae0f9e95cd41a8
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 22 10:11:29 2009 +0100
Wrap creating the sorted subkey cache in a transaction
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 4ddeed513ce5e2bb839570212d046145da70768b)
commit b80af20eb310d63263fc77b3556b0a65cfd46d52
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 22 01:11:51 2009 +0100
Add a comment describing the sorted subkeys
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit caa654d31fc65e3a08327e430ba5332776a21f11)
commit 24eb5eb954b66781fffe5c362e173d63ab700a7a
Author: Volker Lendecke <vl at samba.org>
Date: Fri Feb 20 06:01:16 2009 +0100
Add sorted subkey cache
On my box this gets net conf list for 1000 records down to .1 seconds
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 32524d865158080421867b36f9b64bdc98ff07c9)
commit 9bbece86506aa4af291c63b8b6f7ef43bf4d4a56
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 22 00:47:54 2009 +0100
Add db_tdb_parse
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit e5936d910cfc3590a3b015e627a5fa308861eaf4)
commit 0439f1c45e75771a6b0ad4bf7291c7feda179902
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 22 00:18:05 2009 +0100
Add dbwrap->parse_record
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 68d4e25aad23b670e4ff735377de59ba396940cd)
commit 72f05fd39cd8e6fecdf5fb5253861315867e5f29
Author: Michael Adam <obnox at samba.org>
Date: Wed Mar 4 22:05:17 2009 +0100
s3:dbwrap_ctdb_marshall_add: don't leak the ctdb_rec_data to the outside
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a470af9a18b328548f241dca4f744d25c7cdc13e)
commit 43ccd3180aca89ca0f0efefdcdb26f2f436a79c1
Author: Michael Adam <obnox at samba.org>
Date: Wed Mar 4 22:02:07 2009 +0100
s3:smbconf: move smbconf_share_exists checks into backend
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 11ed4d41906084a604797e761ffd27caf5c67ac3)
commit 14ba88e8a90778709958a79d7efe79ee377cb240
Author: Volker Lendecke <vl at samba.org>
Date: Sat Feb 21 18:00:42 2009 +0100
Speed up "net conf list"
For 1000 shares this speeds up net conf list from .6 to .25 seconds on my box
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f8fa246bbae0db96e16e8f3e327577920c6ecec5)
commit 1b2b26204ab7edddd73a97047f37e36e616c773c
Author: Volker Lendecke <vl at samba.org>
Date: Sat Feb 21 17:01:58 2009 +0100
Speed up "net conf list"
With 1000 shares in the registry, this changed the time of "net conf list" from
1.1 seconds to .6 seconds.
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c4a1fc734b70efa932df4d4f8d9c66ea4f83ad0b)
commit 633c1de12c9abf845dc4295dac1718d6ff380fcd
Author: Volker Lendecke <vl at samba.org>
Date: Mon Mar 2 14:56:01 2009 +0100
Make use of gpfs_get_real_filename optional
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 36f2aa636d1eb5394469c09f76fe2fb676dfcac7)
commit 13321351d2184146a40f36f0085cc66181c62926
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 27 15:28:52 2009 +0100
s3: Fix a memleak in dbwrap_rbt.
The SMB_MALLOC'ed rbt node data was not free'd on talloc free of
the db context. This is a quick fix using talloc instead of malloc
for allocation of the node data.
Since malloc was originally used for performance reasons, one
might want to reverse to malloc and create a talloc destructor
that walks the tree and frees all the node data if this talloc
approach proves to be too slow..
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 6facbbb4020369c18b4312115fab9b8d6eceaf80)
commit eb430f51551f2986c7b30d25edeba64ea01b5109
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 14:36:48 2009 +0100
s3:smbconftort: don't use reserved words ('test:', 'failure:', 'success:')
Temporary results printfs should not contain reserved subunit words.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d5750eca159e0bf1095b102545838d771f26a7f7)
commit 18bf7cfb775c1d3f368c9034b5f3691d30d46d76
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 18:25:47 2009 +0100
s3:libsmbconf: include smbconf headers with lib/smbconf prefix
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 5887fa35156df68416b4da4a45ef0576d8b203c1)
commit 8ddbb23788f6096f2b255a959344933a7ed33f63
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:14:56 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 8589fa2cfe8fb549b013d2f15a598e43e28b64d7)
commit 93eb8cfb1064387a14bc02aa18d79ccf2a888330
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:12:50 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_init
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit dc0583613dfd8ce8f9209a8fb56e6c41a14efd0a)
commit 28c94a0630bac04d5c81317af41bc3c5363aa0ee
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:11:46 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in testsuite
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9dfc6c9de92e58173e73d67a6dd56b4b4336909b)
commit ca2de267334cc6da7b006ff544cdf63ea5b49655
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:11:02 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_util.c
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit a077a710b9d402ed7ac86ab98dc2a98776b8f9bc)
commit 9803069032aa7710932b6fd905631dc2c9d96067
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:10:20 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf.c
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 9685cbd3ab0304c0439f668d7b4963ab264729b2)
commit a5b1d44db7fbdc974d05ad7f50b1eaf4cdddfe5e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 16:59:09 2009 +0100
s3:libsmbconf: remove the init headers from smbconf.h
give the smbconf_init() dispatcher and the backends
(smbconf_reg and smbconf_txt) a header of their own each.
This allows to use the basic infrastructure and
single backends individually.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit defb4430114091474dfef0114ebb176bfb5026ea)
commit 6eeb4b2b04f190cef7733bf85443488559d017d8
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 24 00:00:20 2008 +0200
libsmbconf: create text config in smbconftort
Michael
(cherry picked from commit 13521c9c1e0f93ea956c1d0b22f1979e7124c72e)
commit 46f5b0b4169e22983e3cf2e035f4421a34cfe337
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 23 16:05:19 2008 +0200
libsmbconf: return WERR_BADFILE when no path to text backend is provided.
Michael
(cherry picked from commit 4a6c0a234ddfa545f137f8842a7e92224e72bcad)
commit 5c8b18f0d5ab6c938833af61cc079ececd6b53a8
Author: Michael Adam <obnox at samba.org>
Date: Tue Oct 21 23:20:57 2008 +0200
libsmbconf: fall back to file backend when no valid backend was found
Interpret the source string as a file name when it contains
a ':' sign but the initial part is not a known backend.
This might occur even implicitly when "%T" is used in an
include file name (even though this is not realistic..).
Michael
(cherry picked from commit 8dd78e82ef694f35604f5328378f2422dcd561f5)
commit a33308cc8ac024a190b92ca8e8dba92f5d1db7bd
Author: Michael Adam <obnox at samba.org>
Date: Tue Oct 21 23:20:31 2008 +0200
libsmbconf: fix comment typo.
Michael
(cherry picked from commit e035a2d419cab20e8cd8efd532b8388d4cc364a6)
commit 71f516624b98e623e47b8eca1c7da22a5381980e
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 20 16:10:54 2008 +0200
libsmbconf: remove unused define.
Michael
(cherry picked from commit 85a90a26baaf916862b45ab2114edf9bf6f2e46d)
commit 8139266db4ec881b88d2727d77486f8118c9c545
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 17:16:37 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in reg backend
Michael
(cherry picked from commit 7deb120bf22dc5857af9051eeba7b8dabe4016e5)
commit 3808849499feb58f64f47b6b99001754cfeaaf8e
Author: Michael Adam <obnox at samba.org>
Date: Thu Oct 23 11:16:50 2008 +0200
libsmbconf: add method is_writeable() and wrapper smbconf_is_writeable()
This allows for per-config-source checking of write support.
Michael
(cherry picked from commit 9cb280f7d721c71c5cecc2fd56cc75ce4b4a7e5b)
commit b8ce351d9c45d788e11b6ae7d66650484b016aeb
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 20 23:52:02 2008 +0200
libsmbconf: add backend_requires_messaging() method to libsmbconf.
In a clustered environment, the registry backend needs messaging
to be set up since ctdb requires this.
Michael
(cherry picked from commit 5d2255e13cf2e468887a61fb9a7e99d2ba665333)
commit be929d030bd5845aa05f940fd20035dc6e08fdad
Author: Jeremy Allison <jra at samba.org>
Date: Wed Mar 18 20:54:13 2009 -0700
Allow DFS client paths to work when POSIX pathnames have been
selected (we need to path in pathname /that/look/like/this).
Jeremy.
(cherry picked from commit bf1474aee37976f0d7e3cece8f39b0046ee54209)
commit 4d33970f5d071fd971a75918edb672e4f33b1687
Author: Jeremy Allison <jra at samba.org>
Date: Wed Mar 18 19:59:04 2009 -0700
Fix bug #6196 - Unable to serve files with colons to Linux CIFS/VFS client
Looks like the pathname parsing for POSIX paths got
broken when the code for doing Windows streams parsing got added.
Jeremy.
(cherry picked from commit 41bf3933b955548c4877e6e3f8fe2768090833c4)
commit 727b20ac9b25ebe4ff37d68f88a6a260d5fe2535
Author: Jeremy Allison <jra at samba.org>
Date: Wed Mar 18 14:31:56 2009 -0700
Fix bug #6195 - Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb correctly.
This is a really nasty one to fix as in order to successfully update the
passdb.tdb we must do the equivalent of a tdbbackup to move to the new hash
values before we do the upgrade.
Jeremy.
(cherry picked from commit a549aee12f33dc91f0cc32612516025eb212fb66)
commit fd2420d28d57569a676004875879c00461ec2436
Author: Alexander Zagrebin <alexz at visp.ru>
Date: Tue Mar 17 15:36:16 2009 -0700
Missing break in conversion function prevents tdb password database update.
(cherry picked from commit 35a1ee3687f75e8b74e0009443362cf370eedc19)
commit 5a7f0dc653cffd8a364835122da61ebaa454b4cd
Author: Volker Lendecke <vl at samba.org>
Date: Mon Mar 16 13:17:04 2009 +0100
Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members
Thanks to François Legal <devel at thom.fr.eu.org> for reporting this bug
(cherry picked from commit db811fbc3570f55b170567dbfd8882d270c10d83)
commit ad32f18adf1cfee6fcb5cc3feef6ff0cf71d19bc
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 17 11:22:41 2009 +0100
Fix a valgrind error
Found in "make test" -- if we can't connect at all, "cli" is uninitialized
(cherry picked from commit c863f8c767c9112a31da7b9f8a84c6c07bfb9d37)
commit e05edadd14052a8fa0ffcc536ba13d3e2b8d8cb0
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 15 11:58:07 2009 +0100
Fix a malloc/talloc mismatch when cli_initialise() fails
(cherry picked from commit 3751ea72f225e370c52b842f258a828ff4a596fd)
commit ce9ba534007ba1eab938be23a1c2c2873a5dd596
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 14 12:39:55 2009 +0100
Fix #3954
(cherry picked from commit 6e7a0a28e9aadda7f6a5891820ffd60a31d14789)
commit aaa74115865a774ad9e5c02449bb69e666639956
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Mar 12 17:08:54 2009 -0700
s3 torture: Fix unitialized variable to avoid closing a random fnum
(cherry picked from commit c8f001f9f4860c333b9c49c6e47e4be930b095da)
commit 815be319318b2968cde42b49453d17bd9cb428d0
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 12 10:57:43 2009 -0700
Add simple POSIX open, mkdir and rmdir test.
Jeremy.
(cherry picked from commit 7bc42dc7ca39b84ce9ea20c422a9ef4463df9917)
commit 8202c42e4b1cd08d0845496b0211550e5a0e5867
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 12 10:56:09 2009 -0700
Fix bug #6186 - map readonly does not work
Jeremy.
(cherry picked from commit 969f2aa114f8ede44c3e56ca52ce2d4b70e709ba)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 115 +++--
docs-xml/manpages-3/vfs_dirsort.8.xml | 69 +++
source/Makefile.in | 24 +-
source/client/mount.cifs.c | 3 +-
source/configure.in | 47 ++-
source/include/dbwrap.h | 4 +
source/include/includes.h | 3 +
source/include/nt_status.h | 12 +
source/include/proto.h | 40 ++-
source/include/reg_db.h | 1 +
source/include/reg_objects.h | 16 +-
source/include/regfio.h | 2 +-
source/lib/avahi.c | 284 +++++++++++
source/lib/dbwrap.c | 26 +
source/lib/dbwrap_ctdb.c | 12 +-
source/lib/dbwrap_rbt.c | 8 +-
source/lib/dbwrap_tdb.c | 12 +
source/lib/netapi/group.c | 10 +-
source/lib/netapi/user.c | 36 +-
source/lib/replace/libreplace_network.m4 | 15 +-
source/lib/smbconf/smbconf.c | 64 ++--
source/lib/smbconf/smbconf.h | 25 +-
source/lib/smbconf/smbconf_init.c | 20 +-
source/lib/smbconf/smbconf_init.h | 32 ++
source/lib/smbconf/smbconf_private.h | 5 +
source/lib/smbconf/smbconf_reg.c | 235 ++++-----
source/lib/smbconf/smbconf_reg.h | 33 ++
source/lib/smbconf/smbconf_txt.c | 43 ++-
source/lib/smbconf/smbconf_txt.h | 33 ++
source/lib/smbconf/smbconf_util.c | 4 +-
source/lib/smbconf/testsuite.c | 97 +++--
source/lib/version.c | 2 +-
source/libads/kerberos.c | 12 +-
source/libads/krb5_errs.c | 8 +-
source/libnet/libnet_join.c | 6 -
source/libnet/libnet_samsync.c | 3 -
source/libsmb/clidfs.c | 14 +-
source/libsmb/clientgen.c | 2 +-
source/libsmb/clikrb5.c | 30 +-
source/libsmb/clitrans.c | 30 +-
source/libsmb/dsgetdcname.c | 2 +-
source/libsmb/smb_seal.c | 3 +-
source/libsmb/unexpected.c | 4 +
source/locking/locking.c | 3 +-
source/modules/gpfs.c | 6 +-
source/modules/vfs_dirsort.c | 193 ++++++++
source/modules/vfs_gpfs.c | 5 +
source/modules/vfs_streams_depot.c | 4 +-
source/nmbd/nmbd_elections.c | 3 -
source/passdb/lookup_sid.c | 2 +-
source/passdb/pdb_tdb.c | 216 ++++++++-
source/printing/notify.c | 4 +-
source/registry/reg_api.c | 183 ++++----
source/registry/reg_backend_current_version.c | 2 +-
source/registry/reg_backend_db.c | 651 +++++++++++++++++++------
source/registry/reg_backend_hkpt_params.c | 2 +-
source/registry/reg_backend_netlogon_params.c | 2 +-
source/registry/reg_backend_perflib.c | 2 +-
source/registry/reg_backend_printing.c | 20 +-
source/registry/reg_backend_prod_options.c | 2 +-
source/registry/reg_backend_shares.c | 4 +-
source/registry/reg_backend_smbconf.c | 16 +-
source/registry/reg_backend_tcpip_params.c | 2 +-
source/registry/reg_dispatcher.c | 24 +-
source/registry/reg_eventlog.c | 18 +-
source/registry/reg_objects.c | 175 ++++++-
source/registry/regfio.c | 2 +-
source/rpc_server/srv_lsa_nt.c | 4 +
source/script/mkversion.sh | 1 +
source/services/services_db.c | 12 +-
source/smbd/avahi_register.c | 170 +++++++
source/smbd/open.c | 28 +-
source/smbd/process.c | 2 +-
source/smbd/reply.c | 9 +-
source/smbd/server.c | 23 +-
source/torture/torture.c | 114 +++++
source/utils/net_conf.c | 58 ++-
source/utils/net_rpc_registry.c | 11 +-
source/utils/profiles.c | 8 +-
source/winbindd/winbindd_cm.c | 2 +-
source/winbindd/winbindd_pam.c | 2 +-
source/winbindd/winbindd_rpc.c | 15 +-
82 files changed, 2692 insertions(+), 754 deletions(-)
create mode 100644 docs-xml/manpages-3/vfs_dirsort.8.xml
create mode 100644 source/lib/avahi.c
create mode 100644 source/lib/smbconf/smbconf_init.h
create mode 100644 source/lib/smbconf/smbconf_reg.h
create mode 100644 source/lib/smbconf/smbconf_txt.h
create mode 100644 source/modules/vfs_dirsort.c
create mode 100644 source/smbd/avahi_register.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 968fd37..1979443 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,17 +1,16 @@
=============================
- Release Notes for Samba 3.3.2
- March, 12 2009
+ Release Notes for Samba 3.3.3
+ April, 1 2009
=============================
This is the latest bugfix release release of the Samba 3.3 series.
-Major enhancements in Samba 3.3.2 include:
+Major enhancements in Samba 3.3.3 include:
+
+ o Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb
+ correctly (bug #6195).
+ o Fix serving of files with colons to CIFS/VFS client (bug #6196).
- * Fix "force group" (bug #6155).
- * Fix saving of files on Samba share using MS Office 2007 (bug #6160).
- * Fix guest authentication in setups with "security = share" and
- "guest ok = yes" when Winbind is running.
- * Fix corruptions of source path in tar mode of smbclient (bug #6161).
######################################################################
@@ -19,67 +18,95 @@ Changes
#######
-Changes since 3.3.1:
+Changes since 3.3.2:
--------------------
+o Michael Adam <obnox at samba.org>
+ * Add backend_requires_messaging() method to libsmbconf.
+ * Add methods is_writeable() and wrapper smbconf_is_writeable() to libsmbconf.
+ * Fall back to file backend when no valid backend was found.
+ * Fix a memleak in dbwrap_rbt.
+ * Provide transaction_start|commit|cancel fns for the registry tdb.
+ * Speed up "net conf drop".
+ * Speed up "net conf import".
+ * Add transactions to the libsmbconf API.
+ * Reduce memory usage of "net conf import".
+ * Registry cleanup.
+ * Fix handling of SAMBA_VERSION_VENDOR_PATCH.
+
+
o Jeremy Allison <jra at samba.org>
- * BUG 6082: Fix renaming and deleting of directories using Windows clients.
- * BUG 6154: Make ZFS honor admin users.
- * BUG 6155: Fix "force group".
- * BUG 6160: Fix saving of files on Samba share using MS Office 2007.
- * BUG 6161: Fix corruptions of source path in tar mode of smbclient.
- * Fix some NetBSD warnings.
- * Fix bug in processing of open modes in POSIX open.
- * Fix use of streams modules with CIFSFS client.
- * Ensure ACL modules work with POSIX paths.
- * Use fsp->posix_open in preference if we have it.
- * Fix more POSIX path lstat calls.
+ * BUG 6186: Fix map readonly.
+ * BUG 6195: Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb
+ correctly.
+ * BUG 6196: Unable to serve files with colons to Linux CIFS/VFS client.
+ * BUG 6224: nmbd waits 5 minutes at startup before checking if it needs
+ to run elections.
+ * Allow DFS client paths to work when POSIX pathnames have been
+ selected.
+ * Try and fix the build farm RAW-STREAMS errors.
-o Andrew Tridgell <tridge at samba.org>
- * Fix a bug in message handling for the change notify code.
+o Günther Deschner <gd at samba.org>
+ * BUG 6102: NetQueryDisplayInformation could return wrong information.
+ * BUG 6193: Avoid messing with sync_context in libnet_samsync_delta().
+ * Fix notify_printer_status_byname.
+ * Fix Coverity IDs 722, 762, 774, 775, 776.
-o Steven Danneman <steven.danneman at isilon.com>
- * Fix guest authentication in setups with "security = share" and "guest ok =
- yes" when Winbind is running.
+o Björn Jacke <bj at sernet.de>
+ * Fix build on old Heimdal based systems.
+ * Fix compile warning.
+ * Use parentheses in if condition to make negation clear.
-o Steve French <smfrench at gmail.com>
- * BUG 4640: Fix guest mounts in mount.cifs.
- * Fix displaying the version string properly when no other parameters passed
- in in mount.cifs.
+o Andy Kelk <andy at mopoke.co.uk>
+ * Add dirsort module.
-o Björn Jacke <bj at sernet.de>
- * Prefer gssapi header files from subdirectory.
+o Steve Langasek <vorlon at debian.org>
+ * BUG 6147: Fix detection of the GNU ld version.
o Volker Lendecke <vl at samba.org>
- * BUG 6124: Fix the build on IRIX.
- * BUG 6176: winbindd -n should disable the winbind idmap cache.
- * Add a vfs_preopen module to hide fs latencies.
- * Don't log NDR_PRINT_DEBUG at level 0, this always ends up in syslog.
- * Fix a valgrind error / segfault in dns_register_smbd().
+ * BUG 6097: Fix smbd segfault.
+ * BUG 6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped
+ members.
+ * BUG 6139: Add missing whitespace in mount.cifs error message.
+ * Fix a malloc/talloc mismatch when cli_initialise() fails.
+ * Fix a valgrind error.
+ * Speed up "net conf list".
+ * Add sorted subkey cache.
+ * Use StrCaseCmp in the dirsort module.
+ * Document the dirsort module.
+ * Fix the build on HP/UX.
+ * Disable dns_sd by default.
+ * Add avahi detection to configure.
+ * Add event avahi binding.
+ * Use avahi to register _smb._tcp in smbd.
+ * Fix two memleaks in the encryption code.
+ * Fix a scary "fill_share_mode_lock failed" message.
o Stefan Metzmacher <metze at samba.org>
- * Fix build on SLES8.
- * Decremented by 1 for ntcancel requests.
+ * Don't use reserved words in smbconftort.
+ * Fix smb signing for fragmented trans/trans2/nttrans requests.
o Tim Prouty <tprouty at samba.org>
- * Fix creation of core files.
+ * Parse_packet can return NULL which is then dereferenced in
+ match_mailslot_name.
-o Dan Sledz <dan.sledz at isilon.com>
- * Fix first mapping of uids/gids in Winbind.
+o Timur <timur at FreeBSD.org>
+ * Format the header check for netinet/ip.h more nicely.
+ * Fix detection of netinet/ip.h on FreeBSD.
-o Bo Yang <boyang at novell.com>
- * Initialize the id_map status in idmap_ldap to avoid surprise.
- * Fix initialization of idmap status.
+o Alexander Zagrebin <alexz at visp.ru>
+ * Missing break in conversion function prevents tdb password database
+ update.
######################################################################
diff --git a/docs-xml/manpages-3/vfs_dirsort.8.xml b/docs-xml/manpages-3/vfs_dirsort.8.xml
new file mode 100644
index 0000000..cec5f27
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_dirsort.8.xml
@@ -0,0 +1,69 @@
+<?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="vfs_dirsort.8">
+
+<refmeta>
+ <refentrytitle>vfs_dirsort</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>vfs_dirsort</refname>
+ <refpurpose>Sort directory contents</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = dirsort</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The <command>vfs_dirsort</command> module sorts directory
+ entries alphabetically before sending them to the client.</para>
+
+ <para>Please be aware that adding this module might have negative
+ performance implications for large directories.</para>
+
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+ <para>Sort directories for all shares:</para>
+
+<programlisting>
+ <smbconfsection name="[global]"/>
+ <smbconfoption name="vfs objects">dirsort</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3.3 of the Samba suite.
+ </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>
+
+</refsect1>
+
+</refentry>
diff --git a/source/Makefile.in b/source/Makefile.in
index e160a99..0500d73 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -69,6 +69,7 @@ WINBIND_NSS_EXTRA_LIBS=@WINBIND_NSS_EXTRA_LIBS@
WINBIND_NSS_PTHREAD=@WINBIND_NSS_PTHREAD@
PAM_WINBIND_EXTRA_LIBS=@PAM_WINBIND_EXTRA_LIBS@
DNSSD_LIBS=@DNSSD_LIBS@
+AVAHI_LIBS=@AVAHI_LIBS@
POPT_LIBS=@POPTLIBS@
LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
LIBTDB_LIBS=@LIBTDB_LIBS@
@@ -250,6 +251,8 @@ AFS_OBJ = lib/afs.o
AFS_SETTOKEN_OBJ = lib/afs_settoken.o
+AVAHI_OBJ = @AVAHI_OBJ@
+
SERVER_MUTEX_OBJ = lib/server_mutex.o
PASSCHANGE_OBJ = libsmb/passchange.o
@@ -575,7 +578,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
passdb/util_unixsids.o passdb/lookup_sid.o \
passdb/login_cache.o @PDB_STATIC@ \
lib/account_pol.o $(PRIVILEGES_OBJ) \
- lib/util_nscd.o lib/winbind_util.o
+ lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
DEVEL_HELP_WEIRD_OBJ = modules/weird.o
CP850_OBJ = modules/CP850.o
@@ -635,6 +638,7 @@ VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
+VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -670,7 +674,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o \
smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \
smbd/vfs.o smbd/statcache.o smbd/seal.o \
- smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
+ smbd/posix_acls.o lib/sysacls.o \
smbd/process.o smbd/service.o smbd/error.o \
printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
lib/sysquotas_xfs.o lib/sysquotas_4A.o \
@@ -687,7 +691,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(AVAHI_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
$(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
$(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@ \
@@ -881,7 +885,7 @@ NET_OBJ = $(NET_OBJ1) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
+ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
$(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
@@ -1043,7 +1047,7 @@ WINBINDD_OBJ = \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
- $(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ)
+ $(LIBADS_SERVER_OBJ) $(LDB_OBJ)
WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -1109,7 +1113,7 @@ NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o libads/kerberos.o \
- $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
+ $(LIBADS_SERVER_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
$(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
@@ -1327,7 +1331,7 @@ bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \
+ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
$(WINBIND_LIBS)
@@ -1512,7 +1516,7 @@ bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SH
bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
+ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
$(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
@@ -2462,6 +2466,10 @@ bin/security. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/security.o
@echo "Building plugin $@"
@$(SHLD_MODULE) libgpo/gpext/security.o
+bin/dirsort. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ)
+ @echo "Building plugin $@"
+ @$(SHLD_MODULE) $(VFS_DIRSORT_OBJ)
+
#########################################################
## IdMap NSS plugins
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index d05115b..8b62ef7 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -1449,7 +1449,8 @@ mount_retry:
}
}
printf("mount error(%d): %s\n", errno, strerror(errno));
- printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
+ printf("Refer to the mount.cifs(8) manual page (e.g. man "
+ "mount.cifs)\n");
rc = EX_FAIL;
goto mount_exit;
}
diff --git a/source/configure.in b/source/configure.in
index fee3ac1..8a1f7fc 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -250,7 +250,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then
else
AC_MSG_CHECKING(GNU ld release version)
changequote(,)dnl
- ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+ ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
changequote([,])dnl
@@ -262,7 +262,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then
if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
fi
- if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
+ if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
ac_cv_gnu_ld_version_script=yes
fi
fi
@@ -862,7 +862,7 @@ fi
AC_CHECK_FUNCS(dirfd)
if test x"$ac_cv_func_dirfd" = x"yes"; then
- default_shared_modules="$default_shared_modules vfs_syncops"
+ default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
fi
AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [
@@ -6168,10 +6168,10 @@ AC_SUBST(FLAGS1)
# Check if user wants DNS service discovery support
AC_ARG_ENABLE(dnssd,
-[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=auto)])])
+[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=no)])])
AC_SUBST(DNSSD_LIBS)
-if test x"$enable_dnssd" != x"no"; then
+if test x"$enable_dnssd" == x"yes"; then
have_dnssd_support=yes
AC_CHECK_HEADERS(dns_sd.h)
@@ -6200,6 +6200,42 @@ if test x"$enable_dnssd" != x"no"; then
fi
#################################################
+# Check if user wants avahi support
+
+AC_ARG_ENABLE(avahi,
+[AS_HELP_STRING([--enable-avahi], [Enable Avahi support (default=auto)])])
+
+AC_SUBST(AVAHI_LIBS)
+if test x"$enable_avahi" != x"no"; then
+ have_avahi_support=yes
+
+ AC_CHECK_HEADERS(avahi-common/watch.h)
+ if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
+ have_avahi_support=no
+ fi
+
+ AC_CHECK_HEADERS(avahi-client/client.h)
+ if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
+ have_avahi_support=no
+ fi
+
+ AC_CHECK_LIB_EXT(avahi-client, AVAHI_LIBS, avahi_client_new)
+ if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes"; then
+ have_avahi_support=no
+ fi
+
+ if test x"$have_avahi_support" = x"yes"; then
+ AC_DEFINE(WITH_AVAHI_SUPPORT, 1,
+ [Whether to enable avahi support])
+ AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o")
+ else
+ if test x"$enable_avahi" = x"yes"; then
+ AC_MSG_ERROR(avahi support not available)
+ fi
+ fi
+fi
+
+#################################################
# Check to see if we should use the included iniparser
AC_ARG_WITH(included-iniparser,
@@ -6401,6 +6437,7 @@ SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", V
SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), "bin/acl_xattr.$SHLIBEXT", VFS)
SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), "bin/acl_tdb.$SHLIBEXT", VFS)
SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), "bin/smb_traffic_analyzer.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), "bin/dirsort.$SHLIBEXT", VFS)
SMB_SUBSYSTEM(VFS,smbd/vfs.o)
diff --git a/source/include/dbwrap.h b/source/include/dbwrap.h
index 46833fa..3381d2d 100644
--- a/source/include/dbwrap.h
+++ b/source/include/dbwrap.h
@@ -45,6 +45,10 @@ struct db_context {
int (*transaction_start)(struct db_context *db);
int (*transaction_commit)(struct db_context *db);
int (*transaction_cancel)(struct db_context *db);
+ int (*parse_record)(struct db_context *db, TDB_DATA key,
+ int (*parser)(TDB_DATA key, TDB_DATA data,
+ void *private_data),
+ void *private_data);
void *private_data;
bool persistent;
};
diff --git a/source/include/includes.h b/source/include/includes.h
index 7b24b72..baf22e8 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -730,6 +730,9 @@ typedef char fstring[FSTRING_LEN];
#include "async_sock.h"
#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
+#include "lib/smbconf/smbconf_txt.h"
/* Defines for wisXXX functions. */
#define UNI_UPPER 0x1
diff --git a/source/include/nt_status.h b/source/include/nt_status.h
index 30174e4..c96ed3c 100644
--- a/source/include/nt_status.h
+++ b/source/include/nt_status.h
@@ -83,6 +83,18 @@ typedef uint32 WERROR;
}\
} while (0)
+#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \
+ if (!W_ERROR_IS_OK(x)) {\
+ goto done;\
+ }\
+} while (0)
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list