[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0rc2-13-g8a5144d
Karolin Seeger
kseeger at samba.org
Thu Jun 12 11:57:58 GMT 2008
The branch, v3-2-stable has been updated
via 8a5144dfb59f670494a2bd34cf2cafc9c816715e (commit)
via 7f5068b59668fd8fe9d81fbd770da4439ac287cb (commit)
via a37b2d9fc6307ded3d577591d5862d646c53ba7e (commit)
via 785c10d85cf4585c12fbcec0aed17d5313ac180c (commit)
via 1322210911d173e51d00eece769c4c27b46d9e6c (commit)
via e09112315a3984c6b03f19f9712af366d4fc2d23 (commit)
via 9568c62f7618bfa87c1901b4e6f64ef0aed5875f (commit)
via 345309b1b2c8e251f9fbba7a8486975f50ea7dd1 (commit)
from 0a10b3f2048c750f64702e982a293746bcc924c5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 8a5144dfb59f670494a2bd34cf2cafc9c816715e
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jun 12 09:34:15 2008 +0200
man pages: Fix indentation in smb.conf section about 'map readonly'.
(cherry picked from commit 0f0d81a89ae2ebae7d031a3a8633c3a924ebcbae)
commit 7f5068b59668fd8fe9d81fbd770da4439ac287cb
Author: Christoph Zauner <christoph.zauner at sernet.de>
Date: Wed Jun 11 15:15:22 2008 +0200
man pages: Added improvements.
(cherry picked from commit 7fecd548af0a21b9644bd70e22a38aaa28777aa0)
commit a37b2d9fc6307ded3d577591d5862d646c53ba7e
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jun 12 09:26:32 2008 +0200
man pages: Fix typo in smb.conf section about the 'deleteprinter command'.
Karolin
(cherry picked from commit 5fa77c216bc43c3558aff3373f74554efdb9210d)
commit 785c10d85cf4585c12fbcec0aed17d5313ac180c
Author: Christoph Zauner <christoph.zauner at sernet.de>
Date: Wed Jun 11 15:17:21 2008 +0200
man pages: Fix typos.
(cherry picked from commit 881eaa26e071a7fde9c6fc5eb42ae122d0ddd490)
commit 1322210911d173e51d00eece769c4c27b46d9e6c
Author: Christoph Zauner <christoph.zauner at sernet.de>
Date: Wed Jun 11 14:49:30 2008 +0200
Samba3-HOWTO: Fix typos.
(cherry picked from commit 2391d999eb733bd8d12631478f4318608225cbb6)
commit e09112315a3984c6b03f19f9712af366d4fc2d23
Author: Christoph Zauner <christoph.zauner at sernet.de>
Date: Wed Jun 11 14:05:47 2008 +0200
Fix typos.
(cherry picked from commit b2390aa738f6384016600dffb8065bd0bcda6ef1)
commit 9568c62f7618bfa87c1901b4e6f64ef0aed5875f
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 12 12:35:28 2008 +0200
Add -brtl to the AIX linker flags
Thanks to William Jojo
(cherry picked from commit 74b195b54416d9e3eb46079a71eed31a15c7293a)
commit 345309b1b2c8e251f9fbba7a8486975f50ea7dd1
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 12 12:36:15 2008 +0200
AIX build fixes from William Jojo -- thanks
(cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml | 10 +++++-----
docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml | 9 ++++++---
docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml | 6 +++---
docs-xml/smbdotconf/base/bindinterfacesonly.xml | 6 +++---
docs-xml/smbdotconf/base/interfaces.xml | 2 +-
docs-xml/smbdotconf/filename/mapreadonly.xml | 4 ++++
docs-xml/smbdotconf/ldap/ldapsameditposix.xml | 3 +--
docs-xml/smbdotconf/printing/addprintercommand.xml | 10 ++++++----
.../smbdotconf/printing/deleteprintercommand.xml | 6 +++---
.../smbdotconf/security/checkpasswordscript.xml | 11 ++++++-----
docs-xml/smbdotconf/security/ntlmauth.xml | 2 +-
docs-xml/smbdotconf/security/passwdchat.xml | 2 +-
source/configure.in | 4 +++-
source/include/includes.h | 1 +
source/include/nt_status.h | 6 +++---
source/modules/vfs_aixacl2.c | 4 ++--
16 files changed, 49 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index 48f439d..ea68594 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -762,7 +762,7 @@ mystic:/home/hannibal > rm filename
<title>Miscellaneous Controls</title>
<para>
- The parameter documented in <link linkend="mcoc">Other Controls</link> are often used by administrators
+ The parameters documented in <link linkend="mcoc">Other Controls</link> are often used by administrators
in ways that create inadvertent barriers to file access. Such are the consequences of not understanding the
full implications of &smb.conf; file settings.
</para>
@@ -935,10 +935,10 @@ mystic:/home/hannibal > rm filename
<indexterm><primary>ACLs on share</primary></indexterm>
<indexterm><primary>Sharing</primary></indexterm>
<indexterm><primary>Permissions</primary></indexterm>
- On <application>MS Windows NT4/200x/XP</application> system, ACLs on the share itself are set using native
- tools, usually from File Manager. For example, in Windows 200x, right-click on the shared folder,
+ On <application>MS Windows NT4/200x/XP</application> systems, ACLs on the share itself are set using
+ tools like the MS Explorer. For example, in Windows 200x, right-click on the shared folder,
then select <guimenuitem>Sharing</guimenuitem>, then click on <guilabel>Permissions</guilabel>. The default
- Windows NT4/200x permission allows "Everyone" full control on the share.
+ Windows NT4/200x permissions allow the group "Everyone" full control on the share.
</para>
<para>
@@ -946,7 +946,7 @@ mystic:/home/hannibal > rm filename
<indexterm><primary>MMC</primary></indexterm>
<indexterm><primary>tool</primary></indexterm>
MS Windows 200x and later versions come with a tool called the <application>Computer Management</application>
- snap-in for the MMC. This tool is located by clicking on <guimenu>Control Panel ->
+ snap-in for the MMC. This tool can be accessed via <guimenu>Control Panel ->
Administrative Tools -> Computer Management</guimenu>.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
index 3c86438..563550e 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
@@ -1863,9 +1863,12 @@ the DMB (N1_C) with the WINS server as soon as it was started.
<indexterm><primary>NetServerEnum2</primary></indexterm>
<indexterm><primary>synchronization</primary></indexterm>
<indexterm><primary>browse lists</primary></indexterm>
-Once N2_B knows the address of the DMB, it tells it that is the LMB for subnet 2 by sending a
-<emphasis>MasterAnnouncement</emphasis> packet as a UDP port 138 packet. It then synchronizes with it by
-doing a <emphasis>NetServerEnum2</emphasis> call. This tells the DMB to send it all the server names it knows
+Once N2_B knows the address of the DMB, it tells the DMB that it is the LMB
+for subnet 2 by sending the DMB a
+<emphasis>MasterAnnouncement</emphasis> packet to UDP port 138. It then
+synchronizes with the DMB by
+doing a <emphasis>NetServerEnum2</emphasis> call. This tells the DMB to
+send the sender all the server names it knows
about. Once the DMB receives the <emphasis>MasterAnnouncement</emphasis> packet, it schedules a
synchronization request to the sender of that packet. After both synchronizations are complete, the browse
lists look like those in <link linkend="brsbex">Browse Subnet Example 2</link>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
index 8aea177..0b90c92 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
@@ -245,7 +245,7 @@ authentication contexts in this way (WinDD is an example of an application that
Windows networking user account names are case-insensitive, meaning that upper-case and lower-case characters
in the account name are considered equivalent. They are said to be case-preserving, but not case significant.
Windows and LanManager systems previous to Windows NT version 3.10 have case-insensitive passwords that were
-not necessarilty case-preserving. All Windows NT family systems treat passwords as case-preserving and
+not necessarily case-preserving. All Windows NT family systems treat passwords as case-preserving and
case-sensitive.
</para>
@@ -276,8 +276,8 @@ This is the default setting since Samba-2.2.x.
In share-level security, the client authenticates itself separately for each share. It sends a password along
with each tree connection request (share mount), but it does not explicitly send a username with this
operation. The client expects a password to be associated with each share, independent of the user. This means
-that Samba has to work out what username the client probably wants to use, the SMB server is not explicitly
-sent the username. Some commercial SMB servers such as NT actually associate passwords directly with shares
+that Samba has to work out what username the client probably wants to use,
+because the username is not explicitly sent to the SMB server. Some commercial SMB servers such as NT actually associate passwords directly with shares
in share-level security, but Samba always uses the UNIX authentication scheme where it is a username/password
pair that is authenticated, not a share/password pair.
</para>
diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index bccac4a..6e8321b 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -29,14 +29,14 @@
For file service it causes <citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> to bind only to the interface list given in the <smbconfoption
name="interfaces"/> parameter. This restricts the networks that <command moreinfo="none">smbd</command> will
- serve to packets coming in those interfaces. Note that you should not use this parameter for machines that
+ serve, to packets coming in on those interfaces. Note that you should not use this parameter for machines that
are serving PPP or other intermittent or non-broadcast network interfaces as it will not cope with
non-permanent interfaces.
</para>
<para>
- If <smbconfoption name="bind interfaces only"/> is set then unless the network address
- <emphasis>127.0.0.1</emphasis> is added to the <smbconfoption name="interfaces"/> parameter list
+ If <smbconfoption name="bind interfaces only"/> is set and the network address
+ <emphasis>127.0.0.1</emphasis> is not added to the <smbconfoption name="interfaces"/> parameter list
<citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> and
<citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> may not work as
expected due to the reasons covered below.
diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index 2b13200..8c3684f 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -6,7 +6,7 @@
<description>
<para>This option allows you to override the default
network interfaces list that Samba will use for browsing, name
- registration and other NBT traffic. By default Samba will query
+ registration and other NetBIOS over TCP/IP (NBT) traffic. By default Samba will query
the kernel for the list of all active interfaces and use any
interfaces except 127.0.0.1 that are broadcast capable.</para>
diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml
index 3ec2d3b..f9ce03e 100644
--- a/docs-xml/smbdotconf/filename/mapreadonly.xml
+++ b/docs-xml/smbdotconf/filename/mapreadonly.xml
@@ -22,6 +22,10 @@
<constant>Yes</constant> - The read only DOS attribute is mapped to the inverse of the user
or owner write bit in the unix permission mode set. If the owner write bit is not set, the
read only attribute is reported as being set on the file.
+ If the read only DOS attribute is set, Samba sets the owner, group and
+ others write bits to zero. Write bits set in an ACL are ignored by Samba.
+ If the read only DOS attribute is unset, Samba simply sets the write bit of the
+ owner to one.
</para></listitem>
<listitem><para>
diff --git a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
index ace6c6c..c04ecc9 100644
--- a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
@@ -48,8 +48,7 @@
idmap gid = 5000-50000
</programlisting>
- This configuration assume the ldap server have been loaded with a base tree like described
- in the following ldif:
+ This configuration assumes a directory layout like described in the following ldif:
<programlisting>
dn: dc=samba,dc=org
diff --git a/docs-xml/smbdotconf/printing/addprintercommand.xml b/docs-xml/smbdotconf/printing/addprintercommand.xml
index ed3c5aa..c66f43e 100644
--- a/docs-xml/smbdotconf/printing/addprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/addprintercommand.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="add printer command"
+<samba:parameter name="addprinter command"
context="G"
type="string"
advanced="1" developer="1"
@@ -12,8 +12,9 @@
NT/2000 print server.</para>
<para>For a Samba host this means that the printer must be
- physically added to the underlying printing system. The <parameter moreinfo="none">add
- printer command</parameter> defines a script to be run which
+ physically added to the underlying printing system.
+ The <parameter moreinfo="none">addprinter command</parameter>
+ defines a script to be run which
will perform the necessary operations for adding the printer
to the print system and to add the appropriate service definition
to the <filename moreinfo="none">smb.conf</filename> file in order that it can be
@@ -46,7 +47,8 @@
</command> will return an ACCESS_DENIED error to the client.</para>
<para>
- The "add printer command" program can output a single line of text,
+ The <parameter moreinfo="none">addprinter command</parameter> program
+ can output a single line of text,
which Samba will set as the port the new printer is connected to.
If this line isn't output, Samba won't reload its printer shares.
</para>
diff --git a/docs-xml/smbdotconf/printing/deleteprintercommand.xml b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
index b48ab57..597387c 100644
--- a/docs-xml/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
@@ -6,11 +6,11 @@
<description>
<para>With the introduction of MS-RPC based printer
support for Windows NT/2000 clients in Samba 2.2, it is now
- possible to delete printer at run time by issuing the
+ possible to delete a printer at run time by issuing the
DeletePrinter() RPC call.</para>
<para>For a Samba host this means that the printer must be
- physically deleted from underlying printing system. The
+ physically deleted from the underlying printing system. The
<smbconfoption name="deleteprinter command"/> defines a script to be run which
will perform the necessary operations for removing the printer
from the print system and from <filename moreinfo="none">smb.conf</filename>.
@@ -22,7 +22,7 @@
<para>Once the <smbconfoption name="deleteprinter command"/> has
been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
- smb.conf</filename> to associated printer no longer exists.
+ smb.conf</filename> to check that the associated printer no longer exists.
If the sharename is still valid, then <command moreinfo="none">smbd
</command> will return an ACCESS_DENIED error to the client.</para>
</description>
diff --git a/docs-xml/smbdotconf/security/checkpasswordscript.xml b/docs-xml/smbdotconf/security/checkpasswordscript.xml
index 9169891..152632c 100644
--- a/docs-xml/smbdotconf/security/checkpasswordscript.xml
+++ b/docs-xml/smbdotconf/security/checkpasswordscript.xml
@@ -5,14 +5,15 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The name of a program that can be used to check password
- complexity. The password is sent to the program's standrad input.</para>
+ complexity. The password is sent to the program's standard input.</para>
- <para>The program must return 0 on good password any other value otherwise.
- In case the password is considered weak (the program do not return 0) the
+ <para>The program must return 0 on a good password, or any other value
+ if the password is bad.
+ In case the password is considered weak (the program does not return 0) the
user will be notified and the password change will fail.</para>
- <para>Note: In the example directory there is a sample program called crackcheck
- that uses cracklib to checkpassword quality.</para>
+ <para>Note: In the example directory is a sample program called <command moreinfo="none">crackcheck</command>
+ that uses cracklib to check the password quality.</para>
</description>
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml b/docs-xml/smbdotconf/security/ntlmauth.xml
index ebcdad7..ec603bb 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -13,7 +13,7 @@
<para>If this option, and <command moreinfo="none">lanman
auth</command> are both disabled, then only NTLMv2 logins will be
permited. Not all clients support NTLMv2, and most will require
- special configuration to us it.</para>
+ special configuration to use it.</para>
</description>
<value type="default">yes</value>
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index da18142..13db519 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -17,7 +17,7 @@
on what local methods are used for password control (such as NIS
etc).</para>
- <para>Note that this parameter only is only used if the <smbconfoption
+ <para>Note that this parameter only is used if the <smbconfoption
name="unix password sync"/> parameter is set to <constant>yes</constant>. This sequence is
then called <emphasis>AS ROOT</emphasis> when the SMB password in the
smbpasswd file is being changed, without access to the old password
diff --git a/source/configure.in b/source/configure.in
index e015f9e..9d247ad 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1600,7 +1600,9 @@ DSO_EXPORTS=""
;;
*aix*) AC_DEFINE(AIX,1,[Whether the host os is aix])
BLDSHARED="true"
- LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc"
+ # use expfull to export underscored symbols
+ # add rtl to remove /lib/crt0.o warning
+ LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
PICFLAG="-O2"
# as AIX code is always position independent...
diff --git a/source/include/includes.h b/source/include/includes.h
index 15daf0e..c5dfa24 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -788,6 +788,7 @@ enum flush_reason_enum {
NUM_FLUSH_REASONS};
#include "nss_info.h"
+#include "modules/nfs4_acls.h"
#include "nsswitch/libwbclient/wbclient.h"
/* generated rpc server implementation functions */
diff --git a/source/include/nt_status.h b/source/include/nt_status.h
index ef86268..30174e4 100644
--- a/source/include/nt_status.h
+++ b/source/include/nt_status.h
@@ -27,10 +27,10 @@
#undef HAVE_IMMEDIATE_STRUCTURES
#endif
-/* the following rather strange looking definitions of NTSTATUS and WERROR
- and there in order to catch common coding errors where different error types
+/* The following rather strange looking definitions of NTSTATUS and WERROR
+ are there in order to catch common coding errors where different error types
are mixed up. This is especially important as we slowly convert Samba
- from using bool for internal functions
+ from using bool for internal functions.
*/
#if defined(HAVE_IMMEDIATE_STRUCTURES)
diff --git a/source/modules/vfs_aixacl2.c b/source/modules/vfs_aixacl2.c
index 996adbb..ecb2a09 100644
--- a/source/modules/vfs_aixacl2.c
+++ b/source/modules/vfs_aixacl2.c
@@ -27,7 +27,7 @@
extern struct current_user current_user;
extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
-extern bool unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
+extern NTSTATUS unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
uint32 security_info_sent, SEC_DESC *psd);
extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
@@ -192,7 +192,7 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
if (retryPosix)
{
DEBUG(10, ("retrying with posix acl...\n"));
- return posix_get_nt_acl(handle->conn, name security_info,
+ return posix_get_nt_acl(handle->conn, name, security_info,
ppdesc);
}
if (result==False)
--
Samba Shared Repository
More information about the samba-cvs
mailing list