[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-1-141-g5473ac2
Karolin Seeger
kseeger at samba.org
Mon Aug 18 13:53:51 GMT 2008
The branch, v3-2-stable has been updated
via 5473ac21094cd0cc29dbf0a8991eade36ac31f49 (commit)
via 8ecf61fb38879dba5755558c023317321fd2081e (commit)
via d4c0b4a4e566fd971c8842c4389d11cc5c09d150 (commit)
via b6879915bb7544cc9af6e08dfb839817b12aa3da (commit)
via 723cc4eaf689b4a62f21101d265cbadcebcaf49a (commit)
via 9bd25250509fb83f014a6d9ad1c5429daf23b047 (commit)
via bb75ac0c94fb25c94e6e7911151d00634a39307a (commit)
via edc624788d658d3cfa19f558d1eaff1a77c9a4a8 (commit)
via 27ac33ee90749d9d96a86e1b1d7b307d348f160a (commit)
via 706ce801aa1a07ac4629f77aa7ed0d7d477b2426 (commit)
via c03a94784107d582b3b13dd5f89e93084d78cb95 (commit)
via b3adc6346d442157621c034bf9416458db1ed83a (commit)
via 1b8edbd4453f9a1f90984bdef2221fcfa161ff4f (commit)
via 4f3b509445f145b78cbec03d7ea735f9c96e0520 (commit)
via 03ec0553c7efb35b7a099ea513243f47daf14669 (commit)
via 59aedb054d69cbc0f2c51a9ef1599d1161eb5347 (commit)
via 8d20eec6177af48aa270e4d07ec86bcffe396e84 (commit)
via 7cee86acf557d87f2024731b88d6c5a2dd10697c (commit)
via 4f6c4a3ad18b802cb65e212b26f878ccd0f86d19 (commit)
via aa198fa9ead95fa84bffe0da81f77c40362b683d (commit)
via e3fd35886525711f1fb24e8107842e121cea3f63 (commit)
via 27f22900d96e656bf133804f942ef844bea28840 (commit)
via f37fd6dc9373ce1275e9bdd26367b17fbaac86ea (commit)
via dc883d0289d58ccf98e5ae5365fc58a28baeab25 (commit)
via 3949b1b1261836cbc9e00606f1af4ab88002447f (commit)
via 3af8005febb151963af3c33b93c2cc441a8c31de (commit)
via b7638090e2e201c7617badc15edcf548ef424de1 (commit)
via 428b5530e1f29472ee371d5d46dfeaacc03320a9 (commit)
via 804dc3e904562056527ab4dde1ca55f3af877878 (commit)
via aceed6a52d9ad3ae841d94c08ab46bed749a6097 (commit)
via 0e71287c0d6c780dc377aa11d8668ab92be4062b (commit)
via a518b8b0c861aae697acb846e15ea23d4824dc2b (commit)
via a457d99394e781062069d667c7a8736d7f3705e1 (commit)
via cbb3224ba9a51a5f00900e38605cf7e540b2b8f0 (commit)
via 1e36d1b01354bb9a1f4412a076ab34449e641c6c (commit)
via 1e6ceac5469452b1674194c9821cf0a72b8499a2 (commit)
via 753eca09f62d3399b31e34ee9f2f99ed96ad5d70 (commit)
via b81d558a8ab89f132dab2a2d578daf5db0d14498 (commit)
via 9619fe6718b8a9072f09645c52e016d573f0b9a4 (commit)
via 73229e82c3f2456530c0d5bdefda9f4f4b1b5364 (commit)
via 49bc672333d579c8bb54ad95610b459b45b3938a (commit)
via 4f4a0fa5c6f2857ebbbdd05af8447f48aa773ac9 (commit)
via 9694727f7ee529f96e7b219ebdbd59d681a948f7 (commit)
via 156f56de44f07f091ce1eb110a35aa0c5a00635a (commit)
via 749409c709f4bb79b1955c45602985a2871a2868 (commit)
via 2d873b563f674e2b983ef476124e3dba5a9d2643 (commit)
via 89b4f748f5d2f4e44f7885918a29d34358e6e3a0 (commit)
via 779a19258d20b3bd8d2f1b646bfa1cb8c23b53ba (commit)
via 9a343bdd6eea64a6ea6d0880ad167f453f482322 (commit)
via d7fcbe9e56a7fe05eb7ecb5c4bbff12fd81ac44d (commit)
via f09ca86f35c4648a7a42ec2d91a39169002af1da (commit)
via 1a00770b0de9e7988d57ed0c0316ec2d75ab3f36 (commit)
via e13e1b9c46bbc2b780ef4a3bcdd5c5529680797a (commit)
via 2a77e385a8ef72bc21f1fbd8eb754150114d153d (commit)
via 331e9df286c50b7b862a5c1a4a2912cc03130ac9 (commit)
via b9134efb9608b1f5302073bdf3abe60cc8eb10e1 (commit)
via a5247702579e9b4483a58cd1fc26109b7964a0e0 (commit)
via ba541504705a64ceb263d327a9dcdb896850cdc0 (commit)
via f57ce70a21be47f29da717a3f3e83755bf0db335 (commit)
via 51ddde7f9d88296c3c49c6e6d6f5589ac9c2d812 (commit)
via daec66a68fe5d649d6ec922fa99dc799b5539b67 (commit)
via b9990e7facf7fe4ab8b7f2e3b235e918194dda34 (commit)
via 439746802eae6d8609760e9e728979e243cf42cf (commit)
via 82b292bd8d2a1e44aa3975527812a7f3edf1c884 (commit)
via ceeaa95dedadf7f46e05c6baf0671b4728b5b25d (commit)
via 5f4b0144f137855dfe25478ff114c55d3b3e8756 (commit)
via dc1c7242958a1cb3f16c6b255b4672372d65cf51 (commit)
via 683f241dfd2f4d357d7b21fb0ab482ec6efe8c29 (commit)
via a9e0223017faa810a36d8deb470645e0868123f6 (commit)
via edfbfb3105d71726bc6b092ec6e88f7bfea71725 (commit)
via 0a0fa65f27d3bd71eab9b306de75503e626e1929 (commit)
via 1b8b9423420f5fd8cdd47670b4b39c66e37d41ea (commit)
via baa0fa32072e722c22ff2378ccb73ef992b47ab2 (commit)
via 5f3b68b2657b3f15a192fce91080b72c4b994933 (commit)
via 864b100a9b8dcf2641f5d3c1b346bb6e1e176fcb (commit)
via bce6ff6ea78df9b12b0863bebc7bef0e46c836af (commit)
via 54d33d26a3f0718e885eb6924ace55b344ee1cc6 (commit)
via 43f20a0a314bbb3647a90aed28f2367eb099c7f5 (commit)
via a125f2cf0b7c2777c2450275b8e866b3159d883c (commit)
via 7071c5e1615e91a80b843be8d72289f5f379c7a3 (commit)
via 9b73f56a5417275d24aabef5c22db3d508f39d56 (commit)
via 7daeb44211b72083b3a746d6d6df69f7969043f0 (commit)
via ef3ed6fe07b19d9bb069d1077ab81f79576c407a (commit)
via 3df7f7ecb48804e8b7e92cb3b335c04c9a989c87 (commit)
via 7576412b490a914076dcb4d6f782330ecac3f8ee (commit)
via 3d7e7834e400eef000d87663c8160709f7ef3d27 (commit)
via c1e9a280b33dd556cf2ae217364321949d50744c (commit)
via bda8d6b1af8d381dffbb39d4cbd7b291b24161a5 (commit)
via 43c5493460978ec37912284883e56ac2f044dce8 (commit)
via daccfe737dcb778426efbac4790356a204f4ad45 (commit)
via 383cddb46923737e72c3a030a39017ab6e479cef (commit)
via eb4ff2fe0b958dc0498c426ea3d211f6e546cf48 (commit)
via c72bedb09c22b40b228f5abe7b68d9993bff6023 (commit)
via ce7c42ffd632aa379b8166327d8e19510edc1711 (commit)
via ce3e01b64c4437b01c206c9c6d7bde055854863e (commit)
via 6edbbc4f5d346cf934b3e76b282cb5d728fc2c73 (commit)
via 81edb3802d9a9c67460b4f7ed05fef42c7d573ba (commit)
via fcdb9f8871419002a1d8989f0665ad728d17012e (commit)
via 75d2406284aabab576aae7c611c509d632542f0b (commit)
via 13a0007f54dbbb0db4bdb477970bc407055af93d (commit)
via 72d7c3bb8dade0b2b8edc305cb95b368c44b0581 (commit)
via 7fecafab0e421eb7a09c30f1b37e08b0df65bb83 (commit)
from 51872b7607d70da804f6cc9f1292c54e980f50e1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 5473ac21094cd0cc29dbf0a8991eade36ac31f49
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Aug 18 15:52:09 2008 +0200
WHATSNEW: Update changes since 3.2.1.
Karolin
(cherry picked from commit d1738c966cc090fbe4bcd246bebb9c693235152a)
commit 8ecf61fb38879dba5755558c023317321fd2081e
Author: Jeremy Allison <jra at samba.org>
Date: Sat Aug 16 19:25:22 2008 -0700
Fix bug 5696. The problem was when smbd
was asking for a winbindd name to SID lookup of
"Unix Group\name" where "name" was also a valid username,
the winbindd passdb lookup of that name was losing the
domain string info before calling lookup name (ie. lookup_name()
was being called with just the string "name", not the
full string "Unix Group\name").
The passdb backend of winbindd has to cope with
not only names from it's own global SAM domain,
but it does lookups for BUILTIN and "Unix User"
and "Unix Group" also, so making it guess by
losing the domain string is "A Bad Idea" (tm) :-).
Note that as winbind globally calls winbind_off()
at startup, it's safe for winbind to call sys_getgrnam()
to do the "Unix Group" lookup from inside lookup_name().
Jeremy.
(cherry picked from commit 780a4ff80dfd03a2c422920dbd101e8f58f7136e)
commit d4c0b4a4e566fd971c8842c4389d11cc5c09d150
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 16 14:30:20 2008 -0400
cifs.upcall: negatively instantiate keys on error
When a request-key upcall exits without instantiating a key, the kernel
will negatively instantiate the key with a 60s timeout. Older kernels,
however seem to also link that key into the session keyring. This
behavior can interefere with subsequent mount attempts until the
key times out. The next request_key() call will get this negative key
even if the upcall would have worked the second time.
Fix this by having cifs.upcall negatively instantiate the key itself
with a 1s timeout and don't attach it to the session keyring.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 7e05ff65a7907bf34e2d422f7c941002cfb86971)
commit b6879915bb7544cc9af6e08dfb839817b12aa3da
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Sat Aug 16 14:30:19 2008 -0400
Building cifs.upcall is giving this build warning:
client/cifs.upcall.c:205: warning: function declaration isn’t a prototype
This patch fixes this by properly declaring usage() args as void.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
(cherry picked from commit 7b25c4d2363ee772eed44174c882a7fbc59f0568)
commit 723cc4eaf689b4a62f21101d265cbadcebcaf49a
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Sat Aug 16 14:30:18 2008 -0400
cifs.upcall: fix manpage and comments
The "cifs.resolver" key type has been changed to "dns_resolver". Fix
the comments at the top of cifs.upcall and the manpage accordingly.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
---
docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++--
source/client/cifs.upcall.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(cherry picked from commit 34cf3c012e463d0ea04616308738aadea438f48b)
commit 9bd25250509fb83f014a6d9ad1c5429daf23b047
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Sat Aug 16 14:30:17 2008 -0400
cifs.upcall was not recognizing the newer name "dns_resolver" key type
(as a synonym for the older "cifs.resolver" name) when resolving host
names to ip addresses for the kernel.
Acked-by: Jeff Layton
(cherry picked from commit 370722392d7f42f8094f574cac08a6a12e5893a3)
commit bb75ac0c94fb25c94e6e7911151d00634a39307a
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Sat Aug 16 14:30:16 2008 -0400
cifs.upcall: fix compile warning
Steve French noticed these warnings when building cifs.upcall:
Compiling client/cifs.upcall.c
client/cifs.upcall.c: In function 'usage':
client/cifs.upcall.c:204: warning: declaration of 'prog' shadows a global declaration
client/cifs.upcall.c:33: warning: shadowed declaration is here
Change the usage function to not take and arg and have it just use the global
"prog" variable. Fix a typo in the log message generated when an unknown
option is specified. Also getopt() always returns '?' when it sees an unknown
option so there's no point in printing it out.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit bd1cf48d7e20cb534bd672bacbf3ac4a87d1a7b4)
commit edc624788d658d3cfa19f558d1eaff1a77c9a4a8
Author: Jeremy Allison <jra at samba.org>
Date: Sat Aug 16 14:30:08 2008 -0400
This patchset comprises a number of cleanups for the cifs upcall
binary. The biggest change is that it renames it from cifs.spnego
to cifs.upcall since the cifs.spnego name really isn't applicable
anymore.
It also fixes a segfault when the program is run without any args
and adds a manpage. Comments and/or suggestions appreciated.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 1d88c3431a1abf5fe6527fcbdf43972607a317ee)
commit 27ac33ee90749d9d96a86e1b1d7b307d348f160a
Author: Volker Lendecke <vl at sernet.de>
Date: Sat Aug 16 11:12:35 2008 +0200
Attempt to fix Coverity ID 596
Jeremy, please check & push if it's ok.
(cherry picked from commit 7e9b24a12d91fc558864e91852028adb9a381838)
commit 706ce801aa1a07ac4629f77aa7ed0d7d477b2426
Author: Volker Lendecke <vl at sernet.de>
Date: Sat Aug 16 11:17:09 2008 +0200
Attempt to fix Coverity ID 595
is_ipaddress already dereferences "name", so the NULL check is pointless after
calling it.
(cherry picked from commit a252ad90136fbc338c0946a5fd5e5322b8d95a01)
commit c03a94784107d582b3b13dd5f89e93084d78cb95
Author: Herb Lewis <hlewis at panasas.com>
Date: Fri Aug 15 15:30:40 2008 -0700
I think the problem with these functions is that lookup_usergroups
should never include the user SID.
The comment for the function in winbindd/winbindd_ads.c says
/* Lookup groups a user is a member of. */
The following patch makes the wbinfo calls return the correct data
before and after a login.
(cherry picked from commit ecf96a26bfe18899133d68032b0cda00177d57d0)
commit b3adc6346d442157621c034bf9416458db1ed83a
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 15 23:17:48 2008 +0200
build: fix a typo in the installlibtalloc rule.
The symlink liballoc.so -> libtalloc.so.1 would have been
created unconditionally, independent of the existence of
libtalloc.so.1.
Michael
(cherry picked from commit 04974818bda75c4315ad09b623e5df55c87dbc87)
(cherry picked from commit 402da4046160b01d873cba72033ed7cfc7e21387)
commit 1b8edbd4453f9a1f90984bdef2221fcfa161ff4f
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Wed Jul 16 09:47:06 2008 -0400
Static libsmbclient library needs to include all objects
LIBSMBCLIENT_OBJ0 contains only the libsmb/libsmb_*.o files. We need the
more inclusive set of object files defined by LIBSMBCLIENT_OBJ1.
Derrell
(cherry picked from commit 6c33c620072d641fc19ca0224c16af75f6cd7e9e)
(cherry picked from commit 41d440c3198752281556699cc9744b490b9b0a5e)
commit 4f3b509445f145b78cbec03d7ea735f9c96e0520
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 40e58351472689dbefb02e185d958bee5ca83937)
commit 03ec0553c7efb35b7a099ea513243f47daf14669
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Wed Jul 9 00:05:50 2008 -0700
Make DSO_EXPORTS_CMD regexp more POSIX compliant
The FreeBSD sed command doesn't understand \? without passing -E to turn
on extended regexps. This patch changes the DSO_EXPORTS_CMD regexp to a
POSIX compliant RE by switching the \+ to a \{1,\} bound and the \? to a
\{0,1\} bound.
(cherry picked from commit 0acc888ca91a7401c5e54388c58272e263f73069)
(cherry picked from commit e233cdeb16e635260197e30528eef20d29678052)
commit 59aedb054d69cbc0f2c51a9ef1599d1161eb5347
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:09:06 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 8897aaec32ef7cb4dab37a70754c8596409fed00)
(cherry picked from commit 216623bb706f6b9ca9195829b9f9a8ab8485c44d)
commit 8d20eec6177af48aa270e4d07ec86bcffe396e84
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:08:31 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 bf619d019225a7aaf17e213e65c5734e68094142)
(cherry picked from commit bf267c57440b0bfedddb8e4d17dc1f23b758cd50)
commit 7cee86acf557d87f2024731b88d6c5a2dd10697c
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:07:27 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 603b83c980a73e13f7dad35a28830105358c7544)
(cherry picked from commit 71e3a41c8e92e196130e5b4514f1014cf0549bf8)
commit 4f6c4a3ad18b802cb65e212b26f878ccd0f86d19
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:06:39 2008 +0200
build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 1f0feb3d12aa93400e8ba604df36a00d7cfaa07a)
(cherry picked from commit d10eba03ec5b624d364f9b0210cdaf6fddb9fd19)
commit aa198fa9ead95fa84bffe0da81f77c40362b683d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:06:05 2008 +0200
build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit cd3c667bdaa8c2b09debbfd8c3389cf9f6d690e9)
(cherry picked from commit cdc5b3ca7aea71812d8c4d51b088b0aa3ce85b68)
commit e3fd35886525711f1fb24e8107842e121cea3f63
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:04:53 2008 +0200
build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@
This should fix some more picky makes when not building @LIBWBCLINET_SHARED@
Moreover, we want to link against -lwbclient, not against bin/libwbclient.so
anyways.
Michael
(cherry picked from commit 73582e4c5168301696cdca569167402f17a67218)
(cherry picked from commit de7c35a8ab9701144d014199d156330cf6c1948f)
commit 27f22900d96e656bf133804f942ef844bea28840
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:02:08 2008 +0200
build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 4330a2ab1308bd2b1508d5126146742540219520)
(cherry picked from commit bec1046d54c6368ad7bc2171c27b4d39bdf369b4)
commit f37fd6dc9373ce1275e9bdd26367b17fbaac86ea
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 18:00:50 2008 +0200
build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 1719fd3ccc110b90908410c07aee862a8758e683)
conflicts resolved
(cherry picked from commit 69203d903833d7e1308c8d5f16f1046b52a26097)
commit dc883d0289d58ccf98e5ae5365fc58a28baeab25
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 17:58:53 2008 +0200
build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.
Eliminate more potential traps for picky makes.
Michael
(cherry picked from commit 87f56f28800d2045e70739a8edcd359ddee662a7)
(cherry picked from commit 75822b4bd7ef61d52ef7900800af5106f942350a)
commit 3949b1b1261836cbc9e00606f1af4ab88002447f
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 14 17:55:48 2008 +0200
build: use $(WINBIND_LIBS) instead of @WINBIND_LIBS@ in rules.
This fixes the build on systems with picky make, where
libwbclient is not built as a shared library, since the
expansion of @WINBIND_LIBS@ will result in an empty line
in the rule with just the leading tabs/spaces.
Michael
(cherry picked from commit aff6822c3ab3ea46d928570f03f681f53ccf3d50)
conflicts resolved
(cherry picked from commit 67834235eb62f16bf366668760f628a67c330c12)
commit 3af8005febb151963af3c33b93c2cc441a8c31de
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 16:25:21 2008 +0200
build: remove SHLIBS variable, and distribute deps for shlibs and test_shlibs target
Michael
(cherry picked from commit 939e75126ebfcd9124781b5d70a68886c4bf9a54)
(cherry picked from commit 40c1092a305f3825fbf3362346ebbfcde562d0aa)
commit b7638090e2e201c7617badc15edcf548ef424de1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 15:51:14 2008 +0200
build: create a new uninstalllibs target and use it in "make uninstall"
Michael
(cherry picked from commit 73a3e4e1eaa408ef0ddbbb8aa0113fdc869057bb)
(cherry picked from commit 5c95eb75391290dd6d9fcb0cba23c4f4756b151c)
commit 428b5530e1f29472ee371d5d46dfeaacc03320a9
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 15:49:44 2008 +0200
build: distribute the libs target over the library-specific sections.
Michael
(cherry picked from commit 18b932c980f2acdf9b5569cf61afece28c02abf5)
(cherry picked from commit 5dab57c61853163cb8f4a6a1887f748096be175c)
commit 804dc3e904562056527ab4dde1ca55f3af877878
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 15:01:56 2008 +0200
build: use the libs target instead of the LIBRARIES variable as dependecy for "all".
Michael
(cherry picked from commit 991c3fefa850c0b48111c6c5bacae14163872b58)
(cherry picked from commit 9e65aea4a2a906933126f69e80dac914972f27f9)
commit aceed6a52d9ad3ae841d94c08ab46bed749a6097
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 14:58:36 2008 +0200
build: distribute the cleanlibs target over the library-specific sections.
Michael
(cherry picked from commit 2588c399a0df99a87cf7c749133bceb6aa34a21a)
(cherry picked from commit 19689e27d48c8cf4cd2a1e8fb800a38a4a910c99)
commit 0e71287c0d6c780dc377aa11d8668ab92be4062b
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 14:15:39 2008 +0200
build: introduce a installibs target and use it in "make install"
The target is distributed over the library-specific sections.
Michael
(cherry picked from commit 0afe205a7da4103a4fcfdd24f45a164493e3b9b8)
(cherry picked from commit 5591d9c86e235b191065f989499d2d14a61b1606)
commit a518b8b0c861aae697acb846e15ea23d4824dc2b
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 8 17:00:07 2008 +0200
build: move definition of LIBADDNS_OBJ back up to LIBADDNS_OBJ0
to keep stuff together...
Michael
(cherry picked from commit 22735ee14a244dbda768c26dbe83a1b2aa3c03ec)
(cherry picked from commit 21595a0a269ef7f3c3428cb41f45c3d1bd1fb661)
commit a457d99394e781062069d667c7a8736d7f3705e1
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 8 16:55:52 2008 +0200
build: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
to their original place. The problem was that LIBSMCLIENT_OBJ1 is used
in SMBGET_OBJ and that the difinition of LIBSMBCLIENT_OBJ1 was moved
below the bin/smbget target. Somehow it had worked for me.
Thanks to Derrell for pointing that out.
Michael
(cherry picked from commit c4e51f5e761ab23fa08197fa9a52af6db4ab839d)
(cherry picked from commit 2afd72288c54c4a0251cee4c99710bd894cf2b3f)
commit cbb3224ba9a51a5f00900e38605cf7e540b2b8f0
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:32:50 2008 +0200
build: fix creation of libsmbclient.a - don't link in libtalloc.a
a step in fixing bug #5590
Michael
(cherry picked from commit bae7bd4bba4d49edec9cb58d47c1cb82aba16c6b)
(cherry picked from commit f61d00d18bda40d2736b45d1caf238ed42140e2e)
commit 1e36d1b01354bb9a1f4412a076ab34449e641c6c
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:30:12 2008 +0200
build: fix creation of libaddns.a - don't link in libtalloc.a
a step in fixing bug #5590
Michael
(cherry picked from commit 4d6edcb2c8bd516e09a864d1990675ba9bcec796)
(cherry picked from commit 68aa96ff700feb43fd429c650ff6012a27bc445d)
commit 1e6ceac5469452b1674194c9821cf0a72b8499a2
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 11:57:43 2008 +0200
build: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
a step in fixing bug #5590
Michael
(cherry picked from commit 76f9e2e64644c6f21baf523b91455dc3aebb2163)
(cherry picked from commit 92e0a9c1b71eda9cc8681e4b28f06431568aaf05)
commit 753eca09f62d3399b31e34ee9f2f99ed96ad5d70
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:42:59 2008 +0200
build: remove library-versions.in - it is not used any more.
Michael
(cherry picked from commit e2699b7f86302e5c770f8e3160f72f070d700b6c)
(cherry picked from commit 288c4951a102e313a86b461dcd5cf3e7840d65f2)
commit b81d558a8ab89f132dab2a2d578daf5db0d14498
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:35:08 2008 +0200
build: set SONAME version of libraries from configure, not using library-versions
This sets the library versions (previously gotten from library-versions
file during make) already at configure time.
For library "foo", the version is stored in the LIBFOO_SOVER configure
variable. For all libraries except libwbclient, this is done through the
call of SMB_LIBRARY().
NOTE: Currently the versions are hard-coded in the SMB_LIBRARY() calls in
configure.in, but this change makes it easier to retrieve the version from
the libraries source dir at configure time, e.g. for talloc and tdb.
Michael
(cherry picked from commit 3c300f9f8cffb5af32e291ec75007ab98fe96561)
(cherry picked from commit 6a6b90f4c56f040d19c60122c914b7a7ce64a3c6)
commit 9619fe6718b8a9072f09645c52e016d573f0b9a4
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:34:00 2008 +0200
build: extend SMB_LIBRARY() to take a version as an optional second argument
This will allow transition away from library-versions in the next step.
Michael
(cherry picked from commit d9d92b64275127e29c80dbdc7cfe193289fef9a3)
(cherry picked from commit e2624c2537e87acad7cfd58c76cb471d7141801c)
commit 73229e82c3f2456530c0d5bdefda9f4f4b1b5364
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 19:06:16 2008 +0200
build: combine the cleanlibfoo targets to one cleanlibs target
And use that in make clean
Michael
(cherry picked from commit 887b6231198ce2ff6230e0939ddcf46759bc88bf)
conflicts resolved
(cherry picked from commit 4266976d0f35161af8a8c687589c6010de3035a3)
commit 49bc672333d579c8bb54ad95610b459b45b3938a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:32:18 2008 +0200
build: fix shlibs target after internal changes, add libs target.
The shlibs target now only builds the shared libs as the name suggests.
All libraries are built by the new "libs" target.
Michael
(cherry picked from commit 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2)
(cherry picked from commit 196cf8307291aafb65db6291f3c55fdd33a2de85)
commit 4f4a0fa5c6f2857ebbbdd05af8447f48aa773ac9
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 16:24:17 2008 +0200
build: remove the SONAME_VER variable - not used anymore.
Michael
(cherry picked from commit 35b2ee2bce93f6e659f95d91b0590edd02c9b348)
(cherry picked from commit 961bb257b590920b7fbcf80bbe26c58a6b4be696)
commit 9694727f7ee529f96e7b219ebdbd59d681a948f7
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:12:02 2008 +0200
build: fix typo in use of cleanlibsmbclient target
Michael
(cherry picked from commit 5712062d22237768a671aa918e39a22d290b0f0a)
conflicts resolved
(cherry picked from commit f474363356a965fe712cb2dc4afa3272b2f882cb)
commit 156f56de44f07f091ce1eb110a35aa0c5a00635a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 14:04:32 2008 +0200
build: add a cleanlibaddns target and use it in "make clean"
Michael
(cherry picked from commit 39a447a232d0afbef55437a995f557553cbc8a0e)
conflicts resolved
Michael
(cherry picked from commit 90e56e6b86b3aee208ff326246aaf7dfad1ee0ce)
commit 749409c709f4bb79b1955c45602985a2871a2868
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 13:57:34 2008 +0200
build: handle libaddns by SMB_LIBRARY() and correctly create SONAME file.
Create .so file as a symlink.
Michael
(cherry picked from commit bbf665ad5790e89ff01867e2762fe2b94db7277d)
(cherry picked from commit f0ee69d25da86647a4a75e6994e72a62ad889064)
commit 2d873b563f674e2b983ef476124e3dba5a9d2643
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 13:55:31 2008 +0200
build: extend SMB_LIBRARY() to optionally take default value.
The default value defaults to "yes".
If no is specified, an optional third argument contains the
reason why building of the shared library is turned off by default.
Michael
(cherry picked from commit af971f79c7d736eb5b7ae8fcd4b2bf7ccf4834f3)
(cherry picked from commit 6c11ed560ae20f712be6c0680f53b1a275da94e7)
commit 89b4f748f5d2f4e44f7885918a29d34358e6e3a0
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:28:53 2008 +0200
build: move LIBADDNS_OBJ0 up again -- needed for NET_OBJ :-\
Michael
(cherry picked from commit b871cb0cb6d32e5e97666bd429d0fb9940ae4b2e)
conflicts resolved
(cherry picked from commit 2344a61abc83e26bf7488a1de00289937af4f758)
commit 779a19258d20b3bd8d2f1b646bfa1cb8c23b53ba
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 11:59:10 2008 +0200
build: move libaddns related bits to the libaddns section in Makefile.in
Michael
(cherry picked from commit 61157cb92ec2c12e565fb088170c7f430e3b5b77)
conflicts resolved
(cherry picked from commit a1132b9cf92a16448888e7b64e08efd796677db6)
commit 9a343bdd6eea64a6ea6d0880ad167f453f482322
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 09:26:21 2008 +0200
build: create cleanlibsmbsharemodes target and use it in "make clean".
Michael
(cherry picked from commit 20a5053f0e75176e9ec1d4fd5a18626bbe3a0267)
conflicts resolved
(cherry picked from commit 0ae8cc06532a72ab68ce91d6237d5457dfe369fd)
commit d7fcbe9e56a7fe05eb7ecb5c4bbff12fd81ac44d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:41:23 2008 +0200
build: handle libsmbsharemodes by SMB_LIBRARY() and correctly create SONAME file.
Create libsmbsharemodes.so as a symlink.
Michael
(cherry picked from commit 1157048146084e9ab34d7c2e77e8d00b22df53a4)
(cherry picked from commit 8335245d9164f0bd19b2d018bb3138fde9e05fa7)
commit f09ca86f35c4648a7a42ec2d91a39169002af1da
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:23:57 2008 +0200
build: move libsmbsharemodes related vars and targets to libsmbsharemodes section in Makefile.in
Michael
(cherry picked from commit 278dde8a6c486505c2d7403103ba011e1abb039e)
(cherry picked from commit ace76729b45730c70915c2656eee5ed83102bcf6)
commit 1a00770b0de9e7988d57ed0c0316ec2d75ab3f36
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:20:47 2008 +0200
build: add structuring comment for libbigballofmud
(cherry picked from commit 879b000fd3ad123f64017071a6aaa17cdc926995)
(cherry picked from commit fc3dafec9fc6b064de1909ae53099b07100fe1b4)
commit e13e1b9c46bbc2b780ef4a3bcdd5c5529680797a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:06:28 2008 +0200
build: add cleanlibsmbclient target and use it in make clean.
Michael
(cherry picked from commit 95a7d21d3150ca9c24d48cf6a2976dcc1dfaaa05)
conflicts resolved
(cherry picked from commit db2a20d834e7ede4a1c97aeb075d6b55afb1c847)
commit 2a77e385a8ef72bc21f1fbd8eb754150114d153d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:02:50 2008 +0200
build: handle libsmbclient by SMB_LIBRARY() and correctly create soname file.
Create libsmbclient.so as a symlink to libsmbclient.so.0.
Michael
(cherry picked from commit c463bd0cb9927176eec89e25788c6ea78eafdd16)
(cherry picked from commit 706c66f0d893d97646898e7bd69a45db9411ff65)
commit 331e9df286c50b7b862a5c1a4a2912cc03130ac9
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 23:37:06 2008 +0200
build: slightly change and extend the logic of SMB_LIBRARY().
Only call the install/uninstall targets (from make (un)install)
for libraries configured with SMB_LIBRARY(), when the user did
not set --with-libname=no.
Make sure to always (at least) build the static version of the library.
Michael
(cherry picked from commit f440538c9480134ff05cf9c9f78a565808161101)
(cherry picked from commit 2f10a7f631452993a942f2fd7362ebe3bad3859f)
commit b9134efb9608b1f5302073bdf3abe60cc8eb10e1
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 22:10:23 2008 +0200
build: rename (un)installclientlib to (un)installlibsmbclient
keeping old targets as aliases for backward compatibility
Michael
(cherry picked from commit 40ff40de5780fb17567b8d5ea75f5bb7f8d811c4)
(cherry picked from commit 7879c44a695a1b2817f312ba1e276847406b3209)
commit a5247702579e9b4483a58cd1fc26109b7964a0e0
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 22:08:28 2008 +0200
build: move libsmbclient related variables and targets to libsmbclient section
Michael
(cherry picked from commit ed3c35d307456601ca00d88a5cc278d6604681e1)
(cherry picked from commit 06dfae9a67ccb40bd14192505d26ab4e7870e7c5)
commit ba541504705a64ceb263d327a9dcdb896850cdc0
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:27:18 2008 +0200
build: move definition of SHLIBS to libraries section
Michael
(cherry picked from commit 36c99a3cad3c938a874f9b9f37c2265045957099)
(cherry picked from commit 96fac8a57a009e1bcf66c04a11fa78e0e4718db8)
commit f57ce70a21be47f29da717a3f3e83755bf0db335
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:23:11 2008 +0200
build: add a cleanlibwbclient target to Makefile.in and use it for make clean.
Michael
(cherry picked from commit e01a1d8d651f680ca58b809dc569ff74592d53a9)
conflicts resolved
(cherry picked from commit 168a5a4c131e7993d89fb4391e254befe8e03d67)
commit 51ddde7f9d88296c3c49c6e6d6f5589ac9c2d812
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:20:54 2008 +0200
build: add uninstalllibwbclient to Makefile.in and use it for uninstall
Michael
(cherry picked from commit 2712dade9d6495f3dbb75876ec32d73f8bb93f9f)
(cherry picked from commit 3fd4ef99f7a41de203dc5cc7c802bdbf4562efdb)
commit daec66a68fe5d649d6ec922fa99dc799b5539b67
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:14:17 2008 +0200
build: fix the installlibwbclient target to use defined variables and install the symlink
Michael
(cherry picked from commit 922b136ada1c502edcbbb89e9cca155cd6ad376c)
(cherry picked from commit b3a0602cc47c2f3d452c42a475a3103899802729)
commit b9990e7facf7fe4ab8b7f2e3b235e918194dda34
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:48:00 2008 +0200
build: fix creation of libwbclient shared lib by crating soname file
and adding .so file as a symlink
Michael
(cherry picked from commit beab1a31484836014aab5d2bcb38995435f6218b)
(cherry picked from commit ae6adbf863e7662af41e971341ae7e96a346b765)
commit 439746802eae6d8609760e9e728979e243cf42cf
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:44:30 2008 +0200
Revert "build: fix creation of libsmbsharemodes.a - don't link in libtdb.a."
This reverts commit 4fc57a0a90390ede1161fd6f231ea274c9c74b20.
In preparation of picking libraray creation/install fixes.
To be re-added later in upstream form.
Michael
(cherry picked from commit c72a795bfaade8dd6117384806619f54bc442132)
commit 82b292bd8d2a1e44aa3975527812a7f3edf1c884
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:43:58 2008 +0200
Revert "build: fix creation of libsmbclient.a - don't link in libtalloc.a"
This reverts commit dcf986937ccf5e6947c4214aa0838733ed7f3b9b.
In preparation of picking libraray creation/install fixes.
To be re-added later in upstream form.
Michael
(cherry picked from commit 360b81ff6e83457cfaf1d122bdc6b301ce7f6630)
commit ceeaa95dedadf7f46e05c6baf0671b4728b5b25d
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:43:31 2008 +0200
Revert "build: fix creation of libaddns.a - don't link in libtalloc.a"
This reverts commit 396310775e69baeee06b2e6469854a5ddf759a91.
In preparation of picking libraray creation/install fixes.
To be re-added later in upstream form.
Michael
(cherry picked from commit 7c9e741b2431f1235606ccdf462d1bf3d15049b3)
commit 5f4b0144f137855dfe25478ff114c55d3b3e8756
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:43:05 2008 +0200
Revert "build: fix build on systems with picky make and without shared libwbclient"
This reverts commit fd9b4bcaa5302d3d6245eb7b21ce0ef9994f718d.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 88d7bdacff4a8354c172b781d217c75c983ace7a)
commit dc1c7242958a1cb3f16c6b255b4672372d65cf51
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:42:49 2008 +0200
Revert "build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules."
This reverts commit 2d2b48749e885d2a529dab273c8419c5445568d3.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit f76a628db01f58e50609f1cff05649778a35a916)
commit 683f241dfd2f4d357d7b21fb0ab482ec6efe8c29
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:40:54 2008 +0200
Revert "build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules."
This reverts commit 15dd9f78650b0b853cb6955429ae58656be3945e.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 0b34e6d2e2e076e46e7aa6e96543ef183764c720)
commit a9e0223017faa810a36d8deb470645e0868123f6
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:40:37 2008 +0200
Revert "build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules."
This reverts commit 0f609e55d8c58285de73fa0955df951042dfd9a0.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 3c8389f80b6194219f18219520269281b458ce15)
commit edfbfb3105d71726bc6b092ec6e88f7bfea71725
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:40:11 2008 +0200
Revert "build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@"
This reverts commit a60d295d3ac4a6e7a055927951f7207f09a3df7c.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 8a728f74586111b0415c746da3b75f5bb2f7021e)
commit 0a0fa65f27d3bd71eab9b306de75503e626e1929
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:39:54 2008 +0200
Revert "build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules."
This reverts commit 22d0f686eb6649b3d4a8c7f142257e303c54568e.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 61e32e9255fd06ecaabc3b27a6d7dc254a7cb521)
commit 1b8b9423420f5fd8cdd47670b4b39c66e37d41ea
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:39:37 2008 +0200
Revert "build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules."
This reverts commit a7ee1c16c234ad5d0aa8853081d8f5f4f763614b.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 69fafff2626841ce5e3832f9a96b78f2a2ed6d33)
commit baa0fa32072e722c22ff2378ccb73ef992b47ab2
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:39:20 2008 +0200
Revert "build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ in rules."
This reverts commit 7420f409c2fbfd5f90d45a4a435489fe31016581.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit e60e337807c5bb95268aadaf68e619cb6262f8e9)
commit 5f3b68b2657b3f15a192fce91080b72c4b994933
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:38:59 2008 +0200
Revert "build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules."
This reverts commit 1aad6661adc5800243969b761c653b57ff280f69.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit f6e5e3a98d6426052150ef35c6ddccac1367bcf9)
commit 864b100a9b8dcf2641f5d3c1b346bb6e1e176fcb
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 14:38:02 2008 +0200
Revert "build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ in rules."
This reverts commit 9a2870e936a967b82a100b1e26200d3665311f85.
In preparation of picking libraray creation/install fixes.
To be re-added later.
Michael
(cherry picked from commit 3ae8e1ca573f19ecbdcb1a5fbc64fac22671a6aa)
commit bce6ff6ea78df9b12b0863bebc7bef0e46c836af
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:44:27 2008 +0200
build: move libwbclient related target to libwbclient section in Makefile.in
Michael
(cherry picked from commit 8f64706b095b9ca0e2a8f39cc3133bfd02f86158)
resolved conflicts
(cherry picked from commit ba6a10f28f5161f725fff929df6fb8a4fa81b061)
commit 54d33d26a3f0718e885eb6924ace55b344ee1cc6
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:39:45 2008 +0200
build: move libtdb target further down following common schema like with libtalloc
Michael
(cherry picked from commit f94b07f0c56928f890ffb1e2aca2c8bfcc954dd5)
(cherry picked from commit ed8622ea9d58620bd5319e5cd5c32ebf7838d6fb)
commit 43f20a0a314bbb3647a90aed28f2367eb099c7f5
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:38:03 2008 +0200
build: fix uninstalllibnetapi target - handle symlink libnetapi.so
and use the defined variables instead of hardcoded bits.
Also move the target into the libnetapi section (forgotten last time).
Michael
(cherry picked from commit 21b6164795344cea45161bc01828ec1127b5b6ab)
(cherry picked from commit f471bcda42f4d504830989f9c69382075c701b39)
commit a125f2cf0b7c2777c2450275b8e866b3159d883c
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:35:13 2008 +0200
build: fix installlibnetapi target - install symlink libnetapi.so (if appropriate)
Michael
(cherry picked from commit 59e7827e557c5096fb363051a4cf1835b2a53223)
(cherry picked from commit e4a7abb5f978475493c8c1d10dd078b778a857bf)
commit 7071c5e1615e91a80b843be8d72289f5f379c7a3
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:28:43 2008 +0200
build: add a cleanlibnetapi target and use it in make clean
Michael
(cherry picked from commit ff62887a94a7dd6f09995c820db7d825828bacad)
resolved conflicts
(cherry picked from commit cf7c21409bce6fc39cf62ced54191e7a78ea470b)
commit 9b73f56a5417275d24aabef5c22db3d508f39d56
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:25:16 2008 +0200
build: fix creation of the libnetapi shared lib: create soname library
and add the .so file as symlink
Michael
(cherry picked from commit d9af2f7ab6b839e8074a69ce5d1fe66548c08e52)
(cherry picked from commit e278895d41780ba7022a085229d2b0482be5f0ea)
commit 7daeb44211b72083b3a746d6d6df69f7969043f0
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:11:50 2008 +0200
build: move libnetapi related definitions and targets together into the libnetapi section.
in Makefile.in
Michael
(cherry picked from commit da29e1ce44d4f99b876259fbad892691e2c7d7e0)
resolved conflicts
(cherry picked from commit d3c483ffac09498fc0ebe23b7c9b890586849597)
commit ef3ed6fe07b19d9bb069d1077ab81f79576c407a
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:43:12 2008 +0200
build: add an uninstalllibtdb target.
Michael
(cherry picked from commit c50c847f4b9772261f8011f32eec97d8244dccdd)
(cherry picked from commit 25852c3df675cdbbac07d919cb5c088b7146d1ef)
commit 3df7f7ecb48804e8b7e92cb3b335c04c9a989c87
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:42:30 2008 +0200
build: fix the installlibtdb target to install the soname file of libtdb.
and create the .so file as a symlink (if appropriate)
Michael
(cherry picked from commit 5c090762f769b645c411333aef2085362bb2e6cb)
(cherry picked from commit 1fc6b24ac85aee70802d88a9f8280776a0beb3ca)
commit 7576412b490a914076dcb4d6f782330ecac3f8ee
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:37:29 2008 +0200
build: create a cleanlibtdb target and use it in target clean.
Michael
(cherry picked from commit ebfe13b79b24791bd9c854ac2f239f02796da6bb)
resolved conflicts
(cherry picked from commit 2ae7ab1640b8f8da8c74be5e88480bd3293a4dbf)
commit 3d7e7834e400eef000d87663c8160709f7ef3d27
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:32:36 2008 +0200
build: fix creation of the libtdb shared library.
Create the libtdb.so.1 file and create the .so file as the symlink.
Not vice versa.
Michael
(cherry picked from commit 662d666b41b11ae70daf7422b1ced5f86209e608)
(cherry picked from commit dfd2262ca469e7e409e0061ed62c14ac72d5440a)
commit c1e9a280b33dd556cf2ae217364321949d50744c
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 13:07:54 2008 +0200
build: move libtdb related definitions and targets to libtdb section in Makefile.in
Michael
(cherry picked from commit a4de301af48f4e5b4898751e8836bdb434d047a6)
(cherry picked from commit d0fa43966e5486512e04bd28cf84f24896d035d1)
commit bda8d6b1af8d381dffbb39d4cbd7b291b24161a5
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 13:02:40 2008 +0200
build: move all libtalloc related definitions into the libtalloc section in Makefile.in
Michael
(cherry picked from commit b330892f4b2f9f50fd192e37720217d15fedf1f0)
(cherry picked from commit 8a2c96bd92e2090a7542709819b2f478247da6da)
commit 43c5493460978ec37912284883e56ac2f044dce8
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:53:21 2008 +0200
build: move top level targets for the libs into the corresponding sections in Makefile.in
Michael
(cherry picked from commit 4092059ff0bbb638c937c3f2b977ad431d868331)
(cherry picked from commit ddf6b352fe79e3118e20b50e0f0a981dc44634a9)
commit daccfe737dcb778426efbac4790356a204f4ad45
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:51:04 2008 +0200
build: add more structuring comments to Makefile.in
for several shared libs and shared modules section
Michael
(cherry picked from commit 53cc6a3225c0c7baea4d8ea04eefc61283650434)
(cherry picked from commit e5b3718913f52afe7df3b0e017451d9ece330191)
commit 383cddb46923737e72c3a030a39017ab6e479cef
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 13:42:40 2008 +0200
build: add a "make shlibs" target to build all the shared libraries.
Michael
(cherry picked from commit 5a99f59d7514edadbab081dc0c5c28a6ea26972a)
(cherry picked from commit 387707e4e48ebcaf1951d440362c301495903946)
commit eb4ff2fe0b958dc0498c426ea3d211f6e546cf48
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:39:24 2008 +0200
build: add structuring comments for libraries and libtalloc section.
Michael
(cherry picked from commit 3de000890447dd15962fbd6a9b1b3504b9bd1175)
(cherry picked from commit b5ccce5db2f034dbeade68d97f55d973db241321)
commit c72bedb09c22b40b228f5abe7b68d9993bff6023
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 16:16:28 2008 +0200
build: fix installlibtalloc to not install symlink if the library is not there
Michael
(cherry picked from commit 52ccb52c8e42e748fcc05337849945ddc30d5efa)
(cherry picked from commit 512cf07187c33f17e1724d345fffb4f813fa8768)
commit ce7c42ffd632aa379b8166327d8e19510edc1711
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:52:09 2008 +0200
build: move libtalloc related targets together.
Michael
(cherry picked from commit 01b1e642d72ecccac5277b5f071aab8f6df04c0d)
(cherry picked from commit 9509bfbbb0581d71d15110aa8192c00ef3a89c40)
commit ce3e01b64c4437b01c206c9c6d7bde055854863e
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:48:39 2008 +0200
build: add a cleanlibtalloc target.
Michael
(cherry picked from commit 5d3c6c3c1c08747c521292ef09648ad528c2dca9)
resolved conflicts
(cherry picked from commit 76cfd3116a0d30301bdb1e728debe615e6caddc3)
commit 6edbbc4f5d346cf934b3e76b282cb5d728fc2c73
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:40:19 2008 +0200
build: add an uninstalllibtalloc target
Michael
(cherry picked from commit 4b6ef6202cd9b6e1e8949c43d0c45c04d4b97438)
(cherry picked from commit 22e28489a7ae01bb7adc994008e6b062b2d74a66)
commit 81edb3802d9a9c67460b4f7ed05fef42c7d573ba
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:32:09 2008 +0200
build: fix creation of link libtalloc.so on some systems.
ln -s -f seem to be unknown on some solaris versions (e.g.).
so if there is an old libtalloc.so around, this will fail.
use rm -f prior to creating the link to circumvent this.
Michael
(cherry picked from commit d913b1e7316e84c1430f9d577f49d3c3e4e7719b)
(cherry picked from commit 1cf4d4aaa4bcec2dcc7b99288f4818b0535fdfad)
commit fcdb9f8871419002a1d8989f0665ad728d17012e
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:30:38 2008 +0200
build: fix the installlibtalloc target to install SONAME and \.so versions of shared lib.
Michael
(cherry picked from commit 49919889892f258cc669b08417e7569e8f5efaf4)
(cherry picked from commit 03f8b71417188e363d04eacff0904b693a06b339)
commit 75d2406284aabab576aae7c611c509d632542f0b
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:29:02 2008 +0200
build: fix creation of talloc shared lib.
link the libtalloc.so.1 file and create libtalloc.so as a link
Michael
(cherry picked from commit 946537e6bec904d4a7937eeb6085dfac19c3e2b5)
(cherry picked from commit f75a3ff33255ba3cc12535f1c0405c0a0b2ca410)
commit 13a0007f54dbbb0db4bdb477970bc407055af93d
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:26:57 2008 +0200
build: add ability to use library files of the form NAME.so.VERSION to create version script name.
Michael
(cherry picked from commit b8d13f8773f61863b71bfc9df468f0018b0db0d1)
(cherry picked from commit 3b221c60cc92dfaa7ca7c45b1ee3d8efa0e15197)
commit 72d7c3bb8dade0b2b8edc305cb95b368c44b0581
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun May 18 18:39:48 2008 +0200
Add double-colon where it makes sense.
(cherry picked from commit 256200e951476ff31c95a7d5621a50ba297ea6e4)
Conflicts resolved (obnox)
(cherry picked from commit df52ff62eb890fd645b1c955d72f4bec90851929)
commit 7fecafab0e421eb7a09c30f1b37e08b0df65bb83
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 14 11:48:23 2008 +0200
Revert "build: fix bug #5608: link creation for libtalloc.so.1 (and friends) on solaris 8"
This reverts commit f4d26db5dfccb962f5ca2cc03e9012a9883e16d8.
In preparation of the library cration / installation changes.
Michael
(cherry picked from commit 8fd80452ec71b621adb48b735229f6214dfca85e)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 10 +
docs-xml/manpages-3/cifs.upcall.8.xml | 115 ++++
source/Makefile.in | 739 ++++++++++++++++--------
source/client/{cifs.spnego.c => cifs.upcall.c} | 52 ++-
source/configure.in | 186 +-----
source/lib/util_sid.c | 34 +-
source/libcli/nbt/nbtname.c | 2 +-
source/library-versions.in | 11 -
source/m4/aclocal.m4 | 62 ++-
source/winbindd/winbindd_passdb.c | 22 +-
source/winbindd/winbindd_util.c | 2 +-
11 files changed, 785 insertions(+), 450 deletions(-)
create mode 100644 docs-xml/manpages-3/cifs.upcall.8.xml
rename source/client/{cifs.spnego.c => cifs.upcall.c} (88%)
delete mode 100644 source/library-versions.in
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5d30dbd..97402b2 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -25,6 +25,7 @@ Changes since 3.2.1
o Michael Adam <obnox at samba.org>
+ * Fix creation and installation of shared libraries.
* Fix replacement of random seed generator.
* Fix a race condition in idmap_tdb2_allocate_id().
* Fix unix_convert() for "*" after changing map_nt_error_from_unix().
@@ -36,6 +37,9 @@ o Jeremy Allison <jra at samba.org>
mistake.
* BUG 5686: Fix segfaults in libsmbclient.
* BUG 5692: Fix coredump in full_audit.so.
+ * BUG 5696: Fix "force group" in setups using Winbind.
+ * Rename cifs.spnego to cifs.upcall.
+ * Fix segfault in cifs.upcall when it is called without any arguments.
* Fix coverity ID 594 (resource leak on error path).
* Fix assigning of primary group memberships when authenticating via
Winbind.
@@ -63,12 +67,18 @@ o Günther Deschner <gd at samba.org>
* Add add c++ guard to netapi.
+o Steve French <stevef at smf-t60p.smfdom>
+ * Fix compile warning in cifs.upcall.
+ * Add "dns_resolver" key type to cifs.upcall.
+
+
o SATOH Fumiyasu <fumiyas at osstech.co.jp>
* BUG 5688: Fix orphaned LPQ processes if socket address is invalid.
o Volker Lendecke <vl at samba.org>
* BUG 5684: Fix removal of dead records in tdb files.
+ * Fix coverity IDs 595, 596.
* Fix smb_len calculation for chained requests.
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
new file mode 100644
index 0000000..3c1bb24
--- /dev/null
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -0,0 +1,115 @@
+<?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="cifs.upcall.8">
+
+
+<refmeta>
+ <refentrytitle>cifs.upcall</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.2</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+ <refname>cifs.upcall</refname>
+ <refpurpose>Userspace upcall helper for Common Internet File System (CIFS)</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>cifs.upcall</command>
+ <arg choice="opt">-c</arg>
+ <arg choice="opt">-v</arg>
+ <arg choice="req">keyid</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+<para>cifs.upcall is a userspace helper program for the linux CIFS client
+filesystem. There are a number of activities that the kernel cannot easily
+do itself. This program is a callout program that does these things for the
+kernel and then returns the result.</para>
+
+<para>cifs.upcall is generally intended to be run when the kernel calls
+request-key<manvolnum>8</manvolnum> for a particular key type. While it
+can be run directly from the command-line, it's not generally intended
+to be run that way.</para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term>-c</term>
+ <listitem><para>When handling a kerberos upcall, use a service principal that starts with "cifs/". The default is to use the "host/" service principal.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-v</term>
+ <listitem><para>Print version number and exit.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>CONFIGURATION FOR KEYCTL</title>
+ <para>cifs.upcall is designed to be called from the kernel via the request-key callout program. This requres that request-key be told where and how to call this program. The current cifs.upcall program handles two different key types:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>cifs.spnego</term>
+ <listitem><para>This keytype is for retrieving kerberos session keys
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>dns_resolver</term>
+ <listitem><para>This key type is for resolving hostnames into IP addresses
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>To make this program useful for CIFS, you'll need to set up entries for them in request-key.conf<manvolnum>5</manvolnum>. Here's an example of an entry for each key type:</para>
+<programlisting>
+#OPERATION TYPE D C PROGRAM ARG1 ARG2...
+#========= ============= = = ==========================================
+create cifs.spnego * * /usr/local/sbin/cifs.upcall -c %k
+create dns_resolver * * /usr/local/sbin/cifs.upcall %k
+</programlisting>
+<para>
+See <citerefentry><refentrytitle>request-key.conf<manvolnum>5</manvolnum></refentrytitle></citerefentry> for more info on each field.
+</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry><refentrytitle>request-key.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>mount.cifs</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>Igor Mammedov wrote the cifs.upcall program.</para>
+ <para>Jeff Layton authored this manpage.</para>
+ <para>The maintainer of the Linux CIFS VFS is Steve French.</para>
+ <para>The <ulink url="mailto:linux-cifs-client at lists.samba.org">Linux
+ CIFS Mailing list</ulink> is the preferred place to ask
+ questions regarding these programs.
+ </para>
+</refsect1>
+
+</refentry>
diff --git a/source/Makefile.in b/source/Makefile.in
index 41753c5..57d5114 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -25,9 +25,8 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
DSO_EXPORTS=@DSO_EXPORTS@
-SONAME_VER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2`
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
# The MODULE_EXPORTS variable contains the platform-specific linker flags
@@ -149,34 +148,6 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
-LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
-LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
-LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
-LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
-LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
-LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
-LIBTDB_SYMS=$(srcdir)/exports/libtdb. at SYMSEXT@
-LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
-
-LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
-LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
-LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
-
-LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
-LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
-LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
-LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient. at SYMSEXT@
-LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
-
-LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
-LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
-LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@
-LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi. at SYMSEXT@
-LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
-
FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
FLAGS2 =
FLAGS3 =
@@ -206,7 +177,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
-ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSSPNEGO_PROGS@
+ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUPCALL_PROGS@
BIN_PROGS1 = bin/smbclient at EXEEXT@ bin/net at EXEEXT@ bin/smbspool at EXEEXT@ \
bin/testparm at EXEEXT@ bin/smbstatus at EXEEXT@ bin/smbget at EXEEXT@
@@ -234,8 +205,6 @@ EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
bin/log2pcap at EXEEXT@ bin/sharesec at EXEEXT@ bin/ndrdump at EXEEXT@ \
bin/vlp at EXEEXT@ bin/smbiconv at EXEEXT@
-SHLIBS = libtalloc libtdb @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ libnetapi
-
PAM_MODULES = @PAM_MODULES@
NSS_MODULES = @NSS_MODULES@
@@ -256,9 +225,6 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
# object file lists
######################################################################
-LIBTDB_OBJ0 = @TDB_OBJS@
-LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
-
TDB_OBJ = lib/util_tdb.o \
lib/dbwrap.o lib/dbwrap_tdb.o \
lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
@@ -326,12 +292,6 @@ LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-TALLOC_OBJ = @TALLOC_OBJS@
-
-
-LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
-LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
-
LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
$(LIBREPLACE_OBJ) \
$(SOCKET_WRAPPER_OBJ) \
@@ -387,16 +347,6 @@ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
libaddns/dnsgss.o libaddns/dnsmarshall.o
LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@
-LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
- nsswitch/libwbclient/wbc_util.o \
- nsswitch/libwbclient/wbc_pwd.o \
- nsswitch/libwbclient/wbc_idmap.o \
- nsswitch/libwbclient/wbc_sid.o \
- nsswitch/libwbclient/wbc_pam.o
-LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
- $(WBCOMMON_OBJ) \
- @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
-
LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
LIBGPO_OBJ = $(LIBGPO_OBJ0)
@@ -827,9 +777,6 @@ LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
-LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@
-
# This shared library is intended for linking with unit test programs
# to test Samba internals. It's called libbigballofmud.so to
# discourage casual usage.
@@ -851,24 +798,6 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
$(DISPLAY_SEC_OBJ)
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
- lib/netapi/cm.o \
- librpc/gen_ndr/ndr_libnetapi.o \
- lib/netapi/libnetapi.o \
- lib/netapi/joindomain.o \
- lib/netapi/serverinfo.o \
- lib/netapi/getdc.o \
- lib/netapi/user.o
-
-LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
- $(LIBSMBCONF_OBJ) \
- $(REG_SMBCONF_OBJ) \
- $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
-
LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
lib/smbconf/smbconf_reg.o \
lib/smbconf/smbconf_txt.o \
@@ -925,7 +854,7 @@ CIFS_MOUNT_OBJ = client/mount.cifs.o
CIFS_UMOUNT_OBJ = client/umount.cifs.o
-CIFS_SPNEGO_OBJ = client/cifs.spnego.o
+CIFS_UPCALL_OBJ = client/cifs.upcall.o
NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSAMBA_OBJ)
@@ -1162,18 +1091,18 @@ VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
######################################################################
# now the rules...
######################################################################
-all : SHOWFLAGS $(SHLIBS) $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
+all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
$(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
-nss_modules : $(NSS_MODULES)
+nss_modules:: $(NSS_MODULES)
-pam_modules : $(PAM_MODULES)
+pam_modules:: $(PAM_MODULES)
pam_smbpass : SHOWFLAGS bin/pam_smbpass. at SHLIBEXT@
pam_winbind : SHOWFLAGS bin/pam_winbind. at SHLIBEXT@
-torture : SHOWFLAGS $(TORTURE_PROGS)
+torture:: SHOWFLAGS $(TORTURE_PROGS)
smbtorture : SHOWFLAGS bin/smbtorture at EXEEXT@
@@ -1211,7 +1140,7 @@ nsswitch : SHOWFLAGS bin/winbindd at EXEEXT@ bin/wbinfo at EXEEXT@ @WINBIND_NSS@ \
wins : SHOWFLAGS @WINBIND_WINS_NSS@
-modules: SHOWFLAGS $(MODULES)
+modules:: SHOWFLAGS $(MODULES)
#####################################################################
## Perl IDL Compiler
@@ -1220,7 +1149,7 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
-idl:
+idl::
@IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
@@ -1228,13 +1157,13 @@ idl:
#####################################################################
-everything: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
$(EVERYTHING_PROGS)
.SUFFIXES:
.SUFFIXES: .c .o .lo
-SHOWFLAGS:
+SHOWFLAGS::
@echo "Using FLAGS = $(FLAGS)"
@echo " PICFLAG = $(PICFLAG)"
@echo " LIBS = $(LIBS)"
@@ -1279,7 +1208,7 @@ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
# this adds support for precompiled headers. To use it, install a snapshot
# of gcc-3.4 and run 'make pch' before you do the main build.
-pch: proto_exists
+pch:: proto_exists
rm -f $(PRECOMPILED_HEADER)
$(MAKE) $(PRECOMPILED_HEADER)
@@ -1390,9 +1319,9 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
@$(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@
+bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
+ @$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
$(LIBTDB_LIBS)
@@ -1589,98 +1518,501 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+
+#####################################################################
+#
+# libraries
+#
+#####################################################################
+
MKSYMS_SH = $(srcdir)/script/mksyms.sh
+
+#-------------------------------------------------------------------
+#
+# libtalloc
+#
+#-------------------------------------------------------------------
+
+TALLOC_OBJ = @TALLOC_OBJS@
+
+LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
+LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
+LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
+LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
+LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
+LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
+LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
+
$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBTALLOC_OBJ) \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
- @rm -f $@.$(SONAME_VER)
- @ln -s -f `basename $@` $@.$(SONAME_VER)
+ @$(SHLD_DSO) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
+
+$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
+libtalloc: $(LIBTALLOC)
+
+cleanlibtalloc::
+ -rm -f \
+ $(LIBTALLOC_SYMS) \
+ $(LIBTALLOC_STATIC_TARGET) \
+ $(LIBTALLOC_SHARED_TARGET) \
+ $(LIBTALLOC_SHARED_TARGET_SONAME)
+
+installlibtalloc:: installdirs libtalloc
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
+ ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
+ fi
+ -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibtalloc::
+ -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
+ -rm -f $(DESTDIR)${prefix}/include/talloc.h
+
+libs:: libtalloc
+installlibs:: @INSTALL_LIBTALLOC@
+uninstalllibs:: @UNINSTALL_LIBTALLOC@
+cleanlibs:: cleanlibtalloc
+shlibs test_shlibs: @LIBTALLOC_SHARED@
+
+#-------------------------------------------------------------------
+#
+# libtdb
+#
+#-------------------------------------------------------------------
+
+LIBTDB_OBJ0 = @TDB_OBJS@
+LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
+LIBTDB_SOVER=@LIBTDB_SOVER@
+LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
+LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
+LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
+LIBTDB_SYMS=$(srcdir)/exports/libtdb. at SYMSEXT@
+LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
+
$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
-$(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
+$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
--
Samba Shared Repository
More information about the samba-cvs
mailing list