[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0-71-gdcd69f4
Karolin Seeger
kseeger at samba.org
Wed Jul 16 08:15:26 GMT 2008
The branch, v3-2-stable has been updated
via dcd69f4414a1919145b74327a41e79b431287335 (commit)
via 7cd553356e3fe10bf4caac23d525df235ad9efce (commit)
via 0f534e552522e2bc50c5dc8e614418dca4d4816e (commit)
via a9a2305d98d9e4d978f22b5ca218f51f2670bc4e (commit)
via 380176fd004f42c8c9c0f2f4d0f32053ec11cadf (commit)
via cfe2d6901d527e1587899484bfde268380d44bea (commit)
via f861d4951a8b5b801f35b66347efc8f3fbbc4233 (commit)
via 83b33f1346bb07c4cc2a9ab0213861fc4a5d82c5 (commit)
via 85d6341afb285d4499d4fe25b2795580ededeb17 (commit)
via 4ebf728091e56621d3f62d56b50fc58085b384f0 (commit)
via c80a21e752a8f69bffbcb5d4d4a967a03f50d055 (commit)
via b2f0420142023f283240cd8d7a5e0216b62af26f (commit)
via 6cdefc93aed47f157a0382bf4fbfe2385cd68dbe (commit)
via 07001cd6e6532411285a271823d3f89f7080bc90 (commit)
via b2bc502085d5663c4098eef82cab1e5733d202bf (commit)
via 73381cac8f6f30b6944613b63d4c752a4e81b3ca (commit)
via 0562af57c71964ee7283a9cea46d0a1b18b954aa (commit)
via 525e3f230a542394dad734411edc8052dcec3dc5 (commit)
via 834b63db404811a27769dcb7b9921abf0d27e0da (commit)
via 90b4911ed12f5f027eb1d406375a73b89e4ed599 (commit)
via b64c3ffc1583ace6a006874fd27b69bcc59873f1 (commit)
via c800faf34967362c48c03810617712c47bd03eb3 (commit)
via 826461f7efcd7bef10b69dec02b75133df3b7b1a (commit)
via 2150fbf81445e7b75d06c6da91325c138acea844 (commit)
via 780a01a76be3375565020661fb4026ad27412c54 (commit)
via ba6bb5172567d836d7820c4d267481d8e40a6336 (commit)
via 98c41f184358bcb47a2a6989c4e9f7d709708aa5 (commit)
via 4ebbcd685bd6228a35f60d00aeff98dd61d42385 (commit)
via 575423eb9d3a03848429534086bd81b24c39a045 (commit)
via 6ae1e2cb81a87df21dfce89158338714079f9ee9 (commit)
via c65fb38d1c13cd8e6692376ecd494fd488ebeb53 (commit)
via 45a5111c2bf8bb9089f6587ccc93574085e8f34e (commit)
via 865abe2ba23b0b1bbd16a67aa509eb22fa34376c (commit)
via 80c2a47164372033025a1e3c9c953eba7b2762bb (commit)
via 04a49990844a8890fe3d05a9f339098dd10d3710 (commit)
via e10b166687d75dc8cab11cc3fb0a50749918f86c (commit)
via 38962ee69f55533f59340c7c41c5ca5957319be3 (commit)
via 90ef647e521818542ac1b23e4d8810a8cbf1f50b (commit)
via 1278cc41e824e3a50d048f6d6f366f8af2f0e443 (commit)
via 101d28c3d84302e67098b883a53546cb2c425ca9 (commit)
via 93e85c91c67ca21f59ddbfa61a36b2e8df3f8807 (commit)
via de3f57e79a43d9a7d88a8f1389b4c2362f2b3f23 (commit)
via 5c0ecab1e80d4cbb0c1dfa7bd888dd91e93c21ab (commit)
from 7ae9f594d962ea39d233b6024f3ef3ebcaf73581 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit dcd69f4414a1919145b74327a41e79b431287335
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jul 16 09:48:46 2008 +0200
WHATSNEW: Update changes since 3.2.0.
Karolin
(cherry picked from commit f91f960094b132ae2946f40da4bacd1640c514c0)
commit 7cd553356e3fe10bf4caac23d525df235ad9efce
Author: Andreas Schneider <anschneider at suse.de>
Date: Tue Jul 15 14:57:32 2008 +0200
Release still reachable memory if the smbclient context is freed.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
(cherry picked from commit 88c9cf2fdc8f3d704f7f27c25ef6dc6940d451d3)
commit 0f534e552522e2bc50c5dc8e614418dca4d4816e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 15 15:27:22 2008 -0700
Fix from Volodymyr Khomenko <Volodymyr.Khomenko at exanet.com>. Make ntimes
function more like POSIX and allow NULL arg. Help vfs developers.
Jeremy.
(cherry picked from commit a034ad5b28dc22b76ef91901306d5c4f9102178f)
commit a9a2305d98d9e4d978f22b5ca218f51f2670bc4e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 15 14:38:19 2008 -0700
Fix swat. Bug #5613.
Jeremy
(cherry picked from commit 1036bd6f8adcff316d2d86201b1a7097b4b9fe0c)
commit 380176fd004f42c8c9c0f2f4d0f32053ec11cadf
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 15 13:01:54 2008 +0200
testparm: refactor the per-share logic checks out into do_per_share_checks().
Just to enhance clearness of the code.
Michael
(cherry picked from commit cd5d13dec0153c64d541e85bd13138b738cf50af)
(cherry picked from commit 01b1aff4ac884b91d95d89ac7e53cb0e1a748787)
commit cfe2d6901d527e1587899484bfde268380d44bea
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 15 12:55:57 2008 +0200
testparm: skip the per-share logic checks when --skip-logic-checks is specified.
Michael
(cherry picked from commit 6cafee7e6ae02a32a9f2ddf313d2a20224fa22fe)
(cherry picked from commit 3b8524957561911ae7943172fe775200fc98f75a)
commit f861d4951a8b5b801f35b66347efc8f3fbbc4233
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 15 12:52:25 2008 +0200
testparm: rename -g|--skip-global-ckecks to -l|--skip-logic-checks
as suggested by Karolin.
That is what it really means. And per-share logic tests will be
disabled by the same switch, too...
Michael
(cherry picked from commit 5b8a4c33482917a1ef7071df224957ba831d853a)
(cherry picked from commit 04cdfbba747b928c3133e29446c0fe91c39a41f2)
commit 83b33f1346bb07c4cc2a9ab0213861fc4a5d82c5
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 15 00:27:01 2008 +0200
testsuite: fix bug #5594 by using the new --skip-global-ckecks switch
Michael
(cherry picked from commit 32f4b1443af12026c419684be45a7d8b96ccfaac)
(cherry picked from commit 87c4f1fc67df146585a6e0862b701b6e6193f0f0)
commit 85d6341afb285d4499d4fe25b2795580ededeb17
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 15 00:17:58 2008 +0200
testparm: add a switch --skip-global-checks.
This allows for successfully calling testparm without the need
to "make install" before. Without this, testparm fails with
the message that the lock directory does not exist...
Michael
(cherry picked from commit eeb018fad65c19804a4e96ea949fc2c64883439e)
(cherry picked from commit 1f245e41fa41d2b67eaa7cc85c29da3384697275)
commit 4ebf728091e56621d3f62d56b50fc58085b384f0
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 14 12:38:28 2008 -0700
Add fix from Simo for bug #5540 - missing code to substitute
%u. Make this the same as other uses.
Jeremy.
(cherry picked from commit 56d8ed48a94b558ad442e38c3d1925c4810dc508)
commit c80a21e752a8f69bffbcb5d4d4a967a03f50d055
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:58:24 2008 +0200
build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 9a2870e936a967b82a100b1e26200d3665311f85)
commit b2f0420142023f283240cd8d7a5e0216b62af26f
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:57:11 2008 +0200
build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 1aad6661adc5800243969b761c653b57ff280f69)
commit 6cdefc93aed47f157a0382bf4fbfe2385cd68dbe
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:56:09 2008 +0200
build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 7420f409c2fbfd5f90d45a4a435489fe31016581)
commit 07001cd6e6532411285a271823d3f89f7080bc90
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:50:11 2008 +0200
build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit a7ee1c16c234ad5d0aa8853081d8f5f4f763614b)
commit b2bc502085d5663c4098eef82cab1e5733d202bf
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:47:57 2008 +0200
build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 22d0f686eb6649b3d4a8c7f142257e303c54568e)
commit 73381cac8f6f30b6944613b63d4c752a4e81b3ca
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:44:34 2008 +0200
build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@
This should fix some more picky makes when not building @LIBWBCLINET_SHARED at .
Moreover, we want to link against -lwbclient, not against bin/libwbclient.so,
anyways.
Michael
(cherry picked from commit a60d295d3ac4a6e7a055927951f7207f09a3df7c)
commit 0562af57c71964ee7283a9cea46d0a1b18b954aa
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:39:32 2008 +0200
build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 0f609e55d8c58285de73fa0955df951042dfd9a0)
commit 525e3f230a542394dad734411edc8052dcec3dc5
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:37:41 2008 +0200
build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 15dd9f78650b0b853cb6955429ae58656be3945e)
commit 834b63db404811a27769dcb7b9921abf0d27e0da
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:35:24 2008 +0200
build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.
Make picky makes happier.
Michael
(cherry picked from commit 2d2b48749e885d2a529dab273c8419c5445568d3)
commit 90b4911ed12f5f027eb1d406375a73b89e4ed599
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 13:32:19 2008 +0200
build: fix build on systems with picky make and without shared libwbclient
This produces empty lines in Makefile rules.
Replacing @WINBIND_LIBS@ by $(WINBIND_LIBS) where
WINBIND_LIBS=@WINBIND_LIBS@ should fix that.
Michael
(cherry picked from commit fd9b4bcaa5302d3d6245eb7b21ce0ef9994f718d)
commit b64c3ffc1583ace6a006874fd27b69bcc59873f1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 23:49:58 2008 +0200
docs: fix the specified default of "password server" - it is *, not "".
Michael
(cherry picked from commit d7f759d302612ef9eb0bba022f3b3e1dd433f843)
(cherry picked from commit 42eec4da853b9d3988fc22494cc3d632d1459732)
commit c800faf34967362c48c03810617712c47bd03eb3
Author: Simo Sorce <idra at samba.org>
Date: Sat Jul 12 21:28:18 2008 -0400
Fix regression introduced with 4086ef15b395f1a536fb669af2103a33ecc14de4
We must not return an error here just because we are offline.
We must instead fix the mappings to the best of our knowledge
(ie mark as mapped, expired ones, and as unmapped, unknown ones)
(cherry picked from commit c17b125e1fdb9b71877200b2419d7f682bb52e87)
commit 826461f7efcd7bef10b69dec02b75133df3b7b1a
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 11 15:35:24 2008 +0200
build: fix build of libaddns shared lib : it needs socket_wrapper.
Michael
(cherry picked from commit 58bc04b31b15c36505c5ecb2d8373e9033972390)
(cherry picked from commit 2c097e7f333553ff4a540aef7668de7382723a74)
commit 2150fbf81445e7b75d06c6da91325c138acea844
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 11 14:38:22 2008 +0200
build: fix build of libaddns shared lib. symbols file was missing.
This symbols file is checked because mksyms script currently does
not support headers without exportet symbols...
Michael
(cherry picked from commit 1fa57b47e8f8da33a5713096c187bafb3a6c5b79)
(cherry picked from commit 8eb7be8d1dbf76f7a0f09e0e0271762902fd7e4b)
commit 780a01a76be3375565020661fb4026ad27412c54
Author: Herb Lewis <herb at samba.org>
Date: Thu Jul 10 21:05:30 2008 -0700
cleanup some dup code by passing the password to the wbinfo_auth*
functions
(cherry picked from commit 710d42d0b7de44fb684edf7412bfb4a48c3daf07)
commit ba6bb5172567d836d7820c4d267481d8e40a6336
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Thu Jul 10 18:45:48 2008 +0000
Fix realpath() check so that it doesn't generate a core() when it fails.
(cherry picked from commit 5c5e96df3b96bfab93ed0f0b1e5e7f7615cb356e)
commit 98c41f184358bcb47a2a6989c4e9f7d709708aa5
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 3 20:51:42 2008 +0200
Always set "registry shares = yes" for "include = registry"
This fixes the case where "include = registry" is set in the smb.conf text file
and *only* shares (no [global] settings) are present in the registry.
Michael, please check!
Thanks,
Volker
(cherry picked from commit 6c80362e291d8c5e748b987a583e8e32acc36354)
(cherry picked from commit dacd0f90f3706db6ffab0cd7662d22eb40811e05)
commit 4ebbcd685bd6228a35f60d00aeff98dd61d42385
Author: Michael Adam <obnox at samba.org>
Date: Tue May 27 10:59:11 2008 +0200
loadparm: fix process_registry_shares() when there is only [global] in registry.
This fixes testparm printing "Error loading services." when there is only
the global section in registry and no other service definition.
Michael
(cherry picked from commit 28d197220038b9a47af177b88a8587f865e45de5)
(cherry picked from commit efb9a844e74b91d63fda98fa9cc12136bf1f172a)
commit 575423eb9d3a03848429534086bd81b24c39a045
Author: Michael Adam <obnox at samba.org>
Date: Mon May 26 11:58:11 2008 +0200
loadarm: fix testparm with "config backend = registry".
Set the iServiceIndex to "-1" for starup with either config
backend (originally only for text backend). Otherwise,
process_registry_shares() will fail.
Currently, the only user of lp_load_with_registry_shares() is testparm.
Michael
(cherry picked from commit 5e2b925367241c41793b2eb7a628e9fc9f3ac8ff)
(cherry picked from commit 6fd007905d4ba09309735a14635502008e082cb6)
commit 6ae1e2cb81a87df21dfce89158338714079f9ee9
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:41:05 2008 +0200
testparm: list registry shares with testparm.
I.e., use lp_load_with_registry_shares() instead of lp_load().
Michael
(cherry picked from commit 95339c0c1ecc49049f1fc176f72a1dcac639e06d)
(cherry picked from commit e1bbcc6c5401c59726ca40dadff5760c2800b5c1)
commit c65fb38d1c13cd8e6692376ecd494fd488ebeb53
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:39:45 2008 +0200
loadparm: add funcion lp_load_with_registry_shares().
This is like lp_load(), except that it will load the
registry shares into the services aarray when registry
shares are activated.
Michael
(cherry picked from commit b387c614ba8d1d3960f6917f03f0fd433cf2b2ee)
(cherry picked from commit dc04efa42104100e677bccc307726106d8ca4b31)
commit 45a5111c2bf8bb9089f6587ccc93574085e8f34e
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:39:02 2008 +0200
loadparm: add call to do_section() to process_registry_service().
Michael
(cherry picked from commit e1b76cd5d646bb9083cfca0d15a84183cad72882)
(cherry picked from commit 661960e2bd73a6f773531608a635e17be28afeba)
commit 865abe2ba23b0b1bbd16a67aa509eb22fa34376c
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:25:34 2008 +0200
loadparm: add parameter allow_registry_shares to lp_load_ex().
This allows for registry shares to be activated, i.e. loaded into
the services array at lp_load() time.
Michael
(cherry picked from commit b3233ecefd5df745ba7e10511f9ab36064036b10)
(cherry picked from commit 02fa674dd62ad400502046fbe9e05a1578b4deab)
commit 80c2a47164372033025a1e3c9c953eba7b2762bb
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:15:20 2008 +0200
loadparm: add a function process_registry_shares()
This loads the shares defined in registry into the services array.
Michael
(cherry picked from commit b3a90b72517c2e25d972796908aec4d2b85a030e)
(cherry picked from commit fc60bc9389e5a0ca278b3622e96aed1626c4882e)
commit 04a49990844a8890fe3d05a9f339098dd10d3710
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 02:08:14 2008 +0200
loadparm: refactor processing of service out of process_registry_globals()
into new function process_registry_service().
Michael
(cherry picked from commit 2986e5174e69527465ae7ef8e108110416752b56)
(cherry picked from commit e7362a769c4ad7b6715c87dc8ba77ffdd38a4824)
commit e10b166687d75dc8cab11cc3fb0a50749918f86c
Author: Michael Adam <obnox at samba.org>
Date: Thu May 15 01:40:11 2008 +0200
loadparm: refactor initalization of registry config out into lp_smbconf_ctx().
Michael
(cherry picked from commit 83cd9f74d57c462ad5c8956b3ce3c81bea429b67)
(cherry picked from commit 7f38c280c821cc7950036a709e01383ab94ab55e)
commit 38962ee69f55533f59340c7c41c5ca5957319be3
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 22:49:50 2008 +0200
build: fix bug #5608: link creation for libtalloc.so.1 (and friends) on solaris 8
on solaris, ln -s -f does not remove the link if it exists.
Michael
(cherry picked from commit f4d26db5dfccb962f5ca2cc03e9012a9883e16d8)
commit 90ef647e521818542ac1b23e4d8810a8cbf1f50b
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jul 10 18:20:30 2008 +0200
Fix some uninitialized variable references via ndr_print
(cherry picked from commit 43891c397849ccc9c64e5252b6c0350beb754087)
commit 1278cc41e824e3a50d048f6d6f366f8af2f0e443
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jul 10 18:12:24 2008 +0200
Fix a segfault in base64_encode_data_blob
We did not allocate enough memory for the \0 and a = at the end
(cherry picked from commit 719ec00949094b7d3b01e9ac829183ae08f46417)
commit 101d28c3d84302e67098b883a53546cb2c425ca9
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jul 10 10:47:46 2008 +0200
Give a nice error message if trying to join with a non-privileged user
(cherry picked from commit 088a6f42476782267c50f0a5ea029db0eede6cdd)
commit 93e85c91c67ca21f59ddbfa61a36b2e8df3f8807
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 14:05:33 2008 +0200
docs: fix the net conf section of net(8) to mention "config backend = registry".
Michael
(cherry picked from commit c2e9d82d9497f0d245a46c5c82ff15306788109e)
(cherry picked from commit 9ab1efbe12e04fca2433217c76d3a16df6e868b0)
commit de3f57e79a43d9a7d88a8f1389b4c2362f2b3f23
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 13:50:04 2008 +0200
docs: fix VERSION section in the net(8) manpage.
It still said for version 3.0 ..
Michael
(cherry picked from commit 93887f2e42bf4e632dab716deda6d2951dbd1f2a)
(cherry picked from commit 9b3ecf75a22aff43a67a62a9dd67397414274d9b)
commit 5c0ecab1e80d4cbb0c1dfa7bd888dd91e93c21ab
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 13:46:25 2008 +0200
docs: update the section about net conf in the net(8) manpage.
The description of the "net conf {get,set,del}includes" commands was missing.
Michael
(cherry picked from commit 671988c7b5891deeca23e2305fe101a3be1a44d2)
(cherry picked from commit baae7347e94b1b849e80d8da323afc179523430a)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 33 ++++
docs-xml/manpages-3/net.8.xml | 48 +++++-
docs-xml/smbdotconf/security/passwordserver.xml | 3 +-
source/Makefile.in | 213 ++++++++++++-----------
source/configure.in | 12 +-
source/exports/libaddns.syms | 5 +
source/groupdb/mapping.c | 9 +-
source/lib/util_str.c | 4 +-
source/libsmb/libsmb_context.c | 19 ++
source/modules/vfs_default.c | 8 +-
source/nsswitch/wbinfo.c | 71 +++-----
source/param/loadparm.c | 147 ++++++++++++----
source/passdb/pdb_ldap.c | 6 +-
source/rpc_client/init_lsa.c | 2 +
source/script/tests/test_testparm_s3.sh | 2 +-
source/utils/testparm.c | 135 ++++++++-------
source/web/swat.c | 31 ++--
source/winbindd/idmap.c | 30 ++--
18 files changed, 495 insertions(+), 283 deletions(-)
create mode 100644 source/exports/libaddns.syms
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 03b6100..6911438 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -19,11 +19,20 @@ Changes since 3.2.0
o Michael Adam <obnox at samba.org>
+ * BUG 5608: Fix link creation for libtalloc.so.1 (and friends) on
+ Solaris 8.
+ * BUG 5594: Fix "make test" by adding and using a new testparm
+ switch "--skip-logic-checks".
* Fix creation of libaddns.a, libsmbclient.a and libsharemodes.a.
+ * Update the section about net conf in the net(8) manpage.
+ * Improve processing of registry shares.
+ * Fix listing of registry shares with testparm.
+ * Fix several build issues.
o Jeremy Allison <jra at samba.org>
* BUG 5578: Fix error from strlcat.
+ * BUG 5613: Fix flushing of smb.conf when creating a new share using SWAT.
* Ensure consistent use of pdb_get_nt_passwd instead of
pdb_get_lanman_passwd.
* Remove worrying warning message when safe_strcpy tries to copy a
@@ -49,12 +58,27 @@ o SATOH Fumiyasu <fumiyas at osstech.co.jp>
to owning group.
+o Volodymyr Khomenko <Volodymyr.Khomenko at exanet.com>
+ * Make ntimes function more like POSIX and allow NULL arg.
+
+
o Volker Lendecke <vl at samba.org>
* BUG 5512: Fix alignment problems on sparc.
+ * Fix a segfault in base64_encode_data_blob.
+ * Fix some uninitialized variable references via ndr_print.
+ * Fix error message if trying to join with a non-privileged user.
+ * Fix setups using "include = registry" without [global] settings
+ in the registry.
+
+
+o Herb Lewis <herb at samba.org>
+ * Cleanup some duplicate code by passing the password to the wbinfo_auth*
+ functions.
o Zach Loafman <zachary.loafman at isilon.com>
* Set sin[6]_family instead of ss_family in in[6]_addr_to_sockaddr_storage.
+ * Fix realpath() check so that it doesn't generate a core() when it fails.
o Lars Müller <lars at samba.org>
@@ -65,6 +89,15 @@ o Darshan Purandare <dpurandare at isilon.com>
* Add broadcasting of the debug message to all winbindd children.
+o Andreas Schneider <anschneider at suse.de>
+ * Release still reachable memory if the smbclient context is freed.
+
+
+o Simo Sorce <idra at samba.org>
+ * BUG 5540: Fix "set primary group script" user option substitution.
+ * Fix regression in Winbindd offline mode.
+
+
o Bo Yang <boyang at novell.com>
* Allow authentication and memory credential refresh after password
change from gdm/xdm.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 9e2558e..cdf0fbb 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1389,7 +1389,9 @@ The deployment of this configuration data can be activated in two levels from th
activated by setting <parameter>registry shares</parameter> to
<quote>yes</quote> in the [global] section and global configuration options are
activated by setting <smbconfoption name="include">registry</smbconfoption> in
-the [global] section.
+the [global] section for a mixed configuration or by setting
+<smbconfoption name="config backend">registry</smbconfoption> in the [global]
+section for a registry-only configuration.
See the <citerefentry><refentrytitle>smb.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> manpage for details.
</para>
@@ -1409,6 +1411,9 @@ registry.</member>
<member>net conf setparm - Store a parameter.</member>
<member>net conf getparm - Retrieve the value of a parameter.</member>
<member>net conf delparm - Delete a parameter.</member>
+<member>net conf getincludes - Show the includes of a share definition.</member>
+<member>net conf setincludes - Set includes for a share.</member>
+<member>net conf delincludes - Delete includes from a share definition.</member>
</simplelist>
</para>
@@ -1509,9 +1514,46 @@ Delete a parameter stored in registry.
</refsect3>
<refsect3>
-<title></title>
+<title>CONF GETINCLUDES <replaceable>section</replaceable></title>
<para>
+Get the list of includes for the provided section (global or share).
+</para>
+
+<para>
+Note that due to the nature of the registry database and the nature of include directives,
+the includes need special treatment: Parameters are stored in registry by the parameter
+name as valuename, so there is only ever one instance of a parameter per share.
+Also, a specific order like in a text file is not guaranteed. For all real
+parameters, this is perfectly ok, but the include directive is rather a meta
+parameter, for which, in the smb.conf text file, the place where it is specified
+between the other parameters is very important. This can not be achieved by the
+simple registry smbconf data model, so there is one ordered list of includes
+per share, and this list is evaluated after all the parameters of the share.
+</para>
+
+<para>
+Further note that currently, only files can be included from registry
+configuration. In the future, there will be the ability to include configuration
+data from other registry keys.
+</para>
+</refsect3>
+
+<refsect3>
+<title>CONF SETINCLUDES <replaceable>section</replaceable> [<replaceable>filename</replaceable>]+</title>
+
+<para>
+Set the list of includes for the provided section (global or share) to the given
+list of one or more filenames. The filenames may contain the usual smb.conf
+macros like %I.
+</para>
+</refsect3>
+
+<refsect3>
+<title>CONF DELINCLUDES <replaceable>section</replaceable></title>
+
+<para>
+Delete the list of includes from the provided section (global or share).
</para>
</refsect3>
@@ -1529,7 +1571,7 @@ Delete a parameter stored in registry.
<refsect1>
<title>VERSION</title>
- <para>This man page is complete for version 3.0 of the Samba
+ <para>This man page is complete for version 3 of the Samba
suite.</para>
</refsect1>
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 188cea8..0da247d 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -92,8 +92,7 @@
</description>
<related>security</related>
-<value type="default"></value>
+<value type="default">*</value>
<value type="example">NT-PDC, NT-BDC1, NT-BDC2, *</value>
<value type="example">windc.mydomain.com:389 192.168.1.101 *</value>
-<value type="example">*</value>
</samba:parameter>
diff --git a/source/Makefile.in b/source/Makefile.in
index d63063d..41753c5 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -66,7 +66,14 @@ LDAP_LIBS=@LDAP_LIBS@
NSCD_LIBS=@NSCD_LIBS@
UUID_LIBS=@UUID_LIBS@
WINBIND_LIBS=@WINBIND_LIBS@
+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@
+POPT_LIBS=@POPTLIBS@
+LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
+LIBTDB_LIBS=@LIBTDB_LIBS@
+LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
INSTALLCMD=@INSTALL@
INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
@@ -378,7 +385,7 @@ KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
libaddns/dnsgss.o libaddns/dnsmarshall.o
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@
LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
nsswitch/libwbclient/wbc_util.o \
@@ -1329,258 +1336,258 @@ bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \
- @POPTLIBS@ @SMBD_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
- @WINBIND_LIBS@
+ $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ $(WINBIND_LIBS)
bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @POPTLIBS@ \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
$(KRB5LIBS) $(LDAP_LIBS)
bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
- $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) \
- $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
+ $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
- $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
- $(KRB5LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
- @WINBIND_LIBS@
+ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ $(WINBIND_LIBS)
bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
+ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
+ $(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
- @INIPARSERLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@
+ @INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS)
bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/mount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
+ @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
+ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
- $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ \
- @LIBTDB_LIBS@
+ $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
+ $(LIBTDB_LIBS)
bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
- $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ \
- @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
+ $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- @POPTLIBS@ $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ \
- @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
+ $(LIBTDB_LIBS)
bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@
+ $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
- @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@
+ $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
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) \
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
- $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \
- @SMBD_LIBS@ $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \
- @LIBWBCLIENT_SHARED@
+ $(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+ @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ $(WINBIND_LIBS)
bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
- $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
- @POPTLIBS@ $(LIBS) @LIBTALLOC_LIBS@
+ $(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- @POPTLIBS@ @LDAP_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) @LIBTALLOC_LIBS@
+ $(LIBS) $(LIBTALLOC_LIBS)
bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
+ $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
- @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+ $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
--
Samba Shared Repository
More information about the samba-cvs
mailing list