From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 23 Jul 2015 16:33:07 +0000 (-0400)
Subject: Simplify test preauth module use
X-Git-Tag: krb5-1.14-alpha1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b6d2227be777c4ef62bec796e864020db03031b;p=thirdparty%2Fkrb5.git

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 c824626de6..5ac1cd1f56 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 8da206d1bf..d98c3fd52c 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 a3eaac2836..e7872bf5d4 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])