diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-04-26 04:33:48 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-04-26 04:33:48 +0000 |
| commit | d85fbcebd2d4880972e8565a3d5aba492ef59431 (patch) | |
| tree | 2eea96479aea9dcc09d1545caa8f6a046a26d56f /src/util | |
| parent | 60ccf0f7dc305b89179df2454b95a021fbcb09cb (diff) | |
| download | krb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.tar.gz krb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.tar.xz krb5-d85fbcebd2d4880972e8565a3d5aba492ef59431.zip | |
Flip the default of start_kadmind in k5test.py
Very few Python tests need kadmind, so it makes more sense to have to
turn it on than to have to turn it off.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25825 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/k5test.py | 6 | ||||
| -rw-r--r-- | src/util/testrealm.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py index 1cd274a1e..0d0405290 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -53,7 +53,7 @@ By default, the realm will have: self-contained test operation * Two different kdc.conf files for the master and slave KDCs * A fresh DB2 KDB -* Running krb5kdc and kadmind processes +* Running krb5kdc (but not kadmind) * Principals named realm.user_princ and realm.admin_princ; call password('user') and password('admin') to get the password * Credentials for realm.user_princ in realm.ccache @@ -119,7 +119,7 @@ keyword arguments: * start_kdc=False: Don't start the KDC. Implies get_creds=False. -* start_kadmind=False: Don't start kadmind. +* start_kadmind=True: Start kadmind. * get_creds=False: Don't get user credentials. @@ -677,7 +677,7 @@ class K5Realm(object): def __init__(self, realm='KRBTEST.COM', portbase=61000, testdir='testdir', krb5_conf=None, kdc_conf=None, create_kdb=True, krbtgt_keysalt=None, create_user=True, get_creds=True, - create_host=True, start_kdc=True, start_kadmind=True): + create_host=True, start_kdc=True, start_kadmind=False): global hostname, _default_krb5_conf, _default_kdc_conf self.realm = realm diff --git a/src/util/testrealm.py b/src/util/testrealm.py index 53f062250..0bf976d40 100644 --- a/src/util/testrealm.py +++ b/src/util/testrealm.py @@ -56,10 +56,10 @@ def supplement_path(env): env['PATH'] = path_prefix + env['PATH'] if args: - realms = cross_realms(int(args[0])) + realms = cross_realms(int(args[0]), start_kadmind=True) realm = realms[0] else: - realm = K5Realm() + realm = K5Realm(start_kadmind=True) env = realm.env_master.copy() supplement_path(env) |