[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  6da8126 ctdb-eventscripts: New configuration variable CTDB_GANESHA_REC_SUBDIR
      from  f4e358b libcli: Add a NULL check in dom_sid_string

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6da8126a115419587672d16e2440c322a837da6b
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Jun 6 15:25:28 2014 +1000

    ctdb-eventscripts: New configuration variable CTDB_GANESHA_REC_SUBDIR
    
    Backup and restore of the cluster filesystem can upset the operation
    of 60.ganesha by changing the contents of this subdirectory.
    
    Allow this subdirectory to be configured to a subdirectory that is
    ignored by backup and restore processes.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Wed Jun 11 09:29:22 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 ctdb/config/events.d/60.ganesha |    8 +++++---
 ctdb/doc/ctdbd.conf.5.xml       |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha
index e8a52b0..e085ed3 100755
--- a/ctdb/config/events.d/60.ganesha
+++ b/ctdb/config/events.d/60.ganesha
@@ -82,22 +82,24 @@ get_nodenum()
 
 create_ganesha_recdirs ()
 {
+    [ -n "$CTDB_GANESHA_REC_SUBDIR" ] || CTDB_GANESHA_REC_SUBDIR=".ganesha"
+
     MOUNTS=$(mount -t $CTDB_CLUSTER_FILESYSTEM_TYPE)
     if [ -z "$MOUNTS" ]; then
       echo "startup $CTDB_CLUSTER_FILESYSTEM_TYPE not ready"
       exit 0
     fi
     MNTPT=$(echo "$MOUNTS" | sort | awk 'NR == 1 {print $3}')
-    mkdir -p $MNTPT/.ganesha
+    mkdir -p $MNTPT/$CTDB_GANESHA_REC_SUBDIR
     if [ -e $GANRECDIR ]; then
         if [ ! -L $GANRECDIR ] ; then
             rm -rf $GANRECDIR
-            if ! ln -s $MNTPT/.ganesha  $GANRECDIR ; then
+            if ! ln -s $MNTPT/$CTDB_GANESHA_REC_SUBDIR  $GANRECDIR ; then
                 echo "ln failed"
             fi
         fi
     else
-        if ! ln -sf $MNTPT/.ganesha  $GANRECDIR ; then
+        if ! ln -sf $MNTPT/$CTDB_GANESHA_REC_SUBDIR  $GANRECDIR ; then
             echo "ln failed"
         fi
     fi
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 98d0924..149aa62 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -923,6 +923,21 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 	</varlistentry>
 
 	<varlistentry>
+	  <term>CTDB_GANESHA_REC_SUBDIR<parameter>SUBDIR</parameter></term>
+	  <listitem>
+	    <para>
+	      SUBDIR is the name of a top-level subdirectory in the
+	      first cluster filesystem.  This subdirectory is used to
+	      allow communication between NFS-Ganesha and the
+	      <filename>60.ganesha</filename> script.
+	    </para>
+	    <para>
+	      Default is ".ganesha".
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>CTDB_MANAGES_NFS=yes|no</term>
 	  <listitem>
 	    <para>


-- 
Samba Shared Repository