[SCM] CTDB repository - branch 1.0.114 updated - ctdb-1.0.114.8-1-g9236a67

[Michael Adam]

The branch, 1.0.114 has been updated
       via  9236a67042c02cacdcddc8f3d8fd11e16a37d6cf (commit)
      from  b7c4e6d98c9d4e2674b2015adc4cbebadf080b93 (commit)

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


- Log -----------------------------------------------------------------
commit 9236a67042c02cacdcddc8f3d8fd11e16a37d6cf
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 31 16:25:08 2014 +0200

    events/50.samba: fix ports check to cope with Samba 4 formatting.
    
    The default output formatting of lists in testparm has changed
    from " " separator to ", " separator. Our original eventscript
    code stumbles across port "445,". Map away that comma... :-)
    
    This has been fixed in master and 2.5 silently as part of
    a bigger rewrite.
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 config/events.d/50.samba |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5c10b19..707b7b7 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -239,7 +239,8 @@ case "$1" in
 
 		smb_ports="$CTDB_SAMBA_CHECK_PORTS"
 		[ -z "$smb_ports" ] && {
-			smb_ports=`testparm_cat --parameter-name="smb ports"`
+			smb_ports=`testparm_cat --parameter-name="smb ports" |
+					sed -e 's/,/ /g'`
 		}
 		ctdb_check_tcp_ports $smb_ports || exit $?
 	}


-- 
CTDB repository