[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Thu Jun 28 15:08:02 MDT 2012
The branch, master has been updated
via 7560b1c s3: fine tune and clean up statvfs tests
via f6ac6b8 docs-xml: fix typos and format in smb.conf server max protocol man
via 11fc75f packaging(RHEL-CTDB): fix build dependencies
from a29bf4a selftest: run pdbtest against s3dc as well
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7560b1cea6d2c0b2962f5802f724525fc0ec9bf9
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jun 28 21:17:28 2012 +0200
s3: fine tune and clean up statvfs tests
This should also fix the build on Tru64. Tru64 has a POSIX compliant statvfs()
function while most *BSD systems ignore POSIX.
Autobuild-User(master): Björn Jacke <bj at sernet.de>
Autobuild-Date(master): Thu Jun 28 23:07:23 CEST 2012 on sn-devel-104
commit f6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jun 27 13:06:50 2012 +0200
docs-xml: fix typos and format in smb.conf server max protocol man
commit 11fc75fcb515b27cacf2f703c58c6ef10b645fee
Author: Björn Baumbach <bb at sernet.de>
Date: Thu May 3 14:11:42 2012 +0200
packaging(RHEL-CTDB): fix build dependencies
Building manual pages needs rsync for copying built mans.
source3/script/installmo.sh calls msgfmt, thats part of gettext.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/net.8.xml | 32 +++++++++++++++++--
docs-xml/smbdotconf/misc/ncalrpcdir.xml | 10 +++---
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 32 ++++++++++---------
docs-xml/smbdotconf/vfs/getquotacommand.xml | 2 +-
packaging/RHEL-CTDB/samba.spec.tmpl | 4 +-
source3/configure.in | 13 ++++----
source3/smbd/statvfs.c | 4 +-
7 files changed, 61 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index f20afb2..c85f87f 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1988,10 +1988,34 @@ string.</member>
<refsect3>
<title>REGISTRY IMPORT <replaceable>file</replaceable><!--
- --><replaceable>[opt]</replaceable></title>
-
- <para>Import a registration entries (.reg) <emphasis>file</emphasis>.
- </para>
+ --><replaceable> [--precheck <check-file>] [opt]</replaceable></title>
+ <para>Import a registration entries (.reg) <emphasis>file</emphasis>.</para>
+ <para>The following options are available:</para>
+ <variablelist>
+ <varlistentry><term>--precheck <replaceable>check-file</replaceable></term>
+ <listitem><para>
+ This is a mechanism to check the existence or non-existence of
+ certain keys or values specified in a precheck file before applying
+ the import file.
+ The import file will only be applied if the precheck succeeds.
+ </para>
+ <para>
+ The check-file follows the normal registry file syntax with the
+ following semantics:
+ </para>
+ <itemizedlist>
+ <listitem><para><value name>=<value> checks whether the
+ value exists and has the given value.</para></listitem>
+ <listitem><para><value name>=- checks whether the value does
+ not exist.</para></listitem>
+ <listitem><para>[key] checks whether the key exists.</para>
+ </listitem>
+ <listitem><para>[-key] checks whether the key does not exist.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect3>
<refsect3>
diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
index b53acef..01b5b5c 100644
--- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -1,11 +1,11 @@
<samba:parameter name="ncalrpc dir"
- context="G"
- advanced="1" developer="1"
+ context="G"
+ advanced="1" developer="1"
type="string"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This directory will hold a series of named pipes to allow RPC over inter-process communication. </para>.
- <para>This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted permissions, and allows a trusted communication channel between Samba processes</para>
+ <para>This directory will hold a series of named pipes to allow RPC over inter-process communication.</para>
+ <para>This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted permissions, and allows a trusted communication channel between Samba processes</para>
</description>
<value type="default">${prefix}/var/ncalrpc</value>
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 5eb79f3..f91523b 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,8 +1,8 @@
<samba:parameter name="server max protocol"
- context="G"
- type="enum"
- developer="1"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ context="G"
+ type="enum"
+ developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The value of the parameter (a string) is the highest
protocol level that will be supported by the server.</para>
@@ -20,9 +20,8 @@
</listitem>
<listitem>
- <para><constant>LANMAN1</constant>: First <emphasis>
- modern</emphasis> version of the protocol. Long filename
- support.</para>
+ <para><constant>LANMAN1</constant>: First <emphasis>modern</emphasis>
+ version of the protocol. Long filename support.</para>
</listitem>
<listitem>
@@ -33,39 +32,42 @@
<para><constant>NT1</constant>: Current up to date version of the protocol.
Used by Windows NT. Known as CIFS.</para>
</listitem>
+
<listitem>
<para><constant>SMB2</constant>: Re-implementation of the SMB protocol.
Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.</para>
<itemizedlist>
<listitem>
- <para><constant>SMB2_02</constant>: The earliest SMB2 version.</para>
+ <para><constant>SMB2_02</constant>: The earliest SMB2 version.</para>
</listitem>
<listitem>
- <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
+ <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
</listitem>
<listitem>
- <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
+ <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
</listitem>
<listitem>
- <para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
+ <para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
</listitem>
</itemizedlist>
- <para>By default SMB2 selects the SMB2_02 varient.</para>
+ <para>By default SMB2 selects the SMB2_02 variant.</para>
+ </listitem>
+
<listitem>
<para><constant>SMB3</constant>: The same as SMB2.
Used by Windows 8. SMB3 has sub protocols available.</para>
<itemizedlist>
<listitem>
- <para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para>
+ <para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para>
</listitem>
</itemizedlist>
- <para>By default SMB3 selects the SMB3_00 varient.</para>
+ <para>By default SMB3 selects the SMB3_00 variant.</para>
</listitem>
</itemizedlist>
<para>Normally this option should not be set as the automatic
negotiation phase in the SMB protocol takes care of choosing
- the appropriate protocol.</para>
+ the appropriate protocol.</para>
</description>
<related>server min protocol</related>
diff --git a/docs-xml/smbdotconf/vfs/getquotacommand.xml b/docs-xml/smbdotconf/vfs/getquotacommand.xml
index 92016ef..04f3034 100644
--- a/docs-xml/smbdotconf/vfs/getquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/getquotacommand.xml
@@ -26,7 +26,7 @@
<listitem><para>uid of user or gid of group</para></listitem>
</itemizedlist>
- <para>The type of query can be one of :</para>
+ <para>The type of query can be one of:</para>
<itemizedlist>
<listitem><para>1 - user quotas</para></listitem>
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 67d4eef..a9111d2 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -27,9 +27,9 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, e2fsprogs-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, e2fsprogs-devel, gettext
# requirements for building the man pages:
-BuildRequires: libxslt, docbook-utils, docbook-style-xsl
+BuildRequires: libxslt, docbook-utils, docbook-style-xsl, rsync
BuildRequires: ctdb-devel >= 1.2.25
# Working around perl dependency problem from docs
diff --git a/source3/configure.in b/source3/configure.in
index 6e324a1..5df54cf 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6261,11 +6261,11 @@ fi
CFLAGS=$CFLAGS_SAVE
-# Checks for *BSD bsd_statvfs() function
+# Checks for POSIX ignorant BSD style statvfs() function
# Start
AC_CHECK_HEADERS(sys/param.h sys/mount.h)
-AC_MSG_CHECKING([bsd_statvfs: checking for statfs() and struct statfs.bsize])
+AC_MSG_CHECKING([checking for posix ignorant *bsd style statfs struct])
AC_CACHE_VAL(bsdstatvfs_cv_statfs,[
AC_TRY_RUN([
#ifdef HAVE_SYS_PARAM_H
@@ -6278,7 +6278,8 @@ AC_CACHE_VAL(bsdstatvfs_cv_statfs,[
{
struct statfs fsd;
fsd.f_bsize = 0;
- exit (statfs (".", &fsd));
+ fsd.f_iosize = 0;
+ return (statfs (".", &fsd));
}],
bsdstatvfs_cv_statfs=yes,
bsdstatvfs_cv_statfs=no,
@@ -6286,11 +6287,9 @@ AC_CACHE_VAL(bsdstatvfs_cv_statfs,[
AC_MSG_RESULT($bsdstatvfs_cv_statfs)
if test $bsdstatvfs_cv_statfs = yes; then
- AC_DEFINE(BSD_STATVFS_BSIZE,1,[Whether statfs exists and struct statfs has bsize property])
+ AC_DEFINE(BSD_STYLE_STATVFS,1,[Whether statfs struct is *bsd style])
fi
-
-# End
-# Checks for *BSD sys_statvfs() function
+# End of checks POSIX ignorant BSD style statvfs() function
# Checks for the vfs_fileid module
# Start
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 5cefe2d..918867f 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -97,7 +97,7 @@ static int darwin_statvfs(const char *path, vfs_statvfs_struct *statbuf)
return 0;
}
-#elif defined(BSD) && defined(BSD_STATVFS_BSIZE)
+#elif defined(BSD_STYLE_STATVFS)
static int bsd_statvfs(const char *path, vfs_statvfs_struct *statbuf)
{
struct statfs statfs_buf;
@@ -177,7 +177,7 @@ int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
{
#if defined(DARWINOS)
return darwin_statvfs(path, statbuf);
-#elif defined(BSD) && defined(BSD_STATVFS_BSIZE)
+#elif defined(BSD_STYLE_STATVFS)
return bsd_statvfs(path, statbuf);
#elif defined(STAT_STATVFS) && defined(HAVE_FSID_INT)
return linux_statvfs(path, statbuf);
--
Samba Shared Repository
More information about the samba-cvs
mailing list