tprouty/samba.git
10 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)
(cherry picked from commit 29b39723b82f363d32dc4678d6b71a78485c65ce)

10 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)
(cherry picked from commit 3366ac2857820d87fb36a1357786a3564d258da5)

10 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>
(cherry picked from commit 3d96409c115b3ad4ef29ff75e40b39a26e316afe)

10 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.
(cherry picked from commit 4ac537d1b78c915fe25c219958312cf22f3cba80)

10 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)
(cherry picked from commit 7401c6a5b74c9c82c02923e6eafa6072a5d5678f)

10 years agoVERSION: Raise version number up tp 3.2.4.
Karolin Seeger [Thu, 28 Aug 2008 14:04:42 +0000 (16:04 +0200)]
VERSION: Raise version number up tp 3.2.4.

Karolin

10 years agoldb: Fix permissions of new ldg files. release-3-2-3
Karolin Seeger [Wed, 27 Aug 2008 11:23:20 +0000 (13:23 +0200)]
ldb: Fix permissions of new ldg files.

This one fixes together with 2eaf4ed62 bug #5715 and CVE-2008-3789.

Thanks to Steve Langasek <vorlon@debian.org> for reporting!

Karolin

10 years agoWHATSNEW: Add updates for 3.2.3.
Karolin Seeger [Wed, 27 Aug 2008 09:09:54 +0000 (11:09 +0200)]
WHATSNEW: Add updates for 3.2.3.

Karolin

10 years agoldb: Fix permissions of group_mapping.ldb.
Andrew Tridgell [Wed, 27 Aug 2008 08:45:43 +0000 (10:45 +0200)]
ldb: Fix permissions of group_mapping.ldb.

This one fixes bug #5715 and CVE-2008-3789.

10 years agoRevert "build: fix linking cifs.upcall when nscd_flush_cache() is found."
Karolin Seeger [Wed, 27 Aug 2008 08:38:42 +0000 (10:38 +0200)]
Revert "build: fix linking cifs.upcall when nscd_flush_cache() is found."

This reverts commit a7058ed1ef2622abdb75fe997ce4a5c570898929.

10 years agoRevert "Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4...
Karolin Seeger [Wed, 27 Aug 2008 08:38:35 +0000 (10:38 +0200)]
Revert "Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address"

This reverts commit 435c10268bb6987ab7e8206cd6c45bd9961c5632.

10 years agoRevert "cifs.upcall: handle MSKRB5 OID properly"
Karolin Seeger [Wed, 27 Aug 2008 08:38:25 +0000 (10:38 +0200)]
Revert "cifs.upcall: handle MSKRB5 OID properly"

This reverts commit 64ebfe4b2e5b7e3e07a0af424b35000693148e48.

10 years agoRevert "smbd: fix the handling of create_options to pass RAW-OPEN"
Karolin Seeger [Wed, 27 Aug 2008 08:38:18 +0000 (10:38 +0200)]
Revert "smbd: fix the handling of create_options to pass RAW-OPEN"

This reverts commit ebd1f8f9297b31353d094ddccc320a83f02877ce.

10 years agoRevert "nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT"
Karolin Seeger [Wed, 27 Aug 2008 08:38:08 +0000 (10:38 +0200)]
Revert "nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT"

This reverts commit 15e8e23466ae959bd0efc540c287338dbcd0b7a6.

10 years agoRevert "fix another build warning."
Karolin Seeger [Wed, 27 Aug 2008 08:38:00 +0000 (10:38 +0200)]
Revert "fix another build warning."

This reverts commit e3ff1cb7709d93fb91602d3d25deca3f4ecce2ce.

10 years agoRevert "fix build warning."
Karolin Seeger [Wed, 27 Aug 2008 08:37:49 +0000 (10:37 +0200)]
Revert "fix build warning."

This reverts commit c48f247d76569bfdc844499cc64f504bce7085cd.

10 years agoRevert "build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency."
Karolin Seeger [Wed, 27 Aug 2008 08:37:41 +0000 (10:37 +0200)]
Revert "build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency."

This reverts commit eb892f90c9be0ebc2217fc459d4249190986c003.

10 years agoRevert "build: fall down to the same place when using an internal lib statically."
Karolin Seeger [Wed, 27 Aug 2008 08:37:30 +0000 (10:37 +0200)]
Revert "build: fall down to the same place when using an internal lib statically."

This reverts commit 8145b0a7d7bacb818b8dadadae65ecd0877b5ce2.

10 years agoRevert "build: fix bug #5590 by not linking in the static libs but the objects."
Karolin Seeger [Wed, 27 Aug 2008 08:37:22 +0000 (10:37 +0200)]
Revert "build: fix bug #5590 by not linking in the static libs but the objects."

