pytests: rename KRB_ERR_TKT_NYV as KDC_ERR_TKT_NYV

to be consistent with all the others.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/python/samba/tests/krb5/kdc_tgs_tests.py b/python/samba/tests/krb5/kdc_tgs_tests.py
index 64397530cafc09088184a6a2b7fa5319bf60065e..1f2d8707aab6290e98ddb575da59236753fa9de3 100755 (executable)
--- a/python/samba/tests/krb5/kdc_tgs_tests.py
+++ b/python/samba/tests/krb5/kdc_tgs_tests.py
@@ -53,7 +53,7 @@ from samba.tests.krb5.rfc4120_constants import (
     KDC_ERR_SERVER_NOMATCH,
     KDC_ERR_TKT_EXPIRED,
     KDC_ERR_TGT_REVOKED,
-    KRB_ERR_TKT_NYV,
+    KDC_ERR_TKT_NYV,
     KDC_ERR_WRONG_REALM,
     NT_ENTERPRISE_PRINCIPAL,
     NT_PRINCIPAL,
@@ -1117,22 +1117,22 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_req_invalid(self):
         creds = self._get_creds()
         tgt = self._get_tgt(creds, invalid=True)
-        self._run_tgs(tgt, creds, expected_error=KRB_ERR_TKT_NYV)
+        self._run_tgs(tgt, creds, expected_error=KDC_ERR_TKT_NYV)
 
     def test_s4u2self_req_invalid(self):
         creds = self._get_creds()
         tgt = self._get_tgt(creds, invalid=True)
-        self._s4u2self(tgt, creds, expected_error=KRB_ERR_TKT_NYV)
+        self._s4u2self(tgt, creds, expected_error=KDC_ERR_TKT_NYV)
 
     def test_user2user_req_invalid(self):
         creds = self._get_creds()
         tgt = self._get_tgt(creds, invalid=True)
-        self._user2user(tgt, creds, expected_error=KRB_ERR_TKT_NYV)
+        self._user2user(tgt, creds, expected_error=KDC_ERR_TKT_NYV)
 
     def test_fast_req_invalid(self):
         creds = self._get_creds()
         tgt = self._get_tgt(creds, invalid=True)
-        self._fast(tgt, creds, expected_error=KRB_ERR_TKT_NYV,
+        self._fast(tgt, creds, expected_error=KDC_ERR_TKT_NYV,
                    expected_sname=self.get_krbtgt_sname())
 
     def test_tgs_req_no_requester_sid(self):

diff --git a/python/samba/tests/krb5/rfc4120_constants.py b/python/samba/tests/krb5/rfc4120_constants.py
index 2e2de74b21b9f99e29d26208110a012a52a23942..c98f1c67b1282c8c0dd2d05e4ec432ac4ac55bec 100644 (file)
--- a/python/samba/tests/krb5/rfc4120_constants.py
+++ b/python/samba/tests/krb5/rfc4120_constants.py
@@ -106,7 +106,7 @@ KDC_ERR_SERVER_NOMATCH = 26
 KDC_ERR_PATH_NOT_ACCEPTED = 28
 KDC_ERR_BAD_INTEGRITY = 31
 KDC_ERR_TKT_EXPIRED = 32
-KRB_ERR_TKT_NYV = 33
+KDC_ERR_TKT_NYV = 33
 KDC_ERR_NOT_US = 35
 KDC_ERR_BADMATCH = 36
 KDC_ERR_SKEW = 37