tprouty/samba.git
15 years agofix another build warning.
Günther Deschner [Wed, 20 Aug 2008 18:24:45 +0000 (20:24 +0200)]
fix another build warning.

Guenther
(cherry picked from commit 43693ce6c678b961fa516bbf502af92f87cd5346)

15 years agonss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
Gerald (Jerry) Carter [Wed, 20 Aug 2008 18:00:40 +0000 (13:00 -0500)]
nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT

According to the GNU libc nss guide, we should always set
errno to ENOENT when returning NSS_UNAVAIL.

http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface

At least the MQ Series message queing service that runs
on WebSphere will fail if you return any other errno in this case.
(cherry picked from commit ee26664602445fa7798e2061f6bcbef0756d6528)

15 years agosmbd: fix the handling of create_options to pass RAW-OPEN
Stefan Metzmacher [Tue, 19 Aug 2008 14:34:50 +0000 (16:34 +0200)]
smbd: fix the handling of create_options to pass RAW-OPEN

Some of the bits generate INVALID_PARAMETER and some bits
are ignored when they come from a client, that's why we need
to use bits from the ignored range for our internal usage.

metze
(cherry picked from commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7)

15 years agocifs.upcall: handle MSKRB5 OID properly
Jeff Layton [Wed, 20 Aug 2008 01:35:35 +0000 (21:35 -0400)]
cifs.upcall: handle MSKRB5 OID properly

When the kernel sends the upcall a sec=mskrb5 parameter, that means
the the MSKRB5 OID is preferred by the server. This patch fixes the
upcall to use that OID in place of the "normal" krb5 OID when it
gets a sec=mskrb5 parameter.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Steve French <smfrench@gmail.com>
15 years agoFix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address
Jeremy Allison [Wed, 20 Aug 2008 00:31:46 +0000 (17:31 -0700)]
Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address
reported by Ted Percival <ted@midg3t.net>.
Jeremy.

15 years agobuild: fix linking cifs.upcall when nscd_flush_cache() is found.
Michael Adam [Tue, 19 Aug 2008 11:29:24 +0000 (13:29 +0200)]
build: fix linking cifs.upcall when nscd_flush_cache() is found.

Michael
(cherry picked from commit 661b7fdffda40a9ca7cb36627dbaf91cb4357cd0)

15 years agoWHATSNEW: Start WHATSNEW for 3.2.3.
Karolin Seeger [Tue, 19 Aug 2008 09:36:45 +0000 (11:36 +0200)]
WHATSNEW: Start WHATSNEW for 3.2.3.

Karolin

15 years agoVERSION: Raise version number up to 3.2.3.
Karolin Seeger [Tue, 19 Aug 2008 09:35:27 +0000 (11:35 +0200)]
VERSION: Raise version number up to 3.2.3.

Karolin

15 years agoFix length error in wrapping spnego blob. Karoling this needs to be in 3.2.2 (sorry).
Igor Mammedov [Mon, 18 Aug 2008 16:55:44 +0000 (09:55 -0700)]
Fix length error in wrapping spnego blob. Karoling this needs to be in 3.2.2 (sorry).

15 years agoWHATSNEW: Update release date.
Karolin Seeger [Mon, 18 Aug 2008 14:36:53 +0000 (16:36 +0200)]
WHATSNEW: Update release date.

Karolin

15 years agoWHATSNEW: Add some more major bug fixes.
Karolin Seeger [Mon, 18 Aug 2008 13:59:07 +0000 (15:59 +0200)]
WHATSNEW: Add some more major bug fixes.

Karolin

15 years agoWHATSNEW: Add corresponding bug number.
Karolin Seeger [Mon, 18 Aug 2008 13:56:52 +0000 (15:56 +0200)]
WHATSNEW: Add corresponding bug number.

Karolin

15 years agoWHATSNEW: Update changes since 3.2.1.
Karolin Seeger [Mon, 18 Aug 2008 13:52:09 +0000 (15:52 +0200)]
WHATSNEW: Update changes since 3.2.1.

Karolin

15 years agoMerge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
Jeremy Allison [Sun, 17 Aug 2008 02:27:25 +0000 (19:27 -0700)]
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

