diff options
author | Ken Raeburn <raeburn@mit.edu> | 2006-07-18 00:40:19 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2006-07-18 00:40:19 +0000 |
commit | 42d9d6ab320ee3a661fe21472be542acd542d5be (patch) | |
tree | ab3049772f6c2cceaf8956cf0a1172e0f6ddc12a /src/lib/kdb | |
parent | 6eb696bf5669ec60b55927d974b48bbadc62bc66 (diff) | |
download | krb5-42d9d6ab320ee3a661fe21472be542acd542d5be.tar.gz krb5-42d9d6ab320ee3a661fe21472be542acd542d5be.tar.xz krb5-42d9d6ab320ee3a661fe21472be542acd542d5be.zip |
Merge remaining changes from LDAP integration branch
svn+ssh://svn.mit.edu/krb5/branches/ldap-integ@18333.
* plugins/kdb/ldap: New directory.
* aclocal.m4 (WITH_LDAP): New macro.
(CONFIG_RULES): Invoke it.
* configure.in: Test ldap option, maybe configure and generate makefiles for
new directories, and set and substitute ldap_plugin_dir.
* Makefile.in (SUBDIRS): Add @ldap_plugin_dir@.
* kdc/krb5kdc.M, kadmin/server/kadmind.M, kadmin/cli/kadmin.M,
config-files/krb5.conf.M: Document LDAP changes (new options, config file
entries, etc).
* lib/kdb/kdb5.c (kdb_load_library): Put more info in error message.
* lib/kadm5/admin.h (KADM5_CPW_FUNCTION, KADM5_RANDKEY_USED,
KADM5_CONFIG_PASSWD_SERVER): New macros, disabled for now.
(struct _kadm5_config_params): New field kpasswd_server, commented out for now.
* lib/krb5/error_tables/kdb5_err.et: Add error codes KRB5_KDB_ACCESS_ERROR,
KRB5_KDB_INTERNAL_ERROR, KRB5_KDB_CONSTRAINT_VIOLATION.
ticket: 2935
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18334 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb')
-rw-r--r-- | src/lib/kdb/kdb5.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index d59a7cf769..ca9a653afa 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -384,8 +384,9 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) if (vftabl_addrs[0] == NULL) { /* No plugins! */ status = KRB5_KDB_DBTYPE_NOTFOUND; - krb5_set_error_message (kcontext, status, - "Unable to find requested database type"); + krb5_set_error_message (kcontext, status, + _("Unable to find requested database module '%s': plugin symbol 'kdb_function_table' not found"), + lib_name); goto clean_n_exit; } |