summaryrefslogtreecommitdiffstats
path: root/src/tests/t_kdb.py
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-01-28 20:15:01 -0500
committerGreg Hudson <ghudson@mit.edu>2013-01-28 20:31:19 -0500
commit0b1dc2f93da4c860dd27f1ac997617b712dff383 (patch)
tree42708b1e4393c9fe3f49969aefb8143844189533 /src/tests/t_kdb.py
parent2743fdee849be4a00a9ea72d601004c95b22dd56 (diff)
downloadkrb5-0b1dc2f93da4c860dd27f1ac997617b712dff383.tar.gz
krb5-0b1dc2f93da4c860dd27f1ac997617b712dff383.tar.xz
krb5-0b1dc2f93da4c860dd27f1ac997617b712dff383.zip
Refactor LDAP DB option parsing code
krb5_ldap_open and krb5_ldap_create contain two large, almost identical blocks of DB option processing code. Factor it out into a new function krb5_ldap_parse_db_params in ldap_misc.c, and simplify the factored-out code. Create a helper function to add server entries and use it to simplify krb5_ldap_read_server_params as well as DB option parsing. Since the new DB option helper uses isspace instead of isblank, we no longer require portability goop for isblank.
Diffstat (limited to 'src/tests/t_kdb.py')
-rw-r--r--src/tests/t_kdb.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/t_kdb.py b/src/tests/t_kdb.py
index 3c664f0ef4..e9769f76ee 100644
--- a/src/tests/t_kdb.py
+++ b/src/tests/t_kdb.py
@@ -249,7 +249,7 @@ realm.stop()
dumpfile = os.path.join(realm.testdir, 'dump')
realm.run([kdb5_util, 'dump', dumpfile])
out = realm.run([kdb5_util, 'load', dumpfile], expected_code=1)
-if 'plugin requires -update argument' not in out:
+if 'KDB module requires -update argument' not in out:
fail('Unexpected error from kdb5_util load without -update')
realm.run([kdb5_util, 'load', '-update', dumpfile])