15 years agoFix bug 5696. The problem was when smbd
Jeremy Allison [Sun, 17 Aug 2008 02:25:22 +0000 (19:25 -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.

15 years agocifs.upcall: negatively instantiate keys on error
Jeff Layton [Sat, 16 Aug 2008 18:30:20 +0000 (14:30 -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@redhat.com>
15 years agoBuilding cifs.upcall is giving this build warning:
Steve French [Sat, 16 Aug 2008 18:30:19 +0000 (14:30 -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@redhat.com>
Signed-off-by: Steve French <sfrench@samba.org>
15 years agocifs.upcall: fix manpage and comments
Steve French [Sat, 16 Aug 2008 18:30:18 +0000 (14:30 -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@redhat.com>
Signed-off-by: Steve French <sfrench@samba.org>
---
 docs-xml/manpages-3/cifs.upcall.8.xml |    4 ++--
 source/client/cifs.upcall.c           |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

15 years agocifs.upcall was not recognizing the newer name "dns_resolver" key type
Steve French [Sat, 16 Aug 2008 18:30:17 +0000 (14:30 -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
15 years agocifs.upcall: fix compile warning
Steve French [Sat, 16 Aug 2008 18:30:16 +0000 (14:30 -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@redhat.com>
15 years agoThis patchset comprises a number of cleanups for the cifs upcall
Jeremy Allison [Sat, 16 Aug 2008 18:30:08 +0000 (14:30 -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@redhat.com>
15 years agoAttempt to fix Coverity ID 596
Volker Lendecke [Sat, 16 Aug 2008 09:12:35 +0000 (11:12 +0200)]
Attempt to fix Coverity ID 596

Jeremy, please check & push if it's ok.

15 years agoAttempt to fix Coverity ID 595
Volker Lendecke [Sat, 16 Aug 2008 09:17:09 +0000 (11:17 +0200)]
Attempt to fix Coverity ID 595

is_ipaddress already dereferences "name", so the NULL check is pointless after
calling it.

15 years agoI think the problem with these functions is that lookup_usergroups
Herb Lewis [Fri, 15 Aug 2008 22:30:40 +0000 (15:30 -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.

15 years agobuild: fix a typo in the installlibtalloc rule.
Michael Adam [Fri, 15 Aug 2008 21:17:48 +0000 (23:17 +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)

15 years agoStatic libsmbclient library needs to include all objects
Derrell Lipman [Wed, 16 Jul 2008 13:47:06 +0000 (09:47 -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)

15 years agobuild: fix build of libaddns shared lib : it needs socket_wrapper.
Michael Adam [Fri, 11 Jul 2008 13:35:24 +0000 (15:35 +0200)]
build: fix build of libaddns shared lib : it needs socket_wrapper.

Michael
(cherry picked from commit 58bc04b31b15c36505c5ecb2d8373e9033972390)

15 years agoWHATSNEW: Add release date, add hint on printing timeouts.
Karolin Seeger [Fri, 15 Aug 2008 07:45:31 +0000 (09:45 +0200)]
WHATSNEW: Add release date, add hint on printing timeouts.

Karolin

15 years agoWHATSNEW: Update changes since 3.2.1.
Karolin Seeger [Fri, 15 Aug 2008 07:13:32 +0000 (09:13 +0200)]
WHATSNEW: Update changes since 3.2.1.

Karolin

15 years agoFix show-stopper for 3.2. Smbd depends on group SID
Jeremy Allison [Fri, 15 Aug 2008 04:53:55 +0000 (21:53 -0700)]
Fix show-stopper for 3.2. Smbd depends on group SID
position zero being the primary group sid. Authenicating
via winbindd call returned a non-sorted sid list. This
fixes is for both a winbindd call and a pac list from
an info3 struct. Without this we mess up the
primary group associated with created files. Found by
Herb.
Jeremy.

15 years agoRevert the 4d83924470b267f2267abd62a3be2ac3ae373d7b change. The server_info struct...
Jeremy Allison [Thu, 14 Aug 2008 19:33:17 +0000 (12:33 -0700)]
Revert the 4d83924470b267f2267abd62a3be2ac3ae373d7b change. The server_info struct *must* own the ptok pointer inside it.
Jeremy.

15 years agoMerge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into my32-test
Herb Lewis [Thu, 14 Aug 2008 19:20:22 +0000 (12:20 -0700)]
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into my32-test

15 years agouse correct argument
Herb Lewis [Thu, 14 Aug 2008 19:19:36 +0000 (12:19 -0700)]
use correct argument

15 years agoFix bug #5692 - Core dump in full_audit.so.
Jeremy Allison [Thu, 14 Aug 2008 18:00:47 +0000 (11:00 -0700)]
Fix bug #5692 - Core dump in full_audit.so.
There were some function mismatches in the various GET_NT_ACL modules (some places the fsp parameter has not been removed).
Jeremy.

15 years agosmbspool: Fix printing on port 139.
Karolin Seeger [Wed, 13 Aug 2008 19:27:55 +0000 (21:27 +0200)]
smbspool: Fix printing on port 139.

This one was introduced with 8eff35bc.
Thanks to Noèl Köthe for tracking that down!

Karolin
(cherry picked from commit 250f5a40d6e80305220d7cdc6a8f8459d8d0de74)
(cherry picked from commit d7a50f1b22f5ccc5d027f8c2eeb73fa335d49f81)
(cherry picked from commit 50d6d617e5b76c3566b719dffe0058c5a0599dd0)

15 years agoMake DSO_EXPORTS_CMD regexp more POSIX compliant
Zach Loafman [Wed, 9 Jul 2008 07:05:50 +0000 (00:05 -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)

15 years agobuild: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:09:06 +0000 (18:09 +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)

15 years agobuild: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:08:31 +0000 (18:08 +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)

15 years agobuild: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:07:27 +0000 (18:07 +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)

15 years agobuild: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:06:39 +0000 (18:06 +0200)]
build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.

Eliminate more potential traps for picky makes.

Michael
(cherry picked from commit 1f0feb3d12aa93400e8ba604df36a00d7cfaa07a)

15 years agobuild: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:06:05 +0000 (18:06 +0200)]
build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.

Eliminate more potential traps for picky makes.

Michael
(cherry picked from commit cd3c667bdaa8c2b09debbfd8c3389cf9f6d690e9)

15 years agobuild: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@
Michael Adam [Mon, 14 Jul 2008 16:04:53 +0000 (18:04 +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)

15 years agobuild: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:02:08 +0000 (18:02 +0200)]
build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.

Eliminate more potential traps for picky makes.

Michael
(cherry picked from commit 4330a2ab1308bd2b1508d5126146742540219520)

15 years agobuild: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 16:00:50 +0000 (18:00 +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

15 years agobuild: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 15:58:53 +0000 (17:58 +0200)]
build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.

Eliminate more potential traps for picky makes.

Michael
(cherry picked from commit 87f56f28800d2045e70739a8edcd359ddee662a7)

15 years agobuild: use $(WINBIND_LIBS) instead of @WINBIND_LIBS@ in rules.
Michael Adam [Mon, 14 Jul 2008 15:55:48 +0000 (17:55 +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

15 years agobuild: remove SHLIBS variable, and distribute deps for shlibs and test_shlibs target
Michael Adam [Thu, 10 Jul 2008 14:25:21 +0000 (16:25 +0200)]
build: remove SHLIBS variable, and distribute deps for shlibs and test_shlibs target

Michael
(cherry picked from commit 939e75126ebfcd9124781b5d70a68886c4bf9a54)

15 years agobuild: create a new uninstalllibs target and use it in "make uninstall"
Michael Adam [Thu, 10 Jul 2008 13:51:14 +0000 (15:51 +0200)]
build: create a new uninstalllibs target and use it in "make uninstall"

Michael
(cherry picked from commit 73a3e4e1eaa408ef0ddbbb8aa0113fdc869057bb)

15 years agobuild: distribute the libs target over the library-specific sections.
Michael Adam [Thu, 10 Jul 2008 13:49:44 +0000 (15:49 +0200)]
build: distribute the libs target over the library-specific sections.

Michael
(cherry picked from commit 18b932c980f2acdf9b5569cf61afece28c02abf5)

15 years agobuild: use the libs target instead of the LIBRARIES variable as dependecy for "all".
Michael Adam [Thu, 10 Jul 2008 13:01:56 +0000 (15:01 +0200)]
build: use the libs target instead of the LIBRARIES variable as dependecy for "all".

Michael
(cherry picked from commit 991c3fefa850c0b48111c6c5bacae14163872b58)

15 years agobuild: distribute the cleanlibs target over the library-specific sections.
Michael Adam [Thu, 10 Jul 2008 12:58:36 +0000 (14:58 +0200)]
build: distribute the cleanlibs target over the library-specific sections.

Michael
(cherry picked from commit 2588c399a0df99a87cf7c749133bceb6aa34a21a)

15 years agobuild: introduce a installibs target and use it in "make install"
Michael Adam [Thu, 10 Jul 2008 12:15:39 +0000 (14:15 +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)

15 years agobuild: move definition of LIBADDNS_OBJ back up to LIBADDNS_OBJ0
Michael Adam [Tue, 8 Jul 2008 15:00:07 +0000 (17:00 +0200)]
build: move definition of LIBADDNS_OBJ back up to LIBADDNS_OBJ0

to keep stuff together...

Michael
(cherry picked from commit 22735ee14a244dbda768c26dbe83a1b2aa3c03ec)

15 years agobuild: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
Michael Adam [Tue, 8 Jul 2008 14:55:52 +0000 (16:55 +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)

15 years agobuild: fix creation of libsmbclient.a - don't link in libtalloc.a
Michael Adam [Mon, 7 Jul 2008 16:32:50 +0000 (18:32 +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)

15 years agobuild: fix creation of libaddns.a - don't link in libtalloc.a
Michael Adam [Mon, 7 Jul 2008 16:30:12 +0000 (18:30 +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)

15 years agobuild: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
Michael Adam [Mon, 7 Jul 2008 09:57:43 +0000 (11:57 +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)

15 years agobuild: remove library-versions.in - it is not used any more.
Michael Adam [Mon, 7 Jul 2008 15:42:59 +0000 (17:42 +0200)]
build: remove library-versions.in - it is not used any more.

Michael
(cherry picked from commit e2699b7f86302e5c770f8e3160f72f070d700b6c)

15 years agobuild: set SONAME version of libraries from configure, not using library-versions
Michael Adam [Mon, 7 Jul 2008 15:35:08 +0000 (17:35 +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)

15 years agobuild: extend SMB_LIBRARY() to take a version as an optional second argument
Michael Adam [Mon, 7 Jul 2008 15:34:00 +0000 (17:34 +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)

15 years agobuild: combine the cleanlibfoo targets to one cleanlibs target
Michael Adam [Mon, 7 Jul 2008 17:06:16 +0000 (19:06 +0200)]
build: combine the cleanlibfoo targets to one cleanlibs target

And use that in make clean

Michael

(cherry picked from commit 887b6231198ce2ff6230e0939ddcf46759bc88bf)

conflicts resolved

15 years agobuild: fix shlibs target after internal changes, add libs target.
Michael Adam [Mon, 7 Jul 2008 15:32:18 +0000 (17:32 +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)

15 years agobuild: remove the SONAME_VER variable - not used anymore.
Michael Adam [Mon, 7 Jul 2008 14:24:17 +0000 (16:24 +0200)]
build: remove the SONAME_VER variable - not used anymore.

Michael
(cherry picked from commit 35b2ee2bce93f6e659f95d91b0590edd02c9b348)

15 years agobuild: fix typo in use of cleanlibsmbclient target
Michael Adam [Mon, 7 Jul 2008 16:12:02 +0000 (18:12 +0200)]
build: fix typo in use of cleanlibsmbclient target

Michael

(cherry picked from commit 5712062d22237768a671aa918e39a22d290b0f0a)

conflicts resolved

15 years agobuild: add a cleanlibaddns target and use it in "make clean"
Michael Adam [Mon, 7 Jul 2008 12:04:32 +0000 (14:04 +0200)]
build: add a cleanlibaddns target and use it in "make clean"

Michael

(cherry picked from commit 39a447a232d0afbef55437a995f557553cbc8a0e)

conflicts resolved

Michael

15 years agobuild: handle libaddns by SMB_LIBRARY() and correctly create SONAME file.
Michael Adam [Mon, 7 Jul 2008 11:57:34 +0000 (13:57 +0200)]
build: handle libaddns by SMB_LIBRARY() and correctly create SONAME file.

Create .so file as a symlink.

Michael
(cherry picked from commit bbf665ad5790e89ff01867e2762fe2b94db7277d)

15 years agobuild: extend SMB_LIBRARY() to optionally take default value.
Michael Adam [Mon, 7 Jul 2008 11:55:31 +0000 (13:55 +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)

15 years agobuild: move LIBADDNS_OBJ0 up again -- needed for NET_OBJ :-\
Michael Adam [Mon, 7 Jul 2008 16:28:53 +0000 (18:28 +0200)]
build: move LIBADDNS_OBJ0 up again -- needed for NET_OBJ :-\

Michael

(cherry picked from commit b871cb0cb6d32e5e97666bd429d0fb9940ae4b2e)

conflicts resolved

15 years agobuild: move libaddns related bits to the libaddns section in Makefile.in
Michael Adam [Mon, 7 Jul 2008 09:59:10 +0000 (11:59 +0200)]
build: move libaddns related bits to the libaddns section in Makefile.in

Michael

(cherry picked from commit 61157cb92ec2c12e565fb088170c7f430e3b5b77)

conflicts resolved

15 years agobuild: create cleanlibsmbsharemodes target and use it in "make clean".
Michael Adam [Mon, 7 Jul 2008 07:26:21 +0000 (09:26 +0200)]
build: create cleanlibsmbsharemodes target and use it in "make clean".

Michael

(cherry picked from commit 20a5053f0e75176e9ec1d4fd5a18626bbe3a0267)

conflicts resolved

15 years agobuild: handle libsmbsharemodes by SMB_LIBRARY() and correctly create SONAME file.
Michael Adam [Sun, 6 Jul 2008 22:41:23 +0000 (00:41 +0200)]
build: handle libsmbsharemodes by SMB_LIBRARY() and correctly create SONAME file.

Create libsmbsharemodes.so as a symlink.

Michael
(cherry picked from commit 1157048146084e9ab34d7c2e77e8d00b22df53a4)

15 years agobuild: move libsmbsharemodes related vars and targets to libsmbsharemodes section...
Michael Adam [Sun, 6 Jul 2008 22:23:57 +0000 (00:23 +0200)]
build: move libsmbsharemodes related vars and targets to libsmbsharemodes section in Makefile.in

Michael
(cherry picked from commit 278dde8a6c486505c2d7403103ba011e1abb039e)

15 years agobuild: add structuring comment for libbigballofmud
Michael Adam [Sun, 6 Jul 2008 22:20:47 +0000 (00:20 +0200)]
build: add structuring comment for libbigballofmud
(cherry picked from commit 879b000fd3ad123f64017071a6aaa17cdc926995)

15 years agobuild: add cleanlibsmbclient target and use it in make clean.
Michael Adam [Sun, 6 Jul 2008 22:06:28 +0000 (00:06 +0200)]
build: add cleanlibsmbclient target and use it in make clean.

Michael

(cherry picked from commit 95a7d21d3150ca9c24d48cf6a2976dcc1dfaaa05)

conflicts resolved

15 years agobuild: handle libsmbclient by SMB_LIBRARY() and correctly create soname file.
Michael Adam [Sun, 6 Jul 2008 22:02:50 +0000 (00:02 +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)

15 years agobuild: slightly change and extend the logic of SMB_LIBRARY().
Michael Adam [Sun, 6 Jul 2008 21:37:06 +0000 (23:37 +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)

15 years agobuild: rename (un)installclientlib to (un)installlibsmbclient
Michael Adam [Sun, 6 Jul 2008 20:10:23 +0000 (22:10 +0200)]
build: rename (un)installclientlib to (un)installlibsmbclient

keeping old targets as aliases for backward compatibility

Michael
(cherry picked from commit 40ff40de5780fb17567b8d5ea75f5bb7f8d811c4)

15 years agobuild: move libsmbclient related variables and targets to libsmbclient section
Michael Adam [Sun, 6 Jul 2008 20:08:28 +0000 (22:08 +0200)]
build: move libsmbclient related variables and targets to libsmbclient section

Michael
(cherry picked from commit ed3c35d307456601ca00d88a5cc278d6604681e1)

15 years agobuild: move definition of SHLIBS to libraries section
Michael Adam [Sun, 6 Jul 2008 19:27:18 +0000 (21:27 +0200)]
build: move definition of SHLIBS to libraries section

Michael
(cherry picked from commit 36c99a3cad3c938a874f9b9f37c2265045957099)

15 years agobuild: add a cleanlibwbclient target to Makefile.in and use it for make clean.
Michael Adam [Sun, 6 Jul 2008 19:23:11 +0000 (21:23 +0200)]
build: add a cleanlibwbclient target to Makefile.in and use it for make clean.

Michael

(cherry picked from commit e01a1d8d651f680ca58b809dc569ff74592d53a9)

conflicts resolved

15 years agobuild: add uninstalllibwbclient to Makefile.in and use it for uninstall
Michael Adam [Sun, 6 Jul 2008 19:20:54 +0000 (21:20 +0200)]
build: add uninstalllibwbclient to Makefile.in and use it for uninstall

Michael
(cherry picked from commit 2712dade9d6495f3dbb75876ec32d73f8bb93f9f)

15 years agobuild: fix the installlibwbclient target to use defined variables and install the...
Michael Adam [Sun, 6 Jul 2008 19:14:17 +0000 (21:14 +0200)]
build: fix the installlibwbclient target to use defined variables and install the symlink

Michael
(cherry picked from commit 922b136ada1c502edcbbb89e9cca155cd6ad376c)

15 years agobuild: fix creation of libwbclient shared lib by crating soname file
Michael Adam [Sun, 6 Jul 2008 18:48:00 +0000 (20:48 +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)

15 years agoRevert "build: fix creation of libsmbsharemodes.a - don't link in libtdb.a."
Michael Adam [Thu, 14 Aug 2008 12:44:30 +0000 (14:44 +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

15 years agoRevert "build: fix creation of libsmbclient.a - don't link in libtalloc.a"
Michael Adam [Thu, 14 Aug 2008 12:43:58 +0000 (14:43 +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

15 years agoRevert "build: fix creation of libaddns.a - don't link in libtalloc.a"
Michael Adam [Thu, 14 Aug 2008 12:43:31 +0000 (14:43 +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

15 years agoRevert "build: fix build on systems with picky make and without shared libwbclient"
Michael Adam [Thu, 14 Aug 2008 12:43:05 +0000 (14:43 +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

15 years agoRevert "build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:42:49 +0000 (14:42 +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

15 years agoRevert "build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:40:54 +0000 (14:40 +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

15 years agoRevert "build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:40:37 +0000 (14:40 +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

15 years agoRevert "build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@"
Michael Adam [Thu, 14 Aug 2008 12:40:11 +0000 (14:40 +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

15 years agoRevert "build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:39:54 +0000 (14:39 +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

15 years agoRevert "build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:39:37 +0000 (14:39 +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

15 years agoRevert "build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@...
Michael Adam [Thu, 14 Aug 2008 12:39:20 +0000 (14:39 +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

15 years agoRevert "build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules."
Michael Adam [Thu, 14 Aug 2008 12:38:59 +0000 (14:38 +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

15 years agoRevert "build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@...
Michael Adam [Thu, 14 Aug 2008 12:38:02 +0000 (14:38 +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

15 years agobuild: move libwbclient related target to libwbclient section in Makefile.in
Michael Adam [Sun, 6 Jul 2008 18:44:27 +0000 (20:44 +0200)]
build: move libwbclient related target to libwbclient section in Makefile.in

Michael

(cherry picked from commit 8f64706b095b9ca0e2a8f39cc3133bfd02f86158)

resolved conflicts

15 years agobuild: move libtdb target further down following common schema like with libtalloc
Michael Adam [Sun, 6 Jul 2008 18:39:45 +0000 (20:39 +0200)]
build: move libtdb target further down following common schema like with libtalloc

Michael
(cherry picked from commit f94b07f0c56928f890ffb1e2aca2c8bfcc954dd5)

15 years agobuild: fix uninstalllibnetapi target - handle symlink libnetapi.so
Michael Adam [Sun, 6 Jul 2008 18:38:03 +0000 (20:38 +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)

15 years agobuild: fix installlibnetapi target - install symlink libnetapi.so (if appropriate)
Michael Adam [Sun, 6 Jul 2008 18:35:13 +0000 (20:35 +0200)]
build: fix installlibnetapi target - install symlink libnetapi.so (if appropriate)

Michael
(cherry picked from commit 59e7827e557c5096fb363051a4cf1835b2a53223)