]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
tests: Replace iconv(1) UTF-16LE conversion with a python3 call
authorSATOH Fumiyasu <fumiyas@osstech.co.jp>
Fri, 12 May 2023 05:53:10 +0000 (14:53 +0900)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 19 May 2023 00:29:33 +0000 (00:29 +0000)
GNU libiconv and its iconv(1) do NOT define 'utf16le' as
an alias of 'UTF-16LE' encoding.

Signed-off-by: SATOH Fumiyasu <fumiyas@osstech.co.jp>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source3/script/tests/test_rpcclient_pw_nt_hash.sh

index 24d81519c4c83f3124f293fbaf88ab488ec90149..c1e3660e578e4ee25666631b2fb97741f2901964 100755 (executable)
@@ -15,7 +15,7 @@ PASSWORD="$2"
 SERVER="$3"
 RPCCLIENT="$4"
 
-HASH=$(echo -n $PASSWORD | iconv -t utf16le | $PYTHON -c 'import sys, binascii, samba, samba.crypto; sys.stdout.buffer.write(binascii.hexlify(samba.crypto.md4_hash_blob(sys.stdin.buffer.read(1000))))')
+HASH=$(echo -n $PASSWORD | $PYTHON -c 'import sys, binascii, samba, samba.crypto; sys.stdout.buffer.write(binascii.hexlify(samba.crypto.md4_hash_blob(sys.stdin.buffer.read(1000).decode().encode("UTF-16LE"))))')
 
 RPCCLIENTCMD="$RPCCLIENT $SERVER --pw-nt-hash -U$USERNAME%$HASH -c queryuser"