The branch, v4-0-test has been updated
via 78f4e66 vfs: Fix compilation of solaris ACL module
via adc62f7 wafsamba: use additional xml catalog file (bug #9512)
via 7610b4f ntlm_auth(1): fix format and make examples visible (bug
#9569)
from 097690e Fix bug 9550 - sigprocmask does not work on FreeBSD to stop
further signals in a signal handler
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 78f4e66e3064f75bec5e2c358acdc32fd09f80d4
Author: Andrew Bartlett <[email protected]>
Date: Sat Jan 5 14:53:13 2013 +1100
vfs: Fix compilation of solaris ACL module
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <[email protected]>
(cherry picked from commit 26bae894f2ae898c51535dda14060ecf4786c6ec)
Fix bug #9564 - error too few arguments in function
`solarisacl_sys_acl_get_file`.
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Fri Jan 18 11:25:36 CET 2013 on sn-devel-104
commit adc62f753b3f183580c3eed8cdd8801d7d8e26a2
Author: Björn Baumbach <[email protected]>
Date: Thu Dec 20 10:01:43 2012 +0100
wafsamba: use additional xml catalog file (bug #9512)
Add additional "/usr/local/share/xml/catalog" catalog file
platforms (used by freebsd).
Fix manual page build on freebsd.
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
(cherry picked from commit d61d2af3727a19cc4ddc88ec2faa8aafff9c7422)
commit 7610b4fd561300240818c053842ae98412b9ecc4
Author: Björn Baumbach <[email protected]>
Date: Tue Dec 4 10:54:05 2012 +0100
ntlm_auth(1): fix format and make examples visible (bug #9569)
"<example>" is no child of "<para>". So these examples were not visible.
Using a varlist instead may be not the best way but it does look nice.
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
(cherry picked from commit cabc89a1e72fc95300d4b6f8d480a7d666221b8b)
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 3 +-
docs-xml/manpages/ntlm_auth.1.xml | 195 ++++++++++++++++++++----------------
source3/modules/vfs_solarisacl.c | 2 +-
3 files changed, 111 insertions(+), 89 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 9409669..c49f7aa 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -790,7 +790,8 @@ def SAMBAMANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() +
'/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' +
bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog
file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() +
'/bin/default/docs-xml/build/catalog.xml'
+
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
diff --git a/docs-xml/manpages/ntlm_auth.1.xml
b/docs-xml/manpages/ntlm_auth.1.xml
index 8bd77bd..619e713 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -160,111 +160,132 @@
external program to the helper are:</para>
<variablelist>
<varlistentry>
- <term>Username</term>
-
- <listitem><para>The username, expected to be in
- Samba's <smbconfoption name="unix charset"/>.
- </para>
-
- <para><example>Username: bob</example></para>
- <para><example>Username:: Ym9i</example></para>
- </listitem></varlistentry>
+ <term>Username</term>
+ <listitem><para>The username, expected to be in
+ Samba's <smbconfoption name="unix charset"/>.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Username: bob</para>
+ <para>Username:: Ym9i</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>NT-Domain</term>
- <listitem><para>The user's domain, expected to be in
- Samba's <smbconfoption name="unix charset"/>.
- </para>
-
- <para><example>NT-Domain: WORKGROUP</example></para>
- <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
- </listitem></varlistentry>
+ <term>NT-Domain</term>
+ <listitem><para>The user's domain, expected to be in
+ Samba's <smbconfoption name="unix charset"/>.
+ </para>
+
+ <varlistentry>
+ <term>Examples:</term>
+ <para>NT-Domain: WORKGROUP</para>
+ <para>NT-Domain:: V09SS0dST1VQ</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Full-Username</term>
- <listitem><para>The fully qualified username, expected to be in
- Samba's <smbconfoption name="unix charset"/> and qualified
with the
- <smbconfoption name="winbind separator"/>.
- </para>
-
- <para><example>Full-Username:
WORKGROUP\bob</example></para>
- <para><example>Full-Username::
V09SS0dST1VQYm9i</example></para>
- </listitem></varlistentry>
+ <term>Full-Username</term>
+ <listitem><para>The fully qualified username, expected to be
+ in Samba's <smbconfoption name="unix charset"/> and
qualified
+ with the <smbconfoption name="winbind separator"/>.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Full-Username: WORKGROUP\bob</para>
+ <para>Full-Username:: V09SS0dST1VQYm9i</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>LANMAN-Challenge</term>
-
- <listitem><para>The 8 byte <command>LANMAN Challenge</command>
value,
- generated randomly by the server, or (in cases such as
- MSCHAPv2) generated in some way by both the server and
- the client.
- </para>
- <para><example>LANMAN-Challenge:
0102030405060708</example></para>
- </listitem></varlistentry>
+ <term>LANMAN-Challenge</term>
+ <listitem><para>The 8 byte <command>LANMAN
Challenge</command>
+ value, generated randomly by the server, or (in cases such
+ as MSCHAPv2) generated in some way by both the server and
+ the client.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>LANMAN-Challenge: 0102030405060708</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>LANMAN-Response</term>
-
- <listitem><para>The 24 byte <command>LANMAN Response</command>
value,
- calculated from the user's password and the supplied
- <command>LANMAN Challenge</command>. Typically, this
- is provided over the network by a client wishing to
authenticate.
- </para>
- <para><example>LANMAN-Response:
0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
-
- </listitem></varlistentry>
+ <term>LANMAN-Response</term>
+ <listitem><para>The 24 byte <command>LANMAN
Response</command> value,
+ calculated from the user's password and the supplied
+ <command>LANMAN Challenge</command>. Typically, this
+ is provided over the network by a client wishing to
authenticate.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>LANMAN-Response:
0102030405060708090A0B0C0D0E0F101112131415161718</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>NT-Response</term>
- <listitem><para>The >= 24 byte <command>NT Response</command>
- calculated from the user's password and the supplied
- <command>LANMAN Challenge</command>. Typically, this is
- provided over the network by a client wishing to authenticate.
- </para>
- <para><example>NT-Response:
0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
-
- </listitem></varlistentry>
+ <term>NT-Response</term>
+ <listitem><para>The >= 24 byte <command>NT
Response</command>
+ calculated from the user's password and the supplied
+ <command>LANMAN Challenge</command>. Typically, this is
+ provided over the network by a client wishing to
authenticate.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>NT-Response:
0102030405060708090A0B0C0D0E0F10111213141516171</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Password</term>
- <listitem><para>The user's password. This would be
- provided by a network client, if the helper is being
- used in a legacy situation that exposes plaintext
- passwords in this way.
- </para>
- <para><example>Password: samba2</example></para>
- <para><example>Password:: c2FtYmEy</example></para>
-
- </listitem></varlistentry>
+ <term>Password</term>
+ <listitem><para>The user's password. This would be
+ provided by a network client, if the helper is being
+ used in a legacy situation that exposes plaintext
+ passwords in this way.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Password: samba2</para>
+ <para>Password:: c2FtYmEy</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Request-User-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
- the user session key associated with the login.
- </para>
- <para><example>Request-User-Session-Key:
Yes</example></para>
-
- </listitem></varlistentry>
+ <term>Request-User-Session-Key</term>
+ <listitem><para>Upon successful authenticaiton, return
+ the user session key associated with the login.</para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Request-User-Session-Key: Yes</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Request-LanMan-Session-Key</term>
- <listitem><para>Upon successful authenticaiton, return
- the LANMAN session key associated with the login.
- </para>
- <para><example>Request-LanMan-Session-Key:
Yes</example></para>
-
- </listitem></varlistentry>
-
- <para><warning>Implementers should take care to base64 encode
- any data (such as usernames/passwords) that may contain
malicous user data, such as
- a newline. They may also need to decode strings from
- the helper, which likewise may have been base64
encoded.</warning></para>
- </variablelist>
-
+ <term>Request-LanMan-Session-Key</term>
+ <listitem><para>Upon successful authenticaiton, return
+ the LANMAN session key associated with the login.
+ </para>
+ <varlistentry>
+ <term>Examples:</term>
+ <para>Request-LanMan-Session-Key: Yes</para>
+ </varlistentry>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
</listitem>
</varlistentry>
- </variablelist>
- </listitem>
+ </variablelist>
+ <warning><para>Implementers should take care to base64 encode
+ any data (such as usernames/passwords) that may contain
malicous user data, such as
+ a newline. They may also need to decode strings from
+ the helper, which likewise may have been base64
encoded.</para></warning>
+ </listitem>
</varlistentry>
<varlistentry>
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 954ea3e..0c9d919 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -300,7 +300,7 @@ int solarisacl_sys_acl_delete_def_file(vfs_handle_struct
*handle,
DEBUG(10, ("entering solarisacl_sys_acl_delete_def_file.\n"));
smb_acl = solarisacl_sys_acl_get_file(handle, path,
- SMB_ACL_TYPE_ACCESS);
+ SMB_ACL_TYPE_ACCESS,
talloc_tos());
if (smb_acl == NULL) {
DEBUG(10, ("getting file acl failed!\n"));
goto done;
--
Samba Shared Repository
