Revert "events/50.samba: only use wbinfo --ping-dc if available"
authorMartin Schwenke <martin@meltin.net>
Tue, 12 Jan 2010 10:02:11 +0000 (21:02 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 12 Jan 2010 10:02:11 +0000 (21:02 +1100)
This reverts commit 7b73834ba3ac197cc8a3020c111f9bb2c567e70b.

wbinfo --ping-dc is proving too unreliable.

config/events.d/50.samba

index 8147f6e38598261cf1c78479d1f8c7a53314e5f6..9c0466c4482aa90bd395c1013560cbc498e6b83b 100755 (executable)
@@ -247,12 +247,7 @@ case "$1" in
        # check winbind is OK
        check_ctdb_manages_winbind
        [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
-               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_check_command "winbind" "wbinfo --ping-dc"
        }
        ;;