tests/krb5: Expect e-data except when the error code is KDC_ERR_GENERIC

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 1c08b76061feeb20ec2e63078830ef99569b98fb..c0e997a86a14773e724175755fa370151b703b73 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -40,6 +40,7 @@ from samba.tests import TestCaseInTempDir
 import samba.tests.krb5.rfc4120_pyasn1 as krb5_asn1
 from samba.tests.krb5.rfc4120_constants import (
     KDC_ERR_ETYPE_NOSUPP,
+    KDC_ERR_GENERIC,
     KDC_ERR_PREAUTH_REQUIRED,
     KRB_AP_REQ,
     KRB_AS_REP,
@@ -1799,7 +1800,7 @@ class RawKerberosTest(TestCaseInTempDir):
         self.assertElementEqualPrincipal(rep, 'sname', expected_sname)
         if self.strict_checking:
             self.assertElementMissing(rep, 'e-text')
-        if expected_error_mode != KDC_ERR_PREAUTH_REQUIRED:
+        if expected_error_mode == KDC_ERR_GENERIC:
             self.assertElementMissing(rep, 'e-data')
             return
         edata = self.getElementValue(rep, 'e-data')

diff --git a/python/samba/tests/krb5/rfc4120_constants.py b/python/samba/tests/krb5/rfc4120_constants.py
index adcc93e1d6bc69d60d3fbbe1226f5365ae2ce17b..b00b8b48ae5cd71bfff6d8d01a13031f5bb2a690 100644 (file)
--- a/python/samba/tests/krb5/rfc4120_constants.py
+++ b/python/samba/tests/krb5/rfc4120_constants.py
@@ -58,6 +58,7 @@ KDC_ERR_PREAUTH_FAILED = 24
 KDC_ERR_PREAUTH_REQUIRED = 25
 KDC_ERR_BADMATCH = 36
 KDC_ERR_SKEW = 37
+KDC_ERR_GENERIC = 60
 
 # Name types
 NT_UNKNOWN = int(krb5_asn1.NameTypeValues('kRB5-NT-UNKNOWN'))