[PATCHES] limit kerberos encryption types used by winbindd

[Uri Simchoni]

Hi Garming,

Sorry about that - my intention was to pass those tests if tshark is not
installed but apparently I haven't really tested this case.

It turns out a test needs to emit success messages for subunit to
declare it as passed, not just return 0.

I hope the attached fixes it - please review and push if happy.

Thanks,
Uri.

On 08/23/2016 07:02 AM, Garming Sam wrote:
> Hi Uri,
> 
> I've been getting errors on this test, where my system doesn't have
> tshark installed.
> 
> [1(0)/3 at 0s] samba4.blackbox.client_etypes_all(ad_dc:client)
> command: /home/garming/wintest/testprogs/blackbox/test_client_etypes.sh
> $DC_SERVER $DC_USERNAME $DC_PASSWORD $PREFIX_ABS all 17_18_23 2>&1  |
> /home/garming/wintest/selftest/filter-subunit --fail-on-empty
> --prefix="samba4.blackbox.client_etypes_all(ad_dc:client)."
> --suffix="(ad_dc:client)"
> expanded command:
> /home/garming/wintest/testprogs/blackbox/test_client_etypes.sh addc
> Administrator locDCpass1 /home/garming/wintest/st all 17_18_23 2>&1  |
> /home/garming/wintest/selftest/filter-subunit --fail-on-empty
> --prefix="samba4.blackbox.client_etypes_all(ad_dc:client)."
> --suffix="(ad_dc:client)"
> ERROR: Testsuite[samba4.blackbox.client_etypes_all(ad_dc:client)]
> REASON: Exit code was 1
> 
> 
> I was wondering if you could look into it?
> 
> 
> Cheers,
> 
> Garming
> 
> On 07/08/16 05:20, Uri Simchoni wrote:
>> On 08/04/2016 09:52 PM, Jeremy Allison wrote:
>>> Uri - In trying to push this I'm getting:
>>>
>>> [1616(10428)/1954 at 1h52m16s] samba4.blackbox.client_etypes_all(ad_dc:client)
>>> UNEXPECTED(failure): samba4.blackbox.client_etypes_all(ad_dc:client).verify types(ad_dc:client)
>>> REASON: Exception: Exception:
>>>
>>> FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)
>>>
>>> which does seem related even with the latest autobuild mess.
>>>
>>> Can you investigate please ?
>>>
>>> Cheers,
>>>
>>> 	Jeremy.
>>>
>> Older version of tshark. The wireshark Kerberos dissector was replaced
>> in commit dea68bf0.
>>
>> I hope those are the only two versions of wireshark Kerberos dissector
>> in use and that the dissector output will be stable enough...
>>
>> The attached patch set only modifies the tshark line in the test. Passes
>> autobuild-private.sh on sn-devel and locally on my machine.
>>
>> Thanks,
>> Uri.
> 
> 

-------------- next part --------------
From 234c9bb57cf7d8b64d6c130169d4690a903d30b3 Mon Sep 17 00:00:00 2001
From: Uri Simchoni <uri at samba.org>
Date: Tue, 23 Aug 2016 07:50:35 +0300
Subject: [PATCH] selftest: pass client_etypes tests if tshark or sha1sum is
 not installed

That was the original plan - not to fail existing envs, but for subunit
to pass the test, an actual success message is required.

Signed-off-by: Uri Simchoni <uri at samba.org>
---
 testprogs/blackbox/test_client_etypes.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/testprogs/blackbox/test_client_etypes.sh b/testprogs/blackbox/test_client_etypes.sh
index 3327517..2bb33e3 100755
--- a/testprogs/blackbox/test_client_etypes.sh
+++ b/testprogs/blackbox/test_client_etypes.sh
@@ -5,10 +5,6 @@ EOF
 exit 1;
 fi
 
-#requires tshark
-which tshark > /dev/null 2>&1 || exit 0
-which sha1sum > /dev/null 2>&1 || exit 0
-
 DC_SERVER=$1
 DC_USERNAME=$2
 DC_PASSWORD=$3
@@ -36,6 +32,13 @@ pcap_file=$BASEDIR/$WORKDIR/test.pcap
 # Load test functions
 . `dirname $0`/subunit.sh
 
+#requires tshark and sha1sum
+if ! which tshark > /dev/null 2>&1 || ! which sha1sum > /dev/null 2>&1 ; then
+    echo "Skipping real tests - tshark or sha1sum not installed"
+    testit true
+    exit 0
+fi
+
 export SOCKET_WRAPPER_PCAP_FILE=$pcap_file
 testit "join" $VALGRIND $net_tool ads join -kU$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
 
-- 
2.5.5