[SCM] CTDB repository - branch master updated - ctdb-1.0.108-1-g7b73834

[Ronnie Sahlberg]

The branch, master has been updated
       via  7b73834ba3ac197cc8a3020c111f9bb2c567e70b (commit)
      from  fff280878e670e93a818c0071f3172056214e8c4 (commit)

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


- Log -----------------------------------------------------------------
commit 7b73834ba3ac197cc8a3020c111f9bb2c567e70b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 7 14:37:21 2009 +0100

    events/50.samba: only use wbinfo --ping-dc if available
    
    metze

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

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


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 9c0466c..8147f6e 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -247,7 +247,12 @@ case "$1" in
 	# check winbind is OK
 	check_ctdb_manages_winbind
 	[ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
-		ctdb_check_command "winbind" "wbinfo --ping-dc"
+		TMP_PING_DC=`wbinfo --help |grep '\-\-ping\-dc' |wc -l`
+		if test x"$TMP_PING_DC" = x"1"; then
+			ctdb_check_command "winbind" "wbinfo --ping-dc"
+		else
+			ctdb_check_command "winbind" "wbinfo --ping"
+		fi
 	}
 	;;
 


-- 
CTDB repository