[SCM] Samba Shared Repository - branch v3-6-stable updated
Karolin Seeger
kseeger at samba.org
Mon Mar 18 02:04:45 MDT 2013
The branch, v3-6-stable has been updated
via ff88ab8 vfs_catia: new version of the manual page for samba-3.6.x
via 5e7156e vfs_catia: add my copyright
via b3ad60f vfs_catia: fix the translation to "vfs_translate_to_windows"
via 92e0747 vfs_catia: add debug class for that module
via 14aa8eb selftest: Skip tests failing on ext4 fs.
via f77eb04 Fix bug #9637 - Renaming directories as guest user in security share mode doesn't work.
via 22cc459 winbind: Don't leak centry memory. Reviewed-by: Alexander Bokovoy <ab at samba.org>
via be9ece1 winbind: Don't leak memory on return. Reviewed-by: Alexander Bokovoy <ab at samba.org> (cherry picked from commit 30d7a3ad920456fee2a589b501ba835d13de6c29)
via b78f6d7 Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain.
via d5793f9 pdb: Fix array overrun by one. Reviewed-by: Alexander Bokovoy <ab at samba.org>
via b1b416d build/autoconf: put ld check variable in quotes
via fa746bb build/autoconf: fix check for GNU ld version
via d451456 smbd: fix initial large PAC sess setup response
via ba4378b Fix bug 9519 - Samba returns unexpected error on SMB posix open.
via d7b8f69 s3: Make SMB2_GETINFO multi-volume aware.
via f034f96 Fix bug 9633: recursive mget should continue on EPERM
via fc282a3 s3:auth: wbcAuthenticateEx gives unix times (bug #9625)
via b079b47 Fix bug #9585 - Samba 3.6.x not correctly signing any but the last response in a compound request/response
via f95c454 Fix bug #9586 - smbd[29175]: disk_free: sys_popen() failed" message logged in /var/log/message many times.
via a0cf356 Fix bug #9571 - Unlink after open causes smbd to panic.
via 1493607 Fix bug #9588 - ACLs are not inherited to directories for DFS shares.
via 7df430f Fix bug #9587 - archive flag is always set on directories.
via a63b0ea BUG 9474: Downgrade v4 printer driver requests to v3.
via 693bd76 spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.
via d217a8f BUG 9378: Add extra attributes for AD printer publishing.
via 85d2ed0 printing: Remove invalid free from error path.
via 5577999 BUG 9574: Fix a possible null pointer dereference in spoolss.
via 86f3f49 s3-rpc_server: Fix a possible null pointer dereference.
via 1adaecb samr: Make use of posix_openpt
via 4c51dfe samr: Split up an assignment from an if condition (cherry picked from commit 00184412950adde1a3db0a16822d771d0868dfc3)
via 6363e28 docs-xml: add dbwrap_tool.1 manual page (fix bug #9568)
from 07eb335 WHATSNEW: Start release notes for Samba 3.6.13.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit ff88ab897bda0a98f36ea0564e49678e5d1875a6
Author: Guenter Kukkukk <kukks at samba.org>
Date: Sat Mar 9 04:45:15 2013 +0100
vfs_catia: new version of the manual page for samba-3.6.x
well, i was not aware of the change
./docs-xml/manpages-3/
./docs-xml/manpages/
in samba-4.0.x
Signed-off-by: Guenter Kukkukk <kukks at samba.org>
The last 4 patches address bug #9701 - vfs_catia is not working anymore (due to
a former regression).
(cherry picked from commit 17113c33a77a257560f33dbb35286ae20250a8f5)
commit 5e7156e646c378bda3491599196b398bbf879cf8
Author: Guenter Kukkukk <kukks at samba.org>
Date: Fri Mar 1 00:58:05 2013 +0100
vfs_catia: add my copyright
Signed-off-by: Guenter Kukkukk <kukks at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ddb98cae501020e2fc02523b4083d16dc44d8908)
commit b3ad60fd5fc9df04bf9709ba4f4e4c551f66fed0
Author: Guenter Kukkukk <kukks at samba.org>
Date: Wed Feb 27 05:50:52 2013 +0100
vfs_catia: fix the translation to "vfs_translate_to_windows"
THANKS to an IRC user (Raimund ?) who asked for a char mapping possibility.
I suggested vfs_catia - but it did not work!
Hopefully now it will. :-)
Signed-off-by: Guenter Kukkukk <kukks at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ad8fe6215f68d2aaf143b44888b75498cfd03e6d)
commit 92e0747cf90ba1dc44edcce0dda7a3ec87d3a437
Author: Guenter Kukkukk <kukks at samba.org>
Date: Wed Feb 27 05:34:05 2013 +0100
vfs_catia: add debug class for that module
Signed-off-by: Guenter Kukkukk <kukks at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 58ac0d30aba4a0c0aab2a358b42e17d8c0e896ca)
commit 14aa8ebaf157edc2fdc6c2bbe83d352421cc9455
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Mar 6 12:11:53 2013 +0100
selftest: Skip tests failing on ext4 fs.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 797c7ff362fad007b0bb1d24f5b10a77c77af5fb)
commit f77eb04fc752b546f8ed11316af14e0085585867
Author: Jeremy Allison <jra at samba.org>
Date: Tue Mar 5 16:23:06 2013 -0800
Fix bug #9637 - Renaming directories as guest user in security share mode doesn't work.
Ensure guest is treated consistently when creating a auth_serversupplied_info struct.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 9d4d9b99740f3500e682a4067a1b5e566845ea27)
commit 22cc4599f1a5ab1092383275b03fc389cc3dfb83
Author: Andreas Schneider <asn at samba.org>
Date: Wed Feb 20 09:51:43 2013 +0100
winbind: Don't leak centry memory. Reviewed-by: Alexander Bokovoy <ab at samba.org>
The last two patches address bug #9684 - Fix two resource leaks in winbindd.
(cherry picked from commit eb657c324f83e94d46f80b9c1b97fa0228c3a47a)
commit be9ece1d56012f791663554adfd7c04b7d274595
Author: Andreas Schneider <asn at samba.org>
Date: Wed Feb 20 09:41:55 2013 +0100
winbind: Don't leak memory on return. Reviewed-by: Alexander Bokovoy <ab at samba.org>
(cherry picked from commit 30d7a3ad920456fee2a589b501ba835d13de6c29)
commit b78f6d79704baeb6c11a5b6fd650fa9a4a3e049a
Author: Daniel Kobras <d.kobras at science-computing.de>
Date: Fri Feb 22 16:24:26 2013 -0800
Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain.
s3: never try to map global SAM name
Do not treat the global SAM name as a BOGUS domain, and exempt
local users from mapping, instead. This change reinstates the
exact mapping behaviour of Samba 3.2 if parameter 'map untrusted
to domain' is set.
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 180ef28a4874026740e3b5381fe4d25fb70167bf)
commit d5793f91d0cdc39b62242ecf1a3a726ec60040af
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 19 09:23:53 2013 +0100
pdb: Fix array overrun by one. Reviewed-by: Alexander Bokovoy <ab at samba.org>
Signed-off-by: Andreas Schneider <asn at samba.org>
Fix bug #9686 - Fix a possible buffer overrun in pdb_smbpasswd.
(cherry picked from commit b174e1b496659c9e7a0fc70ad49ed0fc5906d252)
commit b1b416d8b43c01bedca55a485c761ee42d003152
Author: Björn Jacke <bj at sernet.de>
Date: Wed Feb 20 17:06:49 2013 +0100
build/autoconf: put ld check variable in quotes
Signed-off-by: Bjoern Jacke <bj at sernet.de>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ac9620b942d6d51a1c35c4177c3f241351fc1ebd)
The last 2 patches address bug #7825 (need to fix GNU ld version detection with
old gcc releases).
(cherry picked from commit b76501dbf14bcba0eba7b5420b191caf237f0b35)
commit fa746bb284f7817bf9debb91273c52f1d570b25c
Author: Björn Jacke <bj at sernet.de>
Date: Tue Feb 19 15:30:34 2013 +0100
build/autoconf: fix check for GNU ld version
we need to look for the version once in the stdout and once in the stderr
output. Some version of ld output to stdout, some output to stderr. redirecting
stderr to stdout messes the output up in our case, that's why we have to do two
runs. See also bug #7825.
Signed-off-by: Bjoern Jacke <bj at sernet.de>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Björn Jacke <bj at sernet.de>
Autobuild-Date(master): Tue Feb 19 20:56:12 CET 2013 on sn-devel-104
(cherry picked from commit ff8ba0628f6f13a5be1df94e5ac2e83008b7c69c)
(cherry picked from commit 1f1feddc6f414a91859b0dae77b34953b479d47e)
commit d451456892c3cc164c2481885e788f4588a43e2c
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Feb 12 11:58:06 2013 +0100
smbd: fix initial large PAC sess setup response
An oversize Kerberos security token may be split across multiple Session
Setup AndX requests when authenticating as a user who is a member of
many (~2000) groups.
In such a case the NativeOS, NativeLanMan & PrimaryDomain fields must be
sent with the NT_STATUS_MORE_PROCESSING_REQUIRED response. Otherwise
Windows clients may resend the same security token data in subsequent
session setup andX requests, as observed with Windows 7 and Server 2012.
This change fixes the SMB1 server only.
Fix bug #9658 - Session Setup AndX exchange fails with an oversize security
token.
(cherry picked from commit e28ec902a207655acab665c4cfabb1f2031fb24f)
commit ba4378b6aa126f58d57a0ad758c3799bae079b9d
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 12 10:48:09 2013 -0800
Fix bug 9519 - Samba returns unexpected error on SMB posix open.
Explicitly ignore bare O_EXCL flags instead of returning INVALID_PARAMETER.
That's what the Linux kernel does.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit d21280f983249038bf7efda4edc1b1eadaff546a)
commit d7b8f69cf2ec912e9675f98ef11c98c6a7ce465a
Author: Ira Cooper <ira at samba.org>
Date: Fri Feb 8 14:47:57 2013 -0800
s3: Make SMB2_GETINFO multi-volume aware.
Not all shares are a single volume. Some actually
expose multiple volumes under a single share. In these
cases showing the amount of space free as the space free
at the base of the directory heirarchy is wrong.
Reviewed-by: Jeremy Allison <jra at samba.org>
Fix bug #9646 - dir and similar commands are returning the wrong amount of free
space.
(cherry picked from commit 872a7d61ca769c47890244a1005c1bd445a3bab6)
commit f034f96e11d0bf66c7756af81ec21f68732fe442
Author: David Disseldorp <ddiss at samba.org>
Date: Mon Feb 4 19:04:39 2013 +0100
Fix bug 9633: recursive mget should continue on EPERM
Regression introduced by 14ff2e8de9bd8d0064762234555260f5eea643fe.
When downloading files recursively, smbclient halts if it encounters
a folder to which it does not have permission to traverse.
(cherry picked from commit e5b4ac7978213acf7517b6852f7750e41cad787a)
commit fc282a3850c6e23cc4f99746bb8dd484e5aed52f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 31 13:39:42 2013 +0100
s3:auth: wbcAuthenticateEx gives unix times (bug #9625)
We also need to convert last_logon, last_logoff and acct_expiry
from unix time to nt time.
Otherwise a windows member server will reject clients
using CAP_DYNAMIC_REAUTH or smb2) with STATUS_NETWORK_SESSION_EXPIRED,
if the logoff and kickoff time is expired.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 292504a759caf811fb6201e273ffeab20522a991)
commit b079b471a3e454058e65b7ca1d0f17a3e769c538
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jan 28 16:01:27 2013 -0800
Fix bug #9585 - Samba 3.6.x not correctly signing any but the last response in a compound request/response
Add in the missing code we already have in master
and 4.0.x.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 022e1d889cbb752fc4f339dd537486bf3a52e34e)
commit f95c454e6a7b5a39356bb91be498bc1ce8f07186
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 14:39:09 2013 -0800
Fix bug #9586 - smbd[29175]: disk_free: sys_popen() failed" message logged in /var/log/message many times.
Ensure when reading lines from an interruptible
pipe source we ignore EINTR.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Thu Jan 24 10:45:48 CET 2013 on sn-devel-104
(cherry picked from commit 497febfe36354c4aff3696cd32c6c7e8fee55af8)
(cherry picked from commit 035be05db96b0544434febc33349adb910dba78e)
commit a0cf356cb545f92cc8b7935734dfb54f853e97f8
Author: Pavel Shilovsky <piastry at etersoft.ru>
Date: Wed Jan 16 15:02:26 2013 +0400
Fix bug #9571 - Unlink after open causes smbd to panic.
s3:smbd: fix wrong lock order in posix unlink
Signed-off-by: Pavel Shilovsky <piastry at etersoft.ru>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit fb0868e290cdc23671a84b7600af689a8b8b806f)
commit 14936071f81ec6b5238f92d7a413abc429f615df
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 25 10:21:48 2013 -0800
Fix bug #9588 - ACLs are not inherited to directories for DFS shares.
We can return with NT_STATUS_OK in an error code path. This
has a really strange effect in that it prevents the ACL editor
in Windows XP from recursively changing ACE entries on sub-directories
after a change in a DFS-root share (we end up returning a path
that looks like: \\IPV4\share1\xptest/testdir with a mixture
of Windows and POSIX pathname separators).
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 99d2cb211f04e907bf2ed19656843026207ae0e3)
commit 7df430f06690d0e30083a18a9c7bf7ace3b6953c
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 11:02:30 2013 -0800
Fix bug #9587 - archive flag is always set on directories.
Creating a directory to a Samba share sets the attributes to 'D' only
(correct) - only when creating a new file should the 'A' attribute
be set.
However, doing a rename of that directory sets the 'A' attribute in error.
This should only be done on a file rename. smbclient regression test to follow.
Signed-off-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 6603013f8f03773d141c33fd1c4923197a5350c8)
commit a63b0eaed7bfb59d1fe6082a2edc4eb31cbca3d7
Author: Günther Deschner <gd at samba.org>
Date: Fri Jan 18 00:22:31 2013 +0100
BUG 9474: Downgrade v4 printer driver requests to v3.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Jan 21 16:11:02 CET 2013 on sn-devel-104
(cherry picked from commit 58fadf2f48a2a409b4ee98fdc0166c7f801a7629)
(cherry picked from commit ae0cf58a75874541c4c9b8b29a2b1fc45928be69)
commit 693bd76ccf36c889f125e41ed21d4723fdc01e94
Author: Günther Deschner <gd at samba.org>
Date: Mon Jan 7 15:14:30 2013 +0100
spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 638ed90620e3c6a35ef56a11c612c13d6b7d6ff5)
(cherry picked from commit 93a1d4ee4685305e0060e9d5c8028c96ff83257d)
commit d217a8fe1d65aa3b5b97ebc64b7cfde927b767ac
Author: David Disseldorp <ddiss at samba.org>
Date: Thu Jan 17 13:21:25 2013 +0100
BUG 9378: Add extra attributes for AD printer publishing.
Currently attempting to publish a printer in AD fails with "Object class
violation", due to a number of missing attributes in the LDAP request.
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 069f1029a76c9b9c0a48ac7cb3d2c5f45c3a231c)
commit 85d2ed00e896c3b71e2361d3887e7e9a107a2dae
Author: David Disseldorp <ddiss at samba.org>
Date: Fri Jan 18 11:48:20 2013 +0100
printing: Remove invalid free from error path.
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 31d61ad8f9c850c302c83a65af8474545723ea1c)
commit 5577999a00a0b8409f4d5e2d70b73d8bb57e2b4c
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jan 18 18:04:17 2013 +0100
BUG 9574: Fix a possible null pointer dereference in spoolss.
If the the client enumerates the printers and didn't specify a
servername we have a null pointer dereference, so the process serving
the connection crashes.
Reviewed-by: David Disseldorp <ddiss at samba.org>
Autobuild-User(master): David Disseldorp <ddiss at samba.org>
Autobuild-Date(master): Mon Jan 21 13:30:11 CET 2013 on sn-devel-104
(cherry picked from commit c38fb0b106b62e42a5b75b1c78386bb8912c7d7e)
(cherry picked from commit a2d68842ea33733fa7900831ed10e73f820afcf7)
commit 86f3f49c6013144854bd9bf95b755e985c06462c
Author: Andreas Schneider <asn at samba.org>
Date: Mon Dec 17 15:31:21 2012 +0100
s3-rpc_server: Fix a possible null pointer dereference.
This variable can be set to NULL in an earlier function call.
Found by Coverity.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 72e02c73b64f1ff56b2d53ec63d68486a4f1ff90)
(cherry picked from commit 43810c80936c8f509cc2adba6193dd4c55325875)
commit 1adaecbcd31100c7da666ea10827a886bfafbcf5
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 11 10:36:04 2013 +0100
samr: Make use of posix_openpt
The last 2 patches address bug #9541 - Add support for posix_openpt.
(cherry picked from commit cd9c1a0a3abf0b44afd1054cca9c1da1cace1e52)
commit 4c51dfe6b1019c0c9522f518058f487b5db64448
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 11 10:31:42 2013 +0100
samr: Split up an assignment from an if condition
(cherry picked from commit 00184412950adde1a3db0a16822d771d0868dfc3)
commit 6363e282f519f2339e531dc5ab044d5ab8252908
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 15 17:17:29 2012 +0200
docs-xml: add dbwrap_tool.1 manual page (fix bug #9568)
Based on commit 8d6104f02d9ab879efe7867fec53cbe5cc408ded.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 329ba78272a03e2011743f4fd47b6094b271d573)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/dbwrap_tool.1.xml | 148 ++++++++++++++++++++++++++
docs-xml/manpages-3/vfs_catia.8.xml | 66 +++++++++++-
librpc/idl/spoolss.idl | 3 +-
source3/auth/auth_util.c | 9 ++-
source3/auth/server_info.c | 6 +-
source3/client/client.c | 13 ++-
source3/configure.in | 8 +-
source3/lib/util_file.c | 2 +-
source3/modules/vfs_catia.c | 35 +++++-
source3/passdb/pdb_smbpasswd.c | 7 +-
source3/printing/nt_printing_ads.c | 87 +++++++++++++++-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 7 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 15 ++-
source3/selftest/skip | 1 +
source3/smbd/globals.h | 1 +
source3/smbd/msdfs.c | 13 +++
source3/smbd/reply.c | 3 +-
source3/smbd/sesssetup.c | 14 +++-
source3/smbd/smb2_getinfo.c | 1 +
source3/smbd/smb2_server.c | 19 ++++
source3/smbd/trans2.c | 44 +++++---
source3/winbindd/winbindd_cache.c | 1 +
source3/winbindd/winbindd_cm.c | 3 +
source3/wscript | 2 +-
24 files changed, 464 insertions(+), 44 deletions(-)
create mode 100644 docs-xml/manpages-3/dbwrap_tool.1.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/dbwrap_tool.1.xml b/docs-xml/manpages-3/dbwrap_tool.1.xml
new file mode 100644
index 0000000..2a20701
--- /dev/null
+++ b/docs-xml/manpages-3/dbwrap_tool.1.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="dbwrap_tool.1">
+
+<refmeta>
+ <refentrytitle>dbwrap_tool</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.6</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>dbwrap_tool</refname>
+ <refpurpose>low level TDB/CTDB manipulation tool using the dbwrap interface</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command>
+ <arg choice="req"><database></arg>
+ <arg choice="req"><operation></arg>
+ <arg choice="opt"><key>
+ <arg choice="opt"><type>
+ <arg choice="opt"><value></arg>
+ </arg>
+ </arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The dbwrap_tool program is used to read and manipulate
+ TDB/CTDB databases using the dbwrap interface.</para>
+
+ <para>The following database operations are available:
+ <itemizedlist>
+ <listitem><para>fetch: fetch a record</para></listitem>
+ <listitem><para>store: create or modify a record</para></listitem>
+ <listitem><para>delete: remove a record</para></listitem>
+ <listitem><para>erase: remove all records</para></listitem>
+ <listitem><para>listkeys: list all available records</para></listitem>
+ </itemizedlist>
+ </para>
+ <para>The following types are available:
+ <itemizedlist>
+ <listitem><para>int32: signed 32bit integer</para></listitem>
+ <listitem><para>uint32: unsigned 32bit integer</para></listitem>
+ <listitem><para>string: "hello world"</para></listitem>
+ </itemizedlist>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <para>None.</para>
+</refsect1>
+
+<refsect1>
+ <title>COMMANDS</title>
+ <refsect2>
+ <title>fetch</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> fetch <key> <type>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>store</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> store <key> <type> <value>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>delete</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> delete <key>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>erase</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> erase
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listkeys</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listkeys
+ </cmdsynopsis>
+ </refsect2>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+ <variablelist>
+ <varlistentry><term>List all keys from winbindd_idmap.tdb</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb listkeys</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Remove record with key "USER HWM"</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb remove "USER HWM"</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>NOTES</title>
+
+ <para>Use with caution!</para>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry></para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The dbwrap_tool manpage was written by Bjoern Baumbach.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages-3/vfs_catia.8.xml b/docs-xml/manpages-3/vfs_catia.8.xml
index f1368a0..a786ecd 100644
--- a/docs-xml/manpages-3/vfs_catia.8.xml
+++ b/docs-xml/manpages-3/vfs_catia.8.xml
@@ -31,18 +31,31 @@
<para>The Catia CAD package commonly creates filenames that
use characters that are illegal in CIFS filenames. The
- <command>vfs_catia</command> VFS module implements a fixed character
+ <command>vfs_catia</command> VFS module implements a character
mapping so that these files can be shared with CIFS clients.
</para>
<para>This module is stackable.</para>
+ <para>Up to samba version 3.4.x a fixed character mapping was used.
+ The invalid windows characters \ / : * ? " < > | and the blank
+ character were mapped in a hardcoded way.
+ </para>
+
+ <para>Starting with samba-3.5.0 a more flexible mapping was introduced.
+ The new parameter "catia:mappings" now specifies the mapping on a char by char
+ basis using the notation: unix hex char 0x.. : windows hex char 0x..
+ Multiple character mappings are separated by a comma.
+ </para>
+
+
</refsect1>
<refsect1>
<title>EXAMPLES</title>
+ <para>Samba versions up to 3.4.x:</para>
<para>Map Catia filenames on the [CAD] share:</para>
<programlisting>
@@ -51,12 +64,60 @@
<smbconfoption name="vfs objects">catia</smbconfoption>
</programlisting>
+ <para>Samba versions 3.5.0 and later:</para>
+ <para>Map Catia filenames on the [CAD] share:</para>
+
+<programlisting>
+ <smbconfsection name="[CAD]"/>
+ <smbconfoption name="path">/data/cad</smbconfoption>
+ <smbconfoption name="vfs objects">catia</smbconfoption>
+ <smbconfoption name="catia:mappings">0x22:0xa8</smbconfoption>
+</programlisting>
+
+ <para>To get the full formerly fixed mappings:</para>
+<programlisting>
+ <smbconfsection name="[CAD]"/>
+ <smbconfoption name="path">/data/cad</smbconfoption>
+ <smbconfoption name="vfs objects">catia</smbconfoption>
+ <smbconfoption name="catia:mappings">0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6,0x20:0xb1</smbconfoption>
+</programlisting>
+
+ <para>Unix filename to be translated (Note that the path delimiter "/" is not used here):
+ </para>
+ <para>a\a:a*a?a"a<a>a|a a</para>
+
+ <para>Resulting windows filename:</para>
+
+ <para>aÿa÷a¤a¿a¨a«a»a¦a±a
+ </para>
+
+ <para>Note that the character mapping must work in BOTH directions
+ (unix -> windows and windows -> unix) to get unique and existing file names!
+ </para>
+
+ <para>A NOT working example:</para>
+
+<programlisting>
+ <smbconfsection name="[CAD]"/>
+ <smbconfoption name="path">/data/cad</smbconfoption>
+ <smbconfoption name="vfs objects">catia</smbconfoption>
+ <smbconfoption name="catia:mappings">0x3a:0x5f</smbconfoption>
+</programlisting>
+
+ <para>Here the colon ":" is mapped to the underscore "_".</para>
+ <para>Assuming a unix filename "a:should_work", which is well translated
+ to windows as "a_should_work".</para>
+ <para>BUT the reverse mapping from windows "a_should_work" to unix
+ will result in "a:should:work" - something like "file not found"
+ will be returned.
+ </para>
+
</refsect1>
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0.25 of the Samba suite.
+ <para>This man page is correct for all versions up to 4.0.3 of the Samba suite.
</para>
</refsect1>
@@ -67,6 +128,7 @@
were created by Andrew Tridgell. Samba is now developed
by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.</para>
+ <para>New version written by Guenter Kukkukk kukks at samba.org</para>
</refsect1>
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index d888a79..4f706e2 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1303,7 +1303,8 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
SPOOLSS_DRIVER_VERSION_9X = 0,
SPOOLSS_DRIVER_VERSION_NT35 = 1,
SPOOLSS_DRIVER_VERSION_NT4 = 2,
- SPOOLSS_DRIVER_VERSION_200X = 3
+ SPOOLSS_DRIVER_VERSION_200X = 3,
+ SPOOLSS_DRIVER_VERSION_2012 = 4
} spoolss_DriverOSVersion;
typedef struct {
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 1daddcd..0e1f437 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -120,7 +120,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
* This also deals with the client passing in a "" domain */
if (!is_trusted_domain(domain) &&
- !strequal(domain, my_sam_name()))
+ !strequal(domain, my_sam_name()) &&
+ !strequal(domain, get_global_sam_name()))
{
if (lp_map_untrusted_to_domain())
domain = my_sam_name();
@@ -924,7 +925,11 @@ NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
result->nss_token = true;
result->guest = is_guest;
- status = create_local_token(result);
+ if (is_guest) {
+ status = make_server_info_guest(mem_ctx, &result);
+ } else {
+ status = create_local_token(result);
+ }
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(result);
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 2e94e46..90b3ed6 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -608,9 +608,9 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx,
info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
if (!info3) return NULL;
- info3->base.last_logon = info->logon_time;
- info3->base.last_logoff = info->logoff_time;
- info3->base.acct_expiry = info->kickoff_time;
+ unix_to_nt_time(&info3->base.last_logon, info->logon_time);
+ unix_to_nt_time(&info3->base.last_logoff, info->logoff_time);
+ unix_to_nt_time(&info3->base.acct_expiry, info->kickoff_time);
unix_to_nt_time(&info3->base.last_password_change, info->pass_last_set_time);
unix_to_nt_time(&info3->base.allow_password_change,
info->pass_can_change_time);
diff --git a/source3/client/client.c b/source3/client/client.c
index 58115ad..f6e42f6 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1307,8 +1307,17 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo,
return NT_STATUS_NO_MEMORY;
}
- status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true);
- if (!NT_STATUS_IS_OK(status)) {
+ status = do_list(mget_mask,
+ (FILE_ATTRIBUTE_SYSTEM
+ | FILE_ATTRIBUTE_HIDDEN
+ | FILE_ATTRIBUTE_DIRECTORY),
+ do_mget, false, true);
+ if (!NT_STATUS_IS_OK(status)
+ && !NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+ /*
+ * Ignore access denied errors to ensure all permitted files are
+ * pulled down.
+ */
return status;
}
diff --git a/source3/configure.in b/source3/configure.in
index 0f805ee..86da83d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -231,7 +231,11 @@ dnl Certain versions of GNU ld the default is not to have the
dnl --allow-shlib-undefined flag defined. This causes a stackload of
dnl warnings when building modules.
if test "$ac_cv_prog_gnu_ld" = "yes"; then
- ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"`
+ ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
+ # we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
+ if test -z "$ac_cv_gnu_ld_version" ; then
+ ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
+ fi
AC_MSG_CHECKING(GNU ld release date)
changequote(,)dnl
ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
@@ -1112,7 +1116,7 @@ AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetg
AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
AC_CHECK_FUNCS(getgrset)
AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
-AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
+AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
AC_CHECK_FUNCS(fallocate fallocate64)
AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 50ff844..8319f04 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -38,7 +38,7 @@ static char *file_pload(const char *syscmd, size_t *size)
p = NULL;
total = 0;
- while ((n = read(fd, buf, sizeof(buf))) > 0) {
+ while ((n = sys_read(fd, buf, sizeof(buf))) > 0) {
p = talloc_realloc(NULL, p, char, total + n + 1);
if (!p) {
DEBUG(0,("file_pload: failed to expand buffer!\n"));
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 31b9f18..c0bb5ef 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -10,6 +10,7 @@
*
* Copyright (C) Volker Lendecke, 2005
* Copyright (C) Aravind Srinivasan, 2009
+ * Copyright (C) Guenter Kukkukk, 2013
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,6 +30,11 @@
#include "includes.h"
#include "smbd/smbd.h"
+static int vfs_catia_debug_level = DBGC_VFS;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS vfs_catia_debug_level
+
#define GLOBAL_SNUM 0xFFFFFFF
#define MAP_SIZE 0xFF
#define MAP_NUM 0x101 /* max unicode charval / MAP_SIZE */
@@ -295,7 +301,7 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
{
char *name = NULL;
char *mapped_name;
- NTSTATUS ret;
+ NTSTATUS status, ret;
/*
* Copy the supplied name and free the memory for mapped_name,
@@ -308,12 +314,12 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
errno = ENOMEM;
return NT_STATUS_NO_MEMORY;
}
- ret = catia_string_replace_allocate(handle->conn, name,
+ status = catia_string_replace_allocate(handle->conn, name,
&mapped_name, direction);
TALLOC_FREE(name);
- if (!NT_STATUS_IS_OK(ret)) {
- return ret;
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
ret = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name, direction,
@@ -321,6 +327,8 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
*pmapped_name = talloc_move(mem_ctx, &mapped_name);
+ /* we need to return the former translation result here */
+ ret = status;
} else {
TALLOC_FREE(mapped_name);
}
@@ -1020,6 +1028,23 @@ static struct vfs_fn_pointers vfs_catia_fns = {
NTSTATUS vfs_catia_init(void)
{
- return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
+ NTSTATUS ret;
+
+ ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
&vfs_catia_fns);
+ if (!NT_STATUS_IS_OK(ret))
+ return ret;
+
+ vfs_catia_debug_level = debug_add_class("catia");
+ if (vfs_catia_debug_level == -1) {
+ vfs_catia_debug_level = DBGC_VFS;
+ DEBUG(0, ("vfs_catia: Couldn't register custom debugging "
+ "class!\n"));
+ } else {
+ DEBUG(10, ("vfs_catia: Debug class number of "
+ "'catia': %d\n", vfs_catia_debug_level));
+ }
+
+ return ret;
+
}
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 43d6eaf..3d1c28c 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -736,7 +736,8 @@ static bool mod_smbfilepwd_entry(struct smbpasswd_privates *smbpasswd_state, con
fstring user_name;
char *status;
- char linebuf[256];
+#define LINEBUF_SIZE 255
+ char linebuf[LINEBUF_SIZE + 1];
char readbuf[1024];
int c;
fstring ascii_p16;
@@ -791,7 +792,7 @@ static bool mod_smbfilepwd_entry(struct smbpasswd_privates *smbpasswd_state, con
linebuf[0] = '\0';
- status = fgets(linebuf, sizeof(linebuf), fp);
+ status = fgets(linebuf, LINEBUF_SIZE, fp);
if (status == NULL && ferror(fp)) {
pw_file_unlock(lockfd, &smbpasswd_state->pw_file_lock_depth);
fclose(fp);
@@ -1020,7 +1021,7 @@ This is no longer supported.!\n", pwd->smb_name));
dump_data(100, (uint8 *)ascii_p16, wr_len);
#endif
- if(wr_len > sizeof(linebuf)) {
+ if(wr_len > LINEBUF_SIZE) {
DEBUG(0, ("mod_smbfilepwd_entry: line to write (%d) is too long.\n", wr_len+1));
pw_file_unlock(lockfd,&smbpasswd_state->pw_file_lock_depth);
fclose(fp);
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 67046bc..5a0cd24 100644
--- a/source3/printing/nt_printing_ads.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list