diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-10-12 02:39:14 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-10-12 02:39:14 +0000 |
| commit | 1701b402682dea7f3d943f2d3e2727b449b0e4a7 (patch) | |
| tree | f672b8c2924fa557d23955ac582dc27bf92f2495 /src/plugins | |
| parent | b6566c53d1aa9234b3789a15698bb672148db6ad (diff) | |
| download | krb5-1701b402682dea7f3d943f2d3e2727b449b0e4a7.tar.gz krb5-1701b402682dea7f3d943f2d3e2727b449b0e4a7.tar.xz krb5-1701b402682dea7f3d943f2d3e2727b449b0e4a7.zip | |
Another patch from Will Fiveash, to make "kdb5_util load <dumpfile>"
work with the LDAP KDB back end, in simple cases (all entries stored
under the krbcontainer entry).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18690 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c | 7 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c index 236ff190b..5aed96237 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c @@ -374,9 +374,10 @@ krb5_error_code krb5_ldap_open(krb5_context context, sprintf(ldap_context->root_certificate_file,"%s %s", oldstr, val); free (oldstr); } - } - /* ignore hash argument. Might have been passed from create */ - else { + } else if (opt && !strcmp(opt, "temporary")) { + /* ignore temporary argument, it is a kdb5_util arg meant for db2 */ + } else { + /* ignore hash argument. Might have been passed from create */ status = EINVAL; krb5_set_error_message (context, status, "unknown option \'%s\'", opt?opt:val); diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c index d4b73c37b..54f0576ae 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c @@ -218,9 +218,10 @@ krb5_ldap_create (krb5_context context, char *conf_section, char **db_args) sprintf(ldap_context->root_certificate_file,"%s %s", oldstr, val); free (oldstr); } - } + } else if (opt && !strcmp(opt, "temporary")) { + /* ignore temporary argument, it is a kdb5_util arg meant for db2 */ + } else { /* ignore hash argument. Might have been passed from create */ - else { status = EINVAL; krb5_set_error_message (context, status, "unknown option \'%s\'", opt?opt:val); |