sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-tests: Replace md5sum with posix cksum

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13520

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2018-07-19 16:10:15 +10:00 committed by Martin Schwenke
parent 07844c2ec9
commit 22c3078c8b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/config/functions
View File

@ -867,8 +867,8 @@ if ! type mktemp >/dev/null 2>&1 ; then
fi fi
_d="${TMPDIR:-/tmp}" _d="${TMPDIR:-/tmp}"
_hex10=$(dd if=/dev/urandom count=20 2>/dev/null | \ _hex10=$(dd if=/dev/urandom count=20 2>/dev/null | \
md5sum | \ cksum | \
sed -e 's@\(..........\).*@\1@') awk '{print $1}')
_t="${_d}/tmp.${_hex10}" _t="${_d}/tmp.${_hex10}"
( (
umask 077 umask 077

8
ctdb/tests/eventscripts/scripts/11.natgw.sh
View File

@ -46,8 +46,8 @@ EOF
ok_natgw_master_ip_addr_show () ok_natgw_master_ip_addr_show ()
{ {
_mac=$(echo "$CTDB_NATGW_PUBLIC_IFACE" | _mac=$(echo "$CTDB_NATGW_PUBLIC_IFACE" |
md5sum | cksum |
sed -r -e 's@(..)(..)(..)(..)(..)(..).*@\1:\2:\3:\4:\5:\6@') sed -r -e 's@(..)(..)(..).*@fe:fe:fe:\1:\2:\3@')
# This is based on CTDB_NATGW_PUBLIC_IP # This is based on CTDB_NATGW_PUBLIC_IP
_brd="10.1.1.255" _brd="10.1.1.255"
@ -63,8 +63,8 @@ EOF
ok_natgw_slave_ip_addr_show () ok_natgw_slave_ip_addr_show ()
{ {
_mac=$(echo "$CTDB_NATGW_PUBLIC_IFACE" | _mac=$(echo "$CTDB_NATGW_PUBLIC_IFACE" |
md5sum | cksum |
sed -r -e 's@(..)(..)(..)(..)(..)(..).*@\1:\2:\3:\4:\5:\6@') sed -r -e 's@(..)(..)(..).*@fe:fe:fe:\1:\2:\3@')
ok <<EOF ok <<EOF
1: ${CTDB_NATGW_PUBLIC_IFACE}: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000 1: ${CTDB_NATGW_PUBLIC_IFACE}: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000

2
ctdb/tests/eventscripts/stubs/ip
View File

@ -124,7 +124,7 @@ ip_link_show ()
_opts="<LOOPBACK${_flags}> mtu 65536 qdisc noqueue state UNKNOWN" _opts="<LOOPBACK${_flags}> mtu 65536 qdisc noqueue state UNKNOWN"
;; ;;
*) *)
_mac=$(echo $dev | md5sum | sed -r -e 's@(..)(..)(..)(..)(..)(..).*@\1:\2:\3:\4:\5:\6@') _mac=$(echo $dev | cksum | sed -r -e 's@(..)(..)(..).*@fe:fe:fe:\1:\2:\3@')
_brd="ff:ff:ff:ff:ff:ff" _brd="ff:ff:ff:ff:ff:ff"
_type="ether" _type="ether"
_opts="<BROADCAST,MULTICAST${_flags}> mtu 1500 qdisc pfifo_fast state ${_state} qlen 1000" _opts="<BROADCAST,MULTICAST${_flags}> mtu 1500 qdisc pfifo_fast state ${_state} qlen 1000"