This reverts commit ef801d12a309c4c9f6429739b835fb32f5c309b8.

10 years agoRevert "Fix bug 5698 - mixup of TALLOC/malloc. Spotted by Douglas Wegscheid <Douglas_...
Karolin Seeger [Wed, 27 Aug 2008 08:36:58 +0000 (10:36 +0200)]
Revert "Fix bug 5698 - mixup of TALLOC/malloc. Spotted by Douglas Wegscheid <Douglas_E_Wegscheid@whirlpool.com>."

This reverts commit 3c205320cd1eb19ed275572f975487e92c611f13.

10 years agoRevert "IDL: fix IDL for netr_ServerPasswordSet2()."
Karolin Seeger [Wed, 27 Aug 2008 08:36:51 +0000 (10:36 +0200)]
Revert "IDL: fix IDL for netr_ServerPasswordSet2()."

This reverts commit 7a53e1e83a070394f77da4a0f7b2ed480165c376.

10 years agoRevert "re-run make idl."
Karolin Seeger [Wed, 27 Aug 2008 08:36:31 +0000 (10:36 +0200)]
Revert "re-run make idl."

This reverts commit 94dd61a4e8e070e175339defce4da08eaf87429d.

10 years agoRevert "Fix Bug #5710 and make machine account password changing work again."
Karolin Seeger [Wed, 27 Aug 2008 08:36:20 +0000 (10:36 +0200)]
Revert "Fix Bug #5710 and make machine account password changing work again."

This reverts commit 6d42b1e372b67eba83dbd5200bfb131b74cac180.

10 years agoRevert "cifs.upcall: fix build warning"
Karolin Seeger [Wed, 27 Aug 2008 08:36:10 +0000 (10:36 +0200)]
Revert "cifs.upcall: fix build warning"

This reverts commit b3a8b823361d6144f14c2d800e956f26ff9ad6d6.

10 years agoRevert "winbindd: Fix crash in cm_connect_sam()"
Karolin Seeger [Wed, 27 Aug 2008 08:36:00 +0000 (10:36 +0200)]
Revert "winbindd: Fix crash in cm_connect_sam()"

This reverts commit 9bbd6ee5db03747499bd263bb1365c8cd352076d.

10 years agoRevert "Don't re-initialize a token when we already have one. This fixes the build...
Karolin Seeger [Wed, 27 Aug 2008 08:35:51 +0000 (10:35 +0200)]
Revert "Don't re-initialize a token when we already have one. This fixes the build farm failures when winbindd connects as guest."

This reverts commit a90648e905aebc98c78897adf76729bea269cedf.

10 years agoDon't re-initialize a token when we already have one. This fixes the build farm failu...
Jeremy Allison [Fri, 22 Aug 2008 20:50:53 +0000 (13:50 -0700)]
Don't re-initialize a token when we already have one. This fixes the build farm failures when winbindd connects as guest.
This one took a *lot* of tracking down :-).
Jeremy.
(cherry picked from commit f845c95dcfa0b1630a0057c62941bb8a72ebdd83)

10 years agowinbindd: Fix crash in cm_connect_sam()
Gerald (Jerry) Carter [Fri, 22 Aug 2008 15:17:04 +0000 (10:17 -0500)]
winbindd: Fix crash in cm_connect_sam()

Fix segv when talking to parent DC (joined to child domain).

The root cause was

(a) storing the parent domain in the cli_state struct caused
    the NTLMSSP pipe bind to fail which made us fallover to
    the schannel code path
(b) the dcinfo pointer in cm_get_schannel_dcinfo() was returning
    NULL even though the function indicated success.
(cherry picked from commit 5ce4a2ae6697970ea37d0078a506615b4b7a9a9c)
(cherry picked from commit 72d138adc200ab36e324721900af1a06d0879318)

10 years agocifs.upcall: fix build warning
Jeff Layton [Fri, 22 Aug 2008 01:41:19 +0000 (21:41 -0400)]
cifs.upcall: fix build warning

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit dffb2d8eea03bb75224c3d8b4d0ab210993c645a)

10 years agoFix Bug #5710 and make machine account password changing work again.
Günther Deschner [Thu, 21 Aug 2008 13:05:35 +0000 (15:05 +0200)]
Fix Bug #5710 and make machine account password changing work again.

When we negotiated NETLOGON_NEG_PASSWORD_SET2 we need to use
NetrServerPasswordSet2 to change the machine password.

Tested with NT4, W2k, W2k3 and W2k8.

Guenther
(cherry picked from commit 8ae7040a5e64f1a1d2088aeca1dab90470455d8a)

10 years agore-run make idl.
Günther Deschner [Thu, 21 Aug 2008 13:02:03 +0000 (15:02 +0200)]
re-run make idl.

