The branch, v3-3-test has been updated
via 48bf0b42a7d3829d476a50b4f6f80022279b4e49 (commit)
via 1429f3b7cf293994b334052428fcdadcee162dea (commit)
via 029875d8c9b2f9448f5299faaa3a48e8bccbca53 (commit)
from 54556df561d03d30b2fc21b9eaabe56b8c758301 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 48bf0b42a7d3829d476a50b4f6f80022279b4e49
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Fri May 16 09:27:20 2008 +0200
man pages: Remove man page for 'mangled map'.
'mangled map' has been removed with
dee8beba7a92b8a3f68bbcc59fd0a827f68c7736.
Karolin
(cherry picked from commit d9b4e500675a378daba50d12cd638a245aa78b72)
commit 1429f3b7cf293994b334052428fcdadcee162dea
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Tue May 20 11:09:06 2008 +0200
sesssetup.c: Add debug message.
Log when we kill other smbd sessions like when we hit the VC == 0 case.
This one fixes BUG #5476.
Initial patch from Björn Jacke <[EMAIL PROTECTED]>.
Karolin
commit 029875d8c9b2f9448f5299faaa3a48e8bccbca53
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Tue May 20 11:03:33 2008 +0200
man pages: Add documentation for new cluster parameters.
Karolin
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/filename/mangledmap.xml | 33 -------------------------
docs-xml/smbdotconf/misc/clusteraddresses.xml | 17 +++++++++++++
docs-xml/smbdotconf/misc/clustering.xml | 17 +++++++++++++
docs-xml/smbdotconf/misc/ctdbdsocket.xml | 16 ++++++++++++
source/smbd/sesssetup.c | 3 ++
5 files changed, 53 insertions(+), 33 deletions(-)
delete mode 100644 docs-xml/smbdotconf/filename/mangledmap.xml
create mode 100644 docs-xml/smbdotconf/misc/clusteraddresses.xml
create mode 100644 docs-xml/smbdotconf/misc/clustering.xml
create mode 100644 docs-xml/smbdotconf/misc/ctdbdsocket.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/filename/mangledmap.xml
b/docs-xml/smbdotconf/filename/mangledmap.xml
deleted file mode 100644
index b4be3a8..0000000
--- a/docs-xml/smbdotconf/filename/mangledmap.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<samba:parameter name="mangled map"
- type="string"
- context="S"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
-<description>
- <para>
- This is for those who want to directly map UNIX file names which cannot
be represented on
- Windows/DOS. The mangling of names is not always what is needed. In
particular you may have
- documents with file extensions that differ between DOS and UNIX.
- For example, under UNIX it is common to use <filename
moreinfo="none">.html</filename>
- for HTML files, whereas under Windows/DOS <filename
moreinfo="none">.htm</filename>
- is more commonly used.
- </para>
-
- <para>
- So to map <filename moreinfo="none">html</filename> to <filename
moreinfo="none">htm</filename>
- you would use:
- </para>
-
- <para>
- <smbconfoption name="mangled map">(*.html *.htm)</smbconfoption>.
- </para>
-
- <para>
- One very useful case is to remove the annoying <filename
moreinfo="none">;1</filename> off
- the ends of filenames on some CDROMs (only visible under some UNIXes).
To do this use a map of
- (*;1 *;).
- </para>
-</description>
-
-<value type="default"><comment>no mangled map</comment></value>
-<value type="example">(*;1 *;)</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml
b/docs-xml/smbdotconf/misc/clusteraddresses.xml
new file mode 100644
index 0000000..d34d550
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="cluster addresses"
+ context="G"
+ type="list"
+ developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
+<description>
+ <para>With this parameter you can add additional addresses
+ nmbd will register with a WINS server. These addresses are not
+ necessarily present on all nodes simultaneously, but they will
+ be registered with the WINS server so that clients can contact
+ any of the nodes.
+ </para>
+</description>
+
+<value type="default"></value>
+<value type="example">10.0.0.1 10.0.0.2 10.0.0.3</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/clustering.xml
b/docs-xml/smbdotconf/misc/clustering.xml
new file mode 100644
index 0000000..b85934e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="clustering"
+ context="G"
+ type="boolean"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
+<description>
+ <para>This parameter specifies whether Samba should contact
+ ctdb for accessing its tdb files and use ctdb as a backend
+ for its messaging backend.
+ </para>
+
+ <para>Set this parameter to <value type="example">yes</value> only if
+ you have a cluster setup with ctdb running.
+ </para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml
b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
new file mode 100644
index 0000000..a478553
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -0,0 +1,16 @@
+<samba:parameter name="ctdbd socket"
+ context="G"
+ advanced="1"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
+<synonym>default</synonym>
+<description>
+ <para>If you set <value type="example">clustering=yes</value>,
+ you need to tell Samba where ctdbd listens on its unix domain
+ socket. The default path as of ctdb 1.0 is /tmp/ctdb.socket which
+ you have to explicitly set for Samba in smb.conf.
+ </para>
+</description>
+<value type="default"></value>
+<value type="example">/tmp/ctdb.socket</value>
+</samba:parameter>
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index 5b00403..f6aec7d 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -1352,6 +1352,9 @@ static int shutdown_other_smbds(struct db_record *rec,
return 0;
}
+ DEBUG(0,("shutdown_other_smbds: shutting down pid %d "
+ "(IP %s)\n", crec->pid, ip));
+
messaging_send(smbd_messaging_context(), crec->pid, MSG_SHUTDOWN,
&data_blob_null);
return 0;
--
Samba Shared Repository
