Simplify test preauth module use

Since ticket #7665, explicitly registered kdcpreauth modules have
appeared before built-in modules (disregarding the static preauth
systems, which are all informational).  Therefore, the test preauth
module can be used without disabling encrypted timestamp.  Remove an
erroneous comment in kdctest.c and simplify test scripts which use the
test preauth module.

diff --git a/src/plugins/preauth/test/kdctest.c b/src/plugins/preauth/test/kdctest.c
index c824626de6ccd8470dd305473854e30e0ef8dfa2..5ac1cd1f564ad56bdfc8c7126cb32ca54d7e9c9c 100644 (file)
--- a/src/plugins/preauth/test/kdctest.c
+++ b/src/plugins/preauth/test/kdctest.c
@@ -42,11 +42,6 @@
  * - It receives a space-separated list from the clpreauth module and asserts
  *   each string as an authentication indicator.  It always succeeds in
  *   pre-authenticating the request.
- *
- * To use this module, a test script should:
- * - Register this module and the corresponding clpreauth module
- * - Disable the encrypted_timestamp clpreauth or kdcpreauth module
- * - Set the requires_preauth flag on the client principal
  */
 
 #include "k5-int.h"

diff --git a/src/tests/t_authdata.py b/src/tests/t_authdata.py
index 8da206d1bf81d86c34e87916079e93e5a104f849..d98c3fd52c67bdb4112f7d8d519e0e27ad502916 100644 (file)
--- a/src/tests/t_authdata.py
+++ b/src/tests/t_authdata.py
@@ -81,8 +81,7 @@ realm.stop()
 # can control the indicators asserted.
 testpreauth = os.path.join(buildtop, 'plugins', 'preauth', 'test', 'test.so')
 krb5conf = {'plugins': {'kdcpreauth': {'module': 'test:' + testpreauth},
-                        'clpreauth': {'module': 'test:' + testpreauth,
-                                      'disable': 'encrypted_timestamp'}}}
+                        'clpreauth': {'module': 'test:' + testpreauth}}}
 realm, realm2 = cross_realms(2, args=({'realm': 'LOCAL'},
                                       {'realm': 'FOREIGN'}),
                              krb5_conf=krb5conf, get_creds=False)

diff --git a/src/tests/t_etype_info.py b/src/tests/t_etype_info.py
index a3eaac2836e1874acad6d510c565f7f72aa9a90c..e7872bf5d479fc325fcb289a2a50b0a59fc9a70a 100644 (file)
--- a/src/tests/t_etype_info.py
+++ b/src/tests/t_etype_info.py
@@ -79,8 +79,7 @@ realm.stop()
 # indicated by the etype info, and returns NULL if key was selected.
 testpreauth = os.path.join(buildtop, 'plugins', 'preauth', 'test', 'test.so')
 plugconf = {'plugins': {'kdcpreauth': {'module': 'test:' + testpreauth},
-                        'clpreauth': {'module': 'test:' + testpreauth,
-                                      'disable': 'encrypted_timestamp'}}}
+                        'clpreauth': {'module': 'test:' + testpreauth}}}
 conf.update(plugconf)
 realm = K5Realm(create_host=False, get_creds=False, krb5_conf=conf)
 realm.run([kadminl, 'modprinc', '+requires_preauth', realm.user_princ])