[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-32-96-g98e2d66
Karolin Seeger
kseeger at samba.org
Tue Jan 6 11:33:13 GMT 2009
The branch, v3-0-test has been updated
via 98e2d6614f00f207de42a79d329b63e7966ab8ea (commit)
via 232503ba417f51d93e22a2411b2d446596284e59 (commit)
via e5e8a4a6fa866a23377d0a92eff433b59abfcebe (commit)
via 26080fd575df450166e13836ea227a6d191e86c4 (commit)
from 744c7007b4b798699613e06933f92fdf5261b222 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 98e2d6614f00f207de42a79d329b63e7966ab8ea
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 12:26:23 2009 +0100
docs: Improve description of the share commands in man smb.conf.
-Correct the parameter names.
-Fix typos.
-Fix related parameters.
This fixes bug #6008.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 8b7f66c548ed170d2dab0c91ccff4aca00f4b52d)
(cherry picked from commit 6f38786aa878bd1a7fc10069773c19b28437fbbb)
(cherry picked from commit f420b5c2af7d46e88269d9ec89c5dcd37f1f8f46)
commit 232503ba417f51d93e22a2411b2d446596284e59
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 10:26:37 2009 +0100
docs: Fix example in man vfs_recycle.
This fixes bug #6001.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 9f44a17c3bf36067d04cec036c3e529798932cd7)
(cherry picked from commit 5e073807f7c4679dd299a2b8f3e2643dc1c82405)
(cherry picked from commit c0877d14cb04956b29ca329897a7b4bface7f363)
commit e5e8a4a6fa866a23377d0a92eff433b59abfcebe
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:33:00 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 2e09746a4db4186c9d648370b9004971bc18e5c9)
(cherry picked from commit 9b17f7907bca32282d6e56fa28ca62ef84bf7afc)
(cherry picked from commit de41f0e9a08b796873bdd319fe784b6c90e28b23)
commit 26080fd575df450166e13836ea227a6d191e86c4
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:38:25 2009 +0100
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit 744c7007b4b798699613e06933f92fdf5261b222.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/vfs_recycle.8.xml | 13 ++++++++-----
docs-xml/smbdotconf/misc/addsharecommand.xml | 20 ++++++++++++--------
docs-xml/smbdotconf/misc/changesharecommand.xml | 20 ++++++++++++--------
docs-xml/smbdotconf/misc/deletesharecommand.xml | 18 ++++++++++--------
examples/perfcounter/perfcountd.init | 10 +++++-----
5 files changed, 47 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/vfs_recycle.8.xml b/docs-xml/manpages-3/vfs_recycle.8.xml
index 21f72b1..f3bb324 100644
--- a/docs-xml/manpages-3/vfs_recycle.8.xml
+++ b/docs-xml/manpages-3/vfs_recycle.8.xml
@@ -185,14 +185,17 @@
<refsect1>
<title>EXAMPLES</title>
- <para>Log operations on all shares using the LOCAL1 facility
- and NOTICE priority:</para>
+ <para>Move files "deleted" on <parameter>share</parameter> to
+ <parameter>/data/share/.recycle</parameter> instead of deleting them:
+ </para>
<programlisting>
- <smbconfsection name="[global]"/>
+ <smbconfsection name="[share]"/>
+ <smbconfoption name="path">/data/share</smbconfoption>
<smbconfoption name="vfs objects">recycle</smbconfoption>
- <smbconfoption name="recycle:facility">LOCAL1</smbconfoption>
- <smbconfoption name="recycle:priority">NOTICE</smbconfoption>
+ <smbconfoption name="recycle:repository">.recycle</smbconfoption>
+ <smbconfoption name="recycle:keeptree">yes</smbconfoption>
+ <smbconfoption name="recycle:versions">yes</smbconfoption>
</programlisting>
</refsect1>
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index 9eb50f3..de8da7b 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -7,15 +7,19 @@
<para>
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">add share command</parameter> is used to define an external program
- or script which will add a new service definition to <filename moreinfo="none">smb.conf</filename>. In order
- to successfully execute the <parameter moreinfo="none">add share command</parameter>, <command
- moreinfo="none">smbd</command> requires that the administrator be connected using a root account (i.e. uid == 0).
+ or script which will add a new service definition to
+ <filename moreinfo="none">smb.conf</filename>.
</para>
- <para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
- </para>
+ <para>
+ In order to successfully execute the
+ <parameter moreinfo="none">add share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">add share command</parameter>
+ parameter are executed as root.
+ </para>
<para>
When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -56,7 +60,7 @@
</itemizedlist>
<para>
- This parameter is only used for add file shares. To add printer shares, see the <smbconfoption
+ This parameter is only used to add file shares. To add printer shares, see the <smbconfoption
name="addprinter command"/>.
</para>
</description>
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index 5a42e22..2033fcf 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -8,14 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">change share command</parameter> is used to define an external
program or script which will modify an existing service definition in <filename
-moreinfo="none">smb.conf</filename>. In order to successfully execute the <parameter moreinfo="none">change
-share command</parameter>, <command moreinfo="none">smbd</command> requires that the administrator be
-connected using a root account (i.e. uid == 0).
+moreinfo="none">smb.conf</filename>.
</para>
<para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
+ In order to successfully execute the
+ <parameter moreinfo="none">change share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">change share command</parameter>
+ parameter are executed as root.
</para>
<para>
@@ -58,13 +61,14 @@ connected using a root account (i.e. uid == 0).
</itemizedlist>
<para>
- This parameter is only used modify existing file shares definitions. To modify
- printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+ This parameter is only used to modify existing file share definitions.
+ To modify printer shares, use the "Printers..." folder as seen
+ when browsing the Samba host.
</para>
</description>
<related>add share command</related>
<related>delete share command</related>
<value type="default"></value>
-<value type="example">/usr/local/bin/addshare</value>
+<value type="example">/usr/local/bin/changeshare</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 40eb649..3def6b8 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -8,15 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">delete share command</parameter> is used to define an external
program or script which will remove an existing service definition from
- <filename moreinfo="none">smb.conf</filename>. In order to successfully execute the
- <parameter moreinfo="none">delete share command</parameter>, <command moreinfo="none">smbd</command>
- requires that the administrator be connected using a root account (i.e. uid == 0).
+ <filename moreinfo="none">smb.conf</filename>.
</para>
- <para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
- </para>
+ <para>In order to successfully execute the
+ <parameter moreinfo="none">delete share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">delete share command</parameter>
+ parameter are executed as root.
+ </para>
<para>
When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -44,7 +46,7 @@
</description>
<related>add share command</related>
-<related>delete share command</related>
+<related>change share command</related>
<value type="default"></value>
<value type="example">/usr/local/bin/delshare</value>
</samba:parameter>
diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index 7d151f6..f376981 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -22,17 +22,17 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-killproc()
+killproc()
{
pid=`ps aux | grep $1 | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ -z "$pid" ]; then
+ if [ x"$pid" != "x" ]; then
kill $pid
fi
}
-# Start/stop processes
+# Start/stop processes
-case "$1"
+case "$1"
in
start)
/opt/samba/bin/perfcount -d -f /var/lib/samba/perfmon 2> /dev/null
@@ -48,7 +48,7 @@ stop)
status)
pid=`ps aux | grep perfcount | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ "$pid" == "" ]; then
+ if [ x"$pid" = "x" ]; then
echo "Dead!"
exit 2;
fi
--
Samba Shared Repository
More information about the samba-cvs
mailing list