Guenther
(cherry picked from commit f24cef9fa7be45212744d39b7c66804e64147afd)
(cherry picked from commit 059979f8e7d7d0459f83184ad5b06a8e6281f558)

10 years agoIDL: fix IDL for netr_ServerPasswordSet2().
Günther Deschner [Thu, 21 Aug 2008 13:01:36 +0000 (15:01 +0200)]
IDL: fix IDL for netr_ServerPasswordSet2().

Guenther
(cherry picked from commit 7b312a0abc6de5a51555ccfbde7f8f78fc11d043)
(cherry picked from commit d9fa27a079dde0ebd9c2d6dc1c1bff3ae570f9e8)

10 years agoFix bug 5698 - mixup of TALLOC/malloc. Spotted by Douglas Wegscheid <Douglas_E_Wegsch...
Jeremy Allison [Thu, 21 Aug 2008 17:25:51 +0000 (10:25 -0700)]
Fix bug 5698 - mixup of TALLOC/malloc. Spotted by Douglas Wegscheid <Douglas_E_Wegscheid@whirlpool.com>.
Jeremy.
(cherry picked from commit 02e260ab5254c9691846f7009f685e1b11032f80)

10 years agobuild: fix bug #5590 by not linking in the static libs but the objects.
Michael Adam [Wed, 20 Aug 2008 12:56:18 +0000 (14:56 +0200)]
build: fix bug #5590 by not linking in the static libs but the objects.

Michael
(cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a)
(cherry picked from commit 24459c7eda080a4fed2d4f2a576c97f878f905f9)

10 years agobuild: fall down to the same place when using an internal lib statically.
Michael Adam [Wed, 20 Aug 2008 12:55:24 +0000 (14:55 +0200)]
build: fall down to the same place when using an internal lib statically.

Michael
(cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1)
(cherry picked from commit f3ad03d0f909ff862411511d9f63e77047034c01)

10 years agobuild: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency.
Michael Adam [Wed, 20 Aug 2008 11:22:13 +0000 (13:22 +0200)]
build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency.

Michael
(cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15)
(cherry picked from commit 8dd57f31b2ba621654f989e1ed58bd2dd80b7849)

10 years agofix build warning.
Günther Deschner [Wed, 20 Aug 2008 16:40:58 +0000 (18:40 +0200)]
fix build warning.

Guenther
(cherry picked from commit a75055be5ff7ebe3476cfac86c6597a56a843c23)
(cherry picked from commit d0a4b9f69984ca5da0007af91013f1bc78dcbf2b)

10 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)
(cherry picked from commit 2a5ae59f77c05c41c97747dee9bc8c196dfe6b89)

10 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)
(cherry picked from commit 29b39723b82f363d32dc4678d6b71a78485c65ce)

10 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)
(cherry picked from commit 3366ac2857820d87fb36a1357786a3564d258da5)

10 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>
(cherry picked from commit 3d96409c115b3ad4ef29ff75e40b39a26e316afe)

10 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.
(cherry picked from commit 4ac537d1b78c915fe25c219958312cf22f3cba80)

10 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)
(cherry picked from commit 7401c6a5b74c9c82c02923e6eafa6072a5d5678f)

10 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
(cherry picked from commit efbd263131228281eca30d7834de52502d2806d6)

10 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
(cherry picked from commit 902349b956e26f4f9255045162ce5310c44a4166)

10 years agoFix length error in wrapping spnego blob. Karoling this needs to be in 3.2.2 (sorry). release-3-2-2
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).
(cherry picked from commit e2caa65a698ca7109aa44656ff9399104cf0663b)

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

Karolin
(cherry picked from commit 9f74480cc6c4f1f41c1a4fe71580cd623ef41407)

10 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
(cherry picked from commit 986c52dca86cc82dd62d1b9f71ee2269d5ba5cb4)

10 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
(cherry picked from commit 25c354f8d194624d9ef8924d861af377cb89275d)

10 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
(cherry picked from commit d1738c966cc090fbe4bcd246bebb9c693235152a)

10 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.
(cherry picked from commit 780a4ff80dfd03a2c422920dbd101e8f58f7136e)

10 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>
(cherry picked from commit 7e05ff65a7907bf34e2d422f7c941002cfb86971)

10 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>
(cherry picked from commit 7b25c4d2363ee772eed44174c882a7fbc59f0568)

10 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(-)
(cherry picked from commit 34cf3c012e463d0ea04616308738aadea438f48b)

10 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
(cherry picked from commit 370722392d7f42f8094f574cac08a6a12e5893a3)

10 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>
(cherry picked from commit bd1cf48d7e20cb534bd672bacbf3ac4a87d1a7b4)

