[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0-27-gc25e859
Karolin Seeger
kseeger at samba.org
Thu Aug 13 07:36:31 MDT 2009
The branch, v3-4-stable has been updated
via c25e8597214b7167c557a86352ab3f0f8a7d6b94 (commit)
via b48a36a70ec8e9719355157557a12bb42bb23120 (commit)
via 88e9bde9a5d453badf98ab61a28af91836af8809 (commit)
via aef2552e744db66b283bc4b1f9c263d93051d190 (commit)
via 355c23018521db9b8e8847bbaa6e04a8ad2ef0d2 (commit)
via 3c465fcf5446b1de9e8332ba148d529c97c72489 (commit)
via ea155f5ba0b7554f2951c35abb3533ea06b75cc2 (commit)
via b50362c0c5973b42744d768dfd85aed1d1e484fd (commit)
via 5a6a938d95fc090f2eecdd422a6a5721778b2314 (commit)
via eece2d10e3a4cbadd219186b1ceef5d79135ea62 (commit)
via 83eaed1cd5185933ac9dfe976b1b20cd2ed75153 (commit)
via a6a93eb0bda5859b42ae2b4f6dd51ed438891f78 (commit)
via 516be01408db4e8efe75535fbdb7a0facf9973d1 (commit)
via c127099846ac89496d3b0e2fc7afb7e5a3b299ec (commit)
via dbf16bf251459d33d85c17e6cf1e48d10137bf98 (commit)
via 8b21aaa70e17cb8e08bc7f834255716feb744ddc (commit)
via 70634edd550e35c495a76d72b219cc252518a413 (commit)
via c934258554221cec41cab95b35fa6e7d64aae2a1 (commit)
via d761bb2f13e46168f0a7ba417b399a267ab88db5 (commit)
via 92642e4157422a496122b7e7ff2afafd6c067432 (commit)
via b53950e522cd1f4c1f49a73ba844d28449f90ee9 (commit)
via 36e373a48d80398ffe414fd9cf37e933fed37a72 (commit)
via 2ea34c0b06d485e47db7fe7b197521fed3ddb0a1 (commit)
via c75219130f855c2709729922d5e069ba4e23012c (commit)
via 007f89def89794793a447d12fcd213dc222e2bd0 (commit)
via c15621069699dd7aabf904f8c290141b2b4396bb (commit)
via 0b8b25a144b1d93149bfb1c6be59dc8f44541359 (commit)
from 51b334e2d9739abc748490f6085ed8b8e5e1f4b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit c25e8597214b7167c557a86352ab3f0f8a7d6b94
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Aug 13 15:33:37 2009 +0200
VERSION: Raise version number up to 3.4.1.
Karolin
(cherry picked from commit b1dd075c6819a3fb0f00bdb93104c307505ec8ba)
commit b48a36a70ec8e9719355157557a12bb42bb23120
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Aug 13 15:32:53 2009 +0200
WHATSNEW: Start WHATSNEW for 3.4.1.
Karolin
(cherry picked from commit 63a674b4895d8fd8605cd4c526e91b2b52c3a8ed)
commit 88e9bde9a5d453badf98ab61a28af91836af8809
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed May 13 10:07:56 2009 +0200
s3/packaging: Fix build on RHEL when ccache is not available.
This fixes bug #5832.
Patch was provided by D.L. Meyer <dlmeyer [at] uiuc.edu>.
Thanks for reporting and providing the patch!
Karolin
(cherry picked from commit 42e0cb8c0a1b8470ac8e9ad1c5a741e299debb8f)
(cherry picked from commit b2205a7697598729f85cb767621b8c610654053c)
(cherry picked from commit 174356c6618f8704b968ccfb46b04233bf7dfa40)
commit aef2552e744db66b283bc4b1f9c263d93051d190
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 6 13:11:20 2009 -0700
Correctly implement SMB_INFO_STANDARD setfileinfo.
Fixes bug #6593.
Jeremy.
(cherry picked from commit c704e22806198a620d7e058c8d69c144ce096837)
commit 355c23018521db9b8e8847bbaa6e04a8ad2ef0d2
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Aug 6 11:23:23 2009 -0700
s4 torture: Extend the RAW-RENAME test to more fully test directory renames.
The existing test was only covering files opened underneath the
directory that was being renamed. It is not uncommon for windows
clients to actually hold a read-only handle to a directory open across
the rename, which it turns out doesn't return NT_STATUS_ACCESS_DENIED.
Additionally, holding a handle open to a stream on the directory is
also allowed.
(cherry picked from commit 80cedd944c3bcee7fe44787c9730b564b2d86726)
commit 3c465fcf5446b1de9e8332ba148d529c97c72489
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Aug 6 15:53:33 2009 -0700
s3: Fix a bug in renames of directories
Recently code was added to match windows semantics of denying the
rename of a directory if there are open files underneath it. This
does partly match windows semantics, but it turns out the rename
should be allowed if the open file handle is for the directory being
renamed, or for a stream on the directory being renamed. This patch
refines the check to better follow these rename semantics.
Addresses bug #6620.
(cherry picked from commit 06ab965b72ba477505d297ab72156136ab981e93)
commit ea155f5ba0b7554f2951c35abb3533ea06b75cc2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 11 11:17:14 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds.
metze
(cherry picked from commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5)
Fixes bug #6627.
(cherry picked from commit 536946c706b66d432d60c990f28ff0ed5861fa44)
commit b50362c0c5973b42744d768dfd85aed1d1e484fd
Author: Bo Yang <boyang at samba.org>
Date: Fri Aug 7 13:55:31 2009 +0800
s3: Unable to browse DFS when using kerberos in libsmbclient
Signed-off-by: Bo Yang <boyang at samba.org>
Fixes bug #6615.
(cherry picked from commit 13911afe5b167ae9d100c40d32e9286d902652a1)
commit 5a6a938d95fc090f2eecdd422a6a5721778b2314
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 26 21:52:34 2009 +0200
The solaris linker seems to require an extra mention of dependent libs
(cherry picked from commit 04e4d03868ea67f323bf008eb7b9af740a0467ac)
(cherry picked from commit e4a26c94271409d58138391d523305d641105a05)
commit eece2d10e3a4cbadd219186b1ceef5d79135ea62
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Aug 6 10:06:29 2009 +0200
s3/smbldap: Fix typo in debug message.
Karolin
(cherry picked from commit 54dffbea663ecf4542d6c5e30da6e346d5d60424)
(cherry picked from commit bddd55fa8a20a7a2d6d521ec951d13f548950b26)
commit 83eaed1cd5185933ac9dfe976b1b20cd2ed75153
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 27 14:47:41 2009 +0200
Fix a valgrind error in chain_reply
construct_reply() references the request after chain_reply has freed it.
(cherry picked from commit 5135ebd6f099518f0a0b5796e8057210be824740)
Addresses bug #6611.
(cherry picked from commit 5c6aa5ce9fb0cc5d63d04b0777d296c82e61c0a5)
commit a6a93eb0bda5859b42ae2b4f6dd51ed438891f78
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 3 23:41:08 2009 +0200
s3-spoolss: fix crash bug in spoolss_addprinterex_level_2.
Fixes bug #6607.
Guenther
(cherry picked from commit 75030ff2b16a3ddb79367d970590da2375f7e3dc)
(cherry picked from commit e7e1a6b3237550ef90db6a52a023885f616f722b)
commit 516be01408db4e8efe75535fbdb7a0facf9973d1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jul 13 13:24:19 2009 +0200
s3:net: Fix Bug #6222. Default to DRSUAPI replication for net rpc vampire keytab
metze
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 8646b9521d267284a335aafba3df6039c41b8370)
(cherry picked from commit 1a8294f1dc7953bd7f45e9b65fe6b5ec005634d0)
commit c127099846ac89496d3b0e2fc7afb7e5a3b299ec
Author: Günther Deschner <gd at samba.org>
Date: Tue Aug 4 12:21:49 2009 +0200
s3-spoolss: Fix Bug #6568: _spoolss_GetPrintProcessorDirectory() implementation.
We should always return a local path so that users are not forced to setup a
[prnproc$] share on the server. This restores pre-3.4.0 spoolss behaviour.
Guenther
(cherry picked from commit 74454cc731f202361f1dce47fa850810bfeb36c8)
(cherry picked from commit ffb6b4e6f7e47e8f22519d616e4e31444e417d16)
commit dbf16bf251459d33d85c17e6cf1e48d10137bf98
Author: Yannick Bergeron <burgergold at hotmail.com>
Date: Thu Jul 30 19:31:24 2009 -0400
Increase the max_grp value to 128 (AIX NGROUPS_MAX value) instead of 32 to allow AIX to call sys_getgrouplist only once
(cherry picked from commit c3e12444f57e24dcd6c9259537ed0489db4658e9)
(cherry picked from commit 2666b3e27444ffcad3afc21e276f189ac238433f)
commit 8b21aaa70e17cb8e08bc7f834255716feb744ddc
Author: Bo Yang <boyang at samba.org>
Date: Mon Aug 3 08:16:21 2009 +0800
s3: check in .po files for pam_winbind.
Signed-off-by: Bo Yang <boyang at samba.org>
(cherry picked from commit 1c8a2e268a5d3968367f6984f23bb954fcb10edc)
commit 70634edd550e35c495a76d72b219cc252518a413
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Aug 3 10:19:45 2009 +0200
s3/docs: Fix typos.
Thanks to OPC oota <t-oota at dh.jp.nec.com> for reporting!
Karolin
(cherry picked from commit 7ee7ec3fdba2ef6a6cc3e1f96a5d2154290cdb18)
(cherry picked from commit c94d3183a8e4c7e03c0dd2771cb7b9f4665198ce)
commit c934258554221cec41cab95b35fa6e7d64aae2a1
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jul 30 08:55:01 2009 +0200
s3/cldap: Improve debug messages.
This patch was made to debug bug #6437.
(cherry picked from commit 47baa5de907c0162dec079c3636e7728f93c8b2f)
commit d761bb2f13e46168f0a7ba417b399a267ab88db5
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jul 28 13:22:35 2009 +0200
release-scripts: Remove RFCs in source4/.
Remove RFCs as they are non-free content (with a strict interpretation of
the DFSG). Addresse Debian bug #538034.
Karolin
(cherry picked from commit 571f20cd4db48c8d510e10b7188678d585abb2d1)
(cherry picked from commit 9d7b8b29854beafed4ec70b2db1d26dc3786cc71)
commit 92642e4157422a496122b7e7ff2afafd6c067432
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 25 12:57:15 2009 -0700
Fix bug #6506 - SMBD server doesn't set EAs when a file is overwritten in NT_TRANSACT_CREATE.
Reported and verified by Long Li <longli at microsoft.com>
Jeremy.
(cherry picked from commit 9c48f5bf2dcc12e6eb6170ab3a2af5ca119cf008)
(cherry picked from commit 92bb659e4340f22f855400e02e2a67474d2a048b)
commit b53950e522cd1f4c1f49a73ba844d28449f90ee9
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 27 13:33:38 2009 +0200
docs: fix typos in the net man page.
Noted by Oota Toshiya <t-oota at dh.jp.nec.com> .
Michael
(cherry picked from commit 34c535c9a8d08a480e156aaa9e4b843ffaab0636)
(cherry picked from commit d278a43d0626894f45dcc6e6dbe429565188d6fb)
commit 36e373a48d80398ffe414fd9cf37e933fed37a72
Author: Bo Yang <boyang at samba.org>
Date: Thu Jul 23 10:23:21 2009 +0800
s3: To correctly handle upn
lookupname failed, cannot find domain when attempt
to change password.
This addresses bug #6560.
Signed-off-by: Bo Yang <boyang at samba.org>
(cherry picked from commit 9acc670541031414d0cb5df39d18866c4c96b37c)
commit 2ea34c0b06d485e47db7fe7b197521fed3ddb0a1
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jul 17 17:33:28 2009 -0700
Fix bug #6564 - SetPrinter fails (panics) as non root. Missing become_root()/unbecome_root() around reload_services. Jeremy.
(cherry picked from commit d53cb77ab21cc6edc2f1767bb56a75901c4c1709)
commit c75219130f855c2709729922d5e069ba4e23012c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 15 14:00:41 2009 -0700
Fix bug #6551 - win98 clients cannot connect after server upgrade to samba-3.4.0. The values of vuid and tid were not being correctly updated in the struct smb_request when passed to chain_reply inside sessionsetupX and tconX. Jeremy.
(cherry picked from commit e7c5f7c924ae40ce3f36d352d55a92a906d92181)
commit 007f89def89794793a447d12fcd213dc222e2bd0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jul 7 15:16:21 2009 +0200
s3:smbd: cancel all locks that are made before the first failure
We never reached the cleanup code and directly returned the error.
This addresses bug #6538 (Fail to back out lockingX calls on error).
metze
(cherry picked from commit 94303584b942135355f99d138f8dc375d8dfacfb)
commit c15621069699dd7aabf904f8c290141b2b4396bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jul 18 08:30:17 2009 +0200
Fix build with external talloc.
(cherry picked from commit 17ce6f9984b7d84534eecde007ae904e13bbfdfa)
commit 0b8b25a144b1d93149bfb1c6be59dc8f44541359
Author: Jeremy Allison <jra at samba.org>
Date: Sat Jul 18 08:22:51 2009 +0200
s3/util_sock: Make open_udp_socket() IPv6 clean.
This addresses bug #6437.
(cherry picked from commit 27ddbcab378892dee0b69e8ba0ef03674e6e7075)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 90 ++++++++++++
docs-xml/Samba3-HOWTO/TOSHARG-ChangeNotes.xml | 4 +-
docs-xml/manpages-3/net.8.xml | 6 +-
nsswitch/pam_winbind.c | 13 ++-
packaging/RHEL/samba.spec.tmpl | 3 +-
release-scripts/create-tarball | 8 +
source3/VERSION | 2 +-
source3/configure.in | 40 +++++-
source3/include/smb.h | 2 +
source3/lib/smbldap.c | 2 +-
source3/lib/system_smbd.c | 2 +-
source3/lib/util_sock.c | 35 ++++--
source3/libads/cldap.c | 15 ++-
source3/libsmb/libsmb_context.c | 22 ++-
source3/locale/pam_winbind/ar.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/cs.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/da.po | 178 ++++++++++++++++++++++++
source3/locale/pam_winbind/es.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/fi.po | 181 ++++++++++++++++++++++++
source3/locale/pam_winbind/fr.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/hu.po | 166 ++++++++++++++++++++++
source3/locale/pam_winbind/it.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/ja.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/ko.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/nb.po | 183 +++++++++++++++++++++++++
source3/locale/pam_winbind/nl.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/pl.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/pt_BR.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/ru.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/sv.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/zh_CN.po | 153 +++++++++++++++++++++
source3/locale/pam_winbind/zh_TW.po | 153 +++++++++++++++++++++
source3/rpc_server/srv_spoolss_nt.c | 12 ++-
source3/samba4.m4 | 4 +
source3/smbd/files.c | 24 +++-
source3/smbd/open.c | 3 +-
source3/smbd/process.c | 13 ++-
source3/smbd/reply.c | 14 +-
source3/smbd/server.c | 1 +
source3/smbd/sesssetup.c | 1 +
source3/smbd/trans2.c | 6 +-
source3/utils/net_rpc_samsync.c | 11 +-
source3/winbindd/winbindd_ads.c | 21 +++
source3/winbindd/winbindd_rpc.c | 37 +++++-
source3/winbindd/winbindd_sid.c | 5 +
source3/winbindd/winbindd_util.c | 3 +-
source4/torture/raw/rename.c | 50 +++++++
47 files changed, 3234 insertions(+), 65 deletions(-)
create mode 100644 source3/locale/pam_winbind/ar.po
create mode 100644 source3/locale/pam_winbind/cs.po
create mode 100644 source3/locale/pam_winbind/da.po
create mode 100644 source3/locale/pam_winbind/es.po
create mode 100644 source3/locale/pam_winbind/fi.po
create mode 100644 source3/locale/pam_winbind/fr.po
create mode 100644 source3/locale/pam_winbind/hu.po
create mode 100644 source3/locale/pam_winbind/it.po
create mode 100644 source3/locale/pam_winbind/ja.po
create mode 100644 source3/locale/pam_winbind/ko.po
create mode 100644 source3/locale/pam_winbind/nb.po
create mode 100644 source3/locale/pam_winbind/nl.po
create mode 100644 source3/locale/pam_winbind/pl.po
create mode 100644 source3/locale/pam_winbind/pt_BR.po
create mode 100644 source3/locale/pam_winbind/ru.po
create mode 100644 source3/locale/pam_winbind/sv.po
create mode 100644 source3/locale/pam_winbind/zh_CN.po
create mode 100644 source3/locale/pam_winbind/zh_TW.po
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9d45601..4e40c97 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,94 @@
=============================
+ Release Notes for Samba 3.4.1
+ August 18, 2009
+ =============================
+
+
+This is the latest stable release of Samba 3.4.
+
+
+Major enhancements in Samba 3.4.1 include:
+
+ o Fix connections of Win98 clients (bug #6551).
+ o SetPrinter fails (panics) as non root (bug #6564).
+ o Fix crash bug in spoolss_addprinterex_level_2 (bug #6607).
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.4.0
+-------------------
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 6437: Make open_udp_socket() IPv6 clean.
+ * BUG 6506: Smbd server doesn't set EAs when a file is overwritten in
+ NT_TRANSACT_CREATE.
+ * BUG 6551: Fix connections of Win98 clients.
+ * BUG 6564: SetPrinter fails (panics) as non root.
+ * BUG 6593: Correctly implement SMB_INFO_STANDARD setfileinfo.
+
+
+o Yannick Bergeron <burgergold at hotmail.com>
+ * Increase the max_grp value to 128 (AIX NGROUPS_MAX value) instead of 32 to
+ allow AIX to call sys_getgrouplist only once.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 6568: Fix _spoolss_GetPrintProcessorDirectory() implementation.
+ * BUG 6607: Fix crash bug in spoolss_addprinterex_level_2.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 6611: Fix a valgrind error in chain_reply.
+ * Fix linking on Solaris.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 6222: Default to DRSUAPI replication for net rpc vampire keytab.
+ * BUG 6538: Cancel all locks that are made before the first failure.
+ * BUG 6627: Raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds.
+
+
+o Tim Prouty <tprouty at samba.org>
+ * BUG 6620: Fix a bug in renames of directories.
+
+
+o Jelmer Vernooij <jelmer at samba.org>
+ * Fix build with external talloc.
+
+
+o Bo Yang <boyang at samba.org>
+ * BUG 6560: Fix lookupname.
+ * BUG 6615: Fix browsing of DFS when using kerberos in libsmbclient.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 3.4.0
July 3, 2009
=============================
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ChangeNotes.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ChangeNotes.xml
index 6c2af32..29bdf40 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ChangeNotes.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ChangeNotes.xml
@@ -107,7 +107,7 @@ An example helps to illustrate the change:
<indexterm><primary>ACL</primary></indexterm>
<indexterm><primary>SID</primary></indexterm>
Assume that a group named <emphasis>developers</emphasis> exists with a UNIX GID of 782. In this
-case this user does not exist in Samba's group mapping table. It would be perfectly normal for
+case this group does not exist in Samba's group mapping table. It would be perfectly normal for
this group to be appear in an ACL editor. Prior to Samba-3.0.23, the group SID might appear as
<literal>S-1-5-21-647511796-4126122067-3123570092-2565</literal>.
</para>
@@ -188,7 +188,7 @@ and UNIX</link>.
<indexterm><primary>GID</primary></indexterm>
<indexterm><primary>SQL</primary></indexterm>
<indexterm><primary>XML</primary></indexterm>
-The <smbconfoption name="passdb backend"/> parameter no long accepts multiple passdb backends in a
+The <smbconfoption name="passdb backend"/> parameter no longer accepts multiple passdb backends in a
chained configuration. Also be aware that the SQL and XML based passdb modules have been
removed in the Samba-3.0.23 release. More information regarding external support for a SQL
passdb module can be found on the <ulink url="http://pdbsql.sourceforge.net/">pdbsql</ulink> web site.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index a0cba83..de3ed4d 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1705,7 +1705,7 @@ Joins a computer into a domain. This command supports the following additional p
</itemizedlist>
<para>
-Note that you also need to use standard net paramters to connect and authenticate to the remote machine that you want to join. These additional parameters include: -S computer and -U user.
+Note that you also need to use standard net parameters to connect and authenticate to the remote machine that you want to join. These additional parameters include: -S computer and -U user.
</para>
<para>
Example:
@@ -1735,7 +1735,7 @@ Unjoins a computer from a domain. This command supports the following additional
</itemizedlist>
<para>
-Note that you also need to use standard net paramters to connect and authenticate to the remote machine that you want to unjoin. These additional parameters include: -S computer and -U user.
+Note that you also need to use standard net parameters to connect and authenticate to the remote machine that you want to unjoin. These additional parameters include: -S computer and -U user.
</para>
<para>
Example:
@@ -1767,7 +1767,7 @@ Renames a computer that is joined to a domain. This command supports the followi
</itemizedlist>
<para>
-Note that you also need to use standard net paramters to connect and authenticate to the remote machine that you want to rename in the domain. These additional parameters include: -S computer and -U user.
+Note that you also need to use standard net parameters to connect and authenticate to the remote machine that you want to rename in the domain. These additional parameters include: -S computer and -U user.
</para>
<para>
Example:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index e90f1b7..4a44248 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -2284,6 +2284,7 @@ static char* winbind_upn_to_username(struct pwb_context *ctx,
enum wbcSidType type;
char *domain;
char *name;
+ char *p;
/* This cannot work when the winbind separator = @ */
@@ -2292,9 +2293,19 @@ static char* winbind_upn_to_username(struct pwb_context *ctx,
return NULL;
}
+ name = talloc_strdup(ctx, upn);
+ if (!name) {
+ return NULL;
+ }
+
+ if ((p = strchr(name, '@')) != NULL) {
+ *p = 0;
+ domain = p + 1;
+ }
+
/* Convert the UPN to a SID */
- wbc_status = wbcLookupName("", upn, &sid, &type);
+ wbc_status = wbcLookupName(domain, name, &sid, &type);
if (!WBC_ERROR_IS_OK(wbc_status)) {
return NULL;
}
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index eb85f9c..4467963 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -122,8 +122,7 @@ cd source3
# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
## check for ccache
- ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
+if [ "$(which ccache 2> /dev/null)" != "" ]; then
CC="ccache gcc"
else
CC="gcc"
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3e80cd1..5c9df90 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -197,6 +197,14 @@ function main
pushd ../samba-${version}
+ # Remove RFCs as they are non-free content (with a strict interpretation of
+ # the DFSG)
+
+ if [ -d source4 ]; then
+ echo "Removing RFCs"
+ find source4/ -name "rfc*.txt" -exec rm -f {} \;
+ fi
+
packaging/bin/update-pkginfo ${version} 1 ""
buildDocs
diff --git a/source3/VERSION b/source3/VERSION
index ead30d0..5ea32ae 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=0
+SAMBA_VERSION_RELEASE=1
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source3/configure.in b/source3/configure.in
index 111e89d..f6ee056 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -77,7 +77,6 @@ done
AC_SUBST(LIBTDB_OBJ0)
SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
@@ -4748,7 +4747,33 @@ LINK_LIBSMBCLIENT=STATIC
# TODO: for talloc and tdb (at least), these should
# be extracted from their respective source directories
#
-SMB_LIBRARY(talloc, 1)
+AC_ARG_ENABLE(external_libtalloc, [AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc [default=auto]])],
+[ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ])
+
+if test "x$enable_external_libtalloc" != xno
+then
+ PKG_CHECK_MODULES(LIBTALLOC, talloc >= 1.3.0,
+ [ enable_external_libtalloc=yes ],
+ [ if test x$enable_external_libtalloc = xyes; then
+ AC_MSG_ERROR([Unable to find libtalloc])
+ else
+ enable_external_libtalloc=no
+ fi
+ ])
+fi
+
+if test "x$enable_external_libtalloc" = xno
+then
+ m4_include(../lib/talloc/libtalloc.m4)
+ SMB_LIBRARY(talloc, 1)
+ LIBTALLOC_OBJ0=""
+ for obj in ${TALLOC_OBJ}; do
+ LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
+ done
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
+ AC_SUBST(LIBTALLOC_OBJ0)
+fi
+
SMB_LIBRARY(tdb, 1)
SMB_LIBRARY(netapi, 0)
SMB_LIBRARY(smbclient, 0)
@@ -6040,7 +6065,6 @@ fi
AC_ARG_ENABLE(avahi,
[AS_HELP_STRING([--enable-avahi], [Enable Avahi support (default=auto)])])
-AC_SUBST(AVAHI_LIBS)
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -6054,12 +6078,18 @@ if test x"$enable_avahi" != x"no"; then
have_avahi_support=no
fi
- AC_CHECK_LIB_EXT(avahi-client, AVAHI_LIBS, avahi_client_new)
- if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes"; then
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(avahi-client, avahi_client_new)
+ AC_CHECK_LIB(avahi-common, avahi_strerror)
+ LIBS="$save_LIBS"
+
+ if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes" -o \
+ test x"$ac_cv_lib_ext_avahi_common_avahi_strerror" != x"yes" ; then
have_avahi_support=no
fi
if test x"$have_avahi_support" = x"yes"; then
+ AC_SUBST(AVAHI_LIBS, "-lavahi-client -lavahi-common")
AC_DEFINE(WITH_AVAHI_SUPPORT, 1,
[Whether to enable avahi support])
AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o")
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9cae327..b20a8ef 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -659,6 +659,8 @@ struct smb_request {
* state information for async smb handling
*/
void *async_priv;
+
+ bool done;
};
/* Defines for the sent_oplock_break field above. */
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index f86b711..8c2b26d 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -1409,7 +1409,7 @@ int smbldap_search_paged(struct smbldap_state *ldap_state,
goto done;
}
- DEBUG(3,("smbldap_search_paged: search was successfull\n"));
+ DEBUG(3,("smbldap_search_paged: search was successful\n"));
rc = ldap_parse_result(ldap_state->ldap_struct, *res, NULL, NULL,
NULL, NULL, &rcontrols, 0);
diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
index 1f5dd31..b22d15f 100644
--- a/source3/lib/system_smbd.c
+++ b/source3/lib/system_smbd.c
@@ -153,7 +153,7 @@ bool getgroups_unix_user(TALLOC_CTX *mem_ctx, const char *user,
gid_t *groups;
int i;
- max_grp = MIN(32, groups_max());
+ max_grp = MIN(128, groups_max());
temp_groups = SMB_MALLOC_ARRAY(gid_t, max_grp);
if (! temp_groups) {
return False;
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 3f7c964..43ea8b5 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1413,24 +1413,39 @@ bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
int open_udp_socket(const char *host, int port)
{
- int type = SOCK_DGRAM;
- struct sockaddr_in sock_out;
+ struct sockaddr_storage ss;
int res;
- struct in_addr addr;
- addr = interpret_addr2(host);
+ if (!interpret_string_addr(&ss, host, 0)) {
+ DEBUG(10,("open_udp_socket: can't resolve name %s\n",
+ host));
+ return -1;
+ }
- res = socket(PF_INET, type, 0);
+ res = socket(ss.ss_family, SOCK_DGRAM, 0);
if (res == -1) {
return -1;
}
- memset((char *)&sock_out,'\0',sizeof(sock_out));
- putip((char *)&sock_out.sin_addr,(char *)&addr);
- sock_out.sin_port = htons(port);
- sock_out.sin_family = PF_INET;
+#if defined(HAVE_IPV6)
+ if (ss.ss_family == AF_INET6) {
+ struct sockaddr_in6 *psa6;
+ psa6 = (struct sockaddr_in6 *)&ss;
+ psa6->sin6_port = htons(port);
+ if (psa6->sin6_scope_id == 0
+ && IN6_IS_ADDR_LINKLOCAL(&psa6->sin6_addr)) {
+ setup_linklocal_scope_id(
+ (struct sockaddr *)&ss);
+ }
+ }
+#endif
+ if (ss.ss_family == AF_INET) {
+ struct sockaddr_in *psa;
+ psa = (struct sockaddr_in *)&ss;
+ psa->sin_port = htons(port);
+ }
- if (sys_connect(res,(struct sockaddr *)&sock_out)) {
+ if (sys_connect(res,(struct sockaddr *)&ss)) {
close(res);
return -1;
}
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index d66e35c..ae087d9 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -151,14 +151,19 @@ static int recv_cldap_netlogon(TALLOC_CTX *mem_ctx,
}
if (ret == 0) {
- DEBUG(1,("no reply received to cldap netlogon\n"));
+ DEBUG(1,("no reply received to cldap netlogon "
+ "(select timeout %u sec)\n",
+ (unsigned int)timeout.tv_sec));
data_blob_free(&blob);
return -1;
}
ret = read(sock, blob.data, blob.length);
if (ret <= 0) {
- DEBUG(1,("no reply received to cldap netlogon\n"));
+ DEBUG(1,("no reply received to cldap netlogon "
+ "(ret = %d: Error = %s)\n",
+ ret,
+ ret == -1 ? strerror(errno) : "" ));
data_blob_free(&blob);
return -1;
}
@@ -251,8 +256,10 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
sock = open_udp_socket(server, LDAP_PORT );
if (sock == -1) {
- DEBUG(2,("ads_cldap_netlogon: Failed to open udp socket to %s\n",
- server));
+ DEBUG(2,("ads_cldap_netlogon: Failed to open udp socket to %s. "
+ "Error %s\n",
+ server,
+ strerror(errno) ));
return False;
}
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index f09e9c6..f85f2df 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -651,22 +651,28 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
{
smbc_bool use_kerberos = false;
const char *signing_state = "off";
- struct user_auth_info *auth_info = user_auth_info_init(NULL);
+ struct user_auth_info *auth_info = NULL;
- if (auth_info) {
+ if (! context) {
+
+ return;
+ }
+
+ if (! workgroup || ! *workgroup) {
+ workgroup = smbc_getWorkgroup(context);
}
- if (! context ||
- ! workgroup || ! *workgroup ||
- ! user || ! *user ||
- ! password || ! *password) {
+ if (! user) {
+ user = smbc_getUser(context);
+ }
- return;
+ if (! password) {
+ password = "";
}
auth_info = user_auth_info_init(NULL);
- if (auth_info) {
+ if (! auth_info) {
DEBUG(0, ("smbc_set_credentials_with_fallback: allocation fail\n"));
return;
}
diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po
new file mode 100644
index 0000000..1cd622b
--- /dev/null
+++ b/source3/locale/pam_winbind/ar.po
@@ -0,0 +1,153 @@
+# This file is distributed under the same license as the package.
+#
+# Copyright (C) 2009 Lars Mueller <lars at samba.org>
+msgid ""
+msgstr ""
+"Project-Id-Version: pam_winbind\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"PO-Revision-Date: 2009-02-06 08:04\n"
+"Last-Translator: Novell Language <language at novell.com>\n"
+"Language-Team: Novell Language <language at novell.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
--
Samba Shared Repository
More information about the samba-cvs
mailing list