git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c80c91
)
events/50.samba: only use wbinfo --ping-dc if available
author
Stefan Metzmacher
<metze@samba.org>
Mon, 7 Dec 2009 13:37:21 +0000
(14:37 +0100)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Mon, 7 Dec 2009 20:38:00 +0000
(07:38 +1100)
metze
(This used to be ctdb commit
7b73834ba3ac197cc8a3020c111f9bb2c567e70b
)
ctdb/config/events.d/50.samba
patch
|
blob
|
history
diff --git
a/ctdb/config/events.d/50.samba
b/ctdb/config/events.d/50.samba
index 9c0466c4482aa90bd395c1013560cbc498e6b83b..8147f6e38598261cf1c78479d1f8c7a53314e5f6 100755
(executable)
--- a/
ctdb/config/events.d/50.samba
+++ b/
ctdb/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
}
;;