10 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>
(cherry picked from commit 1d88c3431a1abf5fe6527fcbdf43972607a317ee)

10 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.
(cherry picked from commit 7e9b24a12d91fc558864e91852028adb9a381838)

10 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.
(cherry picked from commit a252ad90136fbc338c0946a5fd5e5322b8d95a01)

10 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.
(cherry picked from commit ecf96a26bfe18899133d68032b0cda00177d57d0)

10 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)
(cherry picked from commit 402da4046160b01d873cba72033ed7cfc7e21387)

10 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)
(cherry picked from commit 41d440c3198752281556699cc9744b490b9b0a5e)

10 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)
(cherry picked from commit 40e58351472689dbefb02e185d958bee5ca83937)

10 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)
(cherry picked from commit e233cdeb16e635260197e30528eef20d29678052)

10 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)
(cherry picked from commit 216623bb706f6b9ca9195829b9f9a8ab8485c44d)

10 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)
(cherry picked from commit bf267c57440b0bfedddb8e4d17dc1f23b758cd50)

10 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)
(cherry picked from commit 71e3a41c8e92e196130e5b4514f1014cf0549bf8)

10 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)
(cherry picked from commit d10eba03ec5b624d364f9b0210cdaf6fddb9fd19)

10 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)
(cherry picked from commit cdc5b3ca7aea71812d8c4d51b088b0aa3ce85b68)

10 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)
(cherry picked from commit de7c35a8ab9701144d014199d156330cf6c1948f)

10 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)
(cherry picked from commit bec1046d54c6368ad7bc2171c27b4d39bdf369b4)

10 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
(cherry picked from commit 69203d903833d7e1308c8d5f16f1046b52a26097)

10 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)
(cherry picked from commit 75822b4bd7ef61d52ef7900800af5106f942350a)

10 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
(cherry picked from commit 67834235eb62f16bf366668760f628a67c330c12)

10 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)
(cherry picked from commit 40c1092a305f3825fbf3362346ebbfcde562d0aa)

10 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)
(cherry picked from commit 5c95eb75391290dd6d9fcb0cba23c4f4756b151c)

10 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)
(cherry picked from commit 5dab57c61853163cb8f4a6a1887f748096be175c)

10 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)
(cherry picked from commit 9e65aea4a2a906933126f69e80dac914972f27f9)

10 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)
(cherry picked from commit 19689e27d48c8cf4cd2a1e8fb800a38a4a910c99)

10 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)
(cherry picked from commit 5591d9c86e235b191065f989499d2d14a61b1606)

10 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)
(cherry picked from commit 21595a0a269ef7f3c3428cb41f45c3d1bd1fb661)

10 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)
(cherry picked from commit 2afd72288c54c4a0251cee4c99710bd894cf2b3f)

10 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)
(cherry picked from commit f61d00d18bda40d2736b45d1caf238ed42140e2e)

10 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)
(cherry picked from commit 68aa96ff700feb43fd429c650ff6012a27bc445d)

10 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)
(cherry picked from commit 92e0a9c1b71eda9cc8681e4b28f06431568aaf05)

10 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)
(cherry picked from commit 288c4951a102e313a86b461dcd5cf3e7840d65f2)

10 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)
(cherry picked from commit 6a6b90f4c56f040d19c60122c914b7a7ce64a3c6)

10 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)
(cherry picked from commit e2624c2537e87acad7cfd58c76cb471d7141801c)

10 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
(cherry picked from commit 4266976d0f35161af8a8c687589c6010de3035a3)

10 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)
(cherry picked from commit 196cf8307291aafb65db6291f3c55fdd33a2de85)

10 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)
(cherry picked from commit 961bb257b590920b7fbcf80bbe26c58a6b4be696)

10 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
(cherry picked from commit f474363356a965fe712cb2dc4afa3272b2f882cb)

10 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
(cherry picked from commit 90e56e6b86b3aee208ff326246aaf7dfad1ee0ce)

10 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)
(cherry picked from commit f0ee69d25da86647a4a75e6994e72a62ad889064)

10 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)
(cherry picked from commit 6c11ed560ae20f712be6c0680f53b1a275da94e7)

10 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
(cherry picked from commit 2344a61abc83e26bf7488a1de00289937af4f758)

10 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
(cherry picked from commit a1132b9cf92a16448888e7b64e08efd796677db6)

10 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
(cherry picked from commit 0ae8cc06532a72ab68ce91d6237d5457dfe369fd)

10 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)
(cherry picked from commit 8335245d9164f0bd19b2d018bb3138fde9e05fa7)

10 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)
(cherry picked from commit ace76729b45730c70915c2656eee5ed83102bcf6)