krb5 commit: Simplify test preauth module use

[Greg Hudson]

https://github.com/krb5/krb5/commit/8b6d2227be777c4ef62bec796e864020db03031b
commit 8b6d2227be777c4ef62bec796e864020db03031b
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Jul 23 12:33:07 2015 -0400

    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.

 src/plugins/preauth/test/kdctest.c |    5 -----
 src/tests/t_authdata.py            |    3 +--
 src/tests/t_etype_info.py          |    3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/plugins/preauth/test/kdctest.c b/src/plugins/preauth/test/kdctest.c
index c824626..5ac1cd1 100644
--- 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 8da206d..d98c3fd 100644
--- 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 a3eaac2..e7872bf 100644
--- 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])