[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Fri Oct 12 03:13:04 MDT 2012
The branch, v4-0-test has been updated
via 1f1bc49 docs: Add very basic samba manpage.
via e2d1cb7 s3-printing: Increase debug level for info that the db is empty.
via 8bd3ada packaging: Add support for reloading systemd services.
via 5881b1e s4:torture/smb2: improve the smb2.create.blob test
from ba24443 autoconf: fix --with(out)-sendfile-support option handling
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 1f1bc49feb87a05e4c3d7b8fe8c5f92be0fbb5b9
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Oct 10 10:43:02 2012 +0200
docs: Add very basic samba manpage.
Please feel free to extend.
Karolin
Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(master): Thu Oct 11 11:40:37 CEST 2012 on sn-devel-104
(cherry picked from commit a11595bd2e6895f734e621c69c1ad0ee3e1a685a)
Addresses bug #8802 - Create missing manpages for new binaries.
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Fri Oct 12 11:12:32 CEST 2012 on sn-devel-104
commit e2d1cb7e081fafff92fb8219d9600d39ed598d6c
Author: Andreas Schneider <asn at samba.org>
Date: Thu Sep 20 10:20:31 2012 +0200
s3-printing: Increase debug level for info that the db is empty.
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Sep 20 12:01:48 CEST 2012 on sn-devel-104
(cherry picked from commit d52d7efba31e3f1e63ed365900aba0a8cb960930)
See bug #9112 - smbd.log is flooded by 'printer_list_get_printer: Failed to
fetch record!' for details.
commit 8bd3ada2bb3d67f3fa8499e1b2f8450b12aba45e
Author: Andreas Schneider <asn at samba.org>
Date: Wed Oct 10 11:30:15 2012 +0200
packaging: Add support for reloading systemd services.
Signed-off-by: Andreas Schneider <asn at samba.org>
Fix bug #9280 - Add support for reloading the daemons using systemctl reload.
commit 5881b1ed197a15c235405df19b31afe69c8e0e78
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 19 21:18:46 2012 +0200
s4:torture/smb2: improve the smb2.create.blob test
metze
(cherry picked from commit e6c600aa2c751e694917322378417816c3e58eb6)
(See bug #9209 - Parse of invalid SMB2 create blob can cause smbd crash for
details.)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba.8.xml | 181 +++++++++++++++++++++++++++++++++++++
packaging/systemd/nmb.service | 1 +
packaging/systemd/samba.service | 1 +
packaging/systemd/smb.service | 1 +
packaging/systemd/winbind.service | 1 +
source3/printing/printer_list.c | 3 +-
source4/torture/smb2/create.c | 93 +++++++++++++++++++-
7 files changed, 278 insertions(+), 3 deletions(-)
create mode 100644 docs-xml/manpages/samba.8.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml
new file mode 100644
index 0000000..229e941
--- /dev/null
+++ b/docs-xml/manpages/samba.8.xml
@@ -0,0 +1,181 @@
+<?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="samba.8">
+
+<refmeta>
+ <refentrytitle>samba</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>samba</refname>
+ <refpurpose>Server to provide AD and SMB/CIFS services to clients</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>samba</command>
+ <arg choice="opt">-D</arg>
+ <arg choice="opt">-i</arg>
+ <arg choice="opt">-M <model></arg>
+ <arg choice="opt">--maximum-runtime=<seconds></arg>
+ <arg choice="opt">-b</arg>
+ <arg choice="opt">--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">--debug-stderr</arg>
+ <arg choice="opt">-s <configuration file></arg>
+ <arg choice="opt">--option=<smb_conf_param>=<value></arg>
+ <arg choice="opt">-l <log directory></arg>
+ <arg choice="opt">--leak-report</arg>
+ <arg choice="opt">--leak-report-full</arg>
+ <arg choice="opt">-V</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+ <para>This program is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para><command>samba</command> is the server daemon that
+ provides Active Directory, filesharing and printing services to clients.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>-D|--daemon</term>
+ <listitem><para>If specified, this parameter causes
+ the server to operate as a daemon. That is, it detaches
+ itself and runs in the background, fielding requests
+ on the appropriate ports. Operating the server as a
+ daemon is the recommended way of running
+ <command>samba</command> for servers that provide more
+ than casual use file and print services. This switch is
+ assumed if <command>samba</command> is executed on the
+ command line of a shell.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-i|--interactive</term>
+ <listitem><para>If this parameter is specified it causes the
+ server to run "interactively", not as a daemon, even if the
+ server is executed on the command line of a shell. Setting this
+ parameter negates the implicit daemon mode when run from the
+ command line.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-M|--model</term>
+ <listitem><para>Select process model.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--maximum-runtime=seconds</term>
+ <listitem><para>Set maximum runtime of the server process till
+ autotermination in seconds.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-b|--show-build</term>
+ <listitem><para>Print information about how Samba was built.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-?|--help</term>
+ <listitem><para>Show help message.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--usage</term>
+ <listitem><para>Display brief usage message.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-d|--debuglevel=DEBUGLEVEL</term>
+ <listitem><para>Set debug level.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--debug-stderr</term>
+ <listitem><para>Send debug output to STDERR.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-s|--configfile=CONFIGFILE</term>
+ <listitem><para>Use alternative configuration file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--option=SMB_CONF_PARAM=VALUE</term>
+ <listitem><para>Set smb.conf option from command line.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-l|--log-basename=LOGFILEBASE</term>
+ <listitem><para>Basename for log/debug files.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--leak-report</term>
+ <listitem><para>Enable talloc leak reporting on exit.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--leak-report-full</term>
+ <listitem><para>Enable full talloc leak reporting on exit.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-V|--version</term>
+ <listitem><para>Print version.</para></listitem>
+ </varlistentry>
+
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 4 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>hosts_access</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>inetd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+ <manvolnum>1</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>
+</refsect1>
+
+</refentry>
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
index a2ecd22..e5e81a1 100644
--- a/packaging/systemd/nmb.service
+++ b/packaging/systemd/nmb.service
@@ -7,6 +7,7 @@ Type=forking
PIDFile=/run/nmbd.pid
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
index d2db18c..e2878d1 100644
--- a/packaging/systemd/samba.service
+++ b/packaging/systemd/samba.service
@@ -8,6 +8,7 @@ PIDFile=/run/samba.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
index 70d9842..d0d945a 100644
--- a/packaging/systemd/smb.service
+++ b/packaging/systemd/smb.service
@@ -8,6 +8,7 @@ PIDFile=/run/smbd.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
index 9ce1b52..eff266f 100644
--- a/packaging/systemd/winbind.service
+++ b/packaging/systemd/winbind.service
@@ -7,6 +7,7 @@ Type=forking
PIDFile=/run/winbindd.pid
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
+ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index 7079ddc..0afb84b 100644
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -92,7 +92,8 @@ NTSTATUS printer_list_get_printer(TALLOC_CTX *mem_ctx,
status = dbwrap_fetch_bystring_upper(db, key, key, &data);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to fetch record!\n"));
+ DEBUG(6, ("Failed to fetch record! "
+ "The printer database is empty?\n"));
goto done;
}
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 4668e12..e36a078 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -445,14 +445,103 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre
status = smb2_util_close(tree, io.out.file.handle);
CHECK_STATUS(status, NT_STATUS_OK);
- torture_comment(tctx, "Testing bad tag length\n");
+ torture_comment(tctx, "Testing bad tag length 0\n");
+ ZERO_STRUCT(io.in.blobs);
status = smb2_create_blob_add(tctx, &io.in.blobs,
- "xxx", data_blob(NULL, 0));
+ "x", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+
+ torture_comment(tctx, "Testing bad tag length 1\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "x", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+
+ torture_comment(tctx, "Testing bad tag length 2\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xx", data_blob(NULL, 0));
CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+ torture_comment(tctx, "Testing bad tag length 3\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_create(tree, tctx, &io);
CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+ torture_comment(tctx, "Testing tag length 4\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 5\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 6\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 7\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 8\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 16\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxxxxxxxxxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 17\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxxxxxxxxxxxxx", data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ torture_comment(tctx, "Testing tag length 34\n");
+ ZERO_STRUCT(io.in.blobs);
+ status = smb2_create_blob_add(tctx, &io.in.blobs,
+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+ data_blob(NULL, 0));
+ CHECK_STATUS(status, NT_STATUS_OK);
+ status = smb2_create(tree, tctx, &io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
smb2_deltree(tree, FNAME);
return true;
--
Samba Shared Repository
More information about the samba-cvs
mailing list