diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-06-17 15:08:25 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-06-17 15:08:25 +0000 |
| commit | abf934e1108e0a35042f17b2a5505586aa03b278 (patch) | |
| tree | ac856b74ee927dc08eadc91e47f8698ac29fffcc /src/plugins | |
| parent | e533f7a272e52bc446a14836650abda90b6770e2 (diff) | |
| download | krb5-abf934e1108e0a35042f17b2a5505586aa03b278.zip krb5-abf934e1108e0a35042f17b2a5505586aa03b278.tar.gz krb5-abf934e1108e0a35042f17b2a5505586aa03b278.tar.bz2 | |
In ldap_create.c, remove four incorrect uses of krb5_set_error_message
which resulted in obscured and confusing error diagnostics.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22412 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c index c71d9e5..c048c93 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c @@ -280,13 +280,10 @@ krb5_ldap_create (krb5_context context, char *conf_section, char **db_args) status = krb5_ldap_read_krbcontainer_params(context, &(ldap_context->krbcontainer)); - if (status) { - krb5_set_error_message(context, status, "while reading kerberos container information"); + if (status) goto cleanup; - } } else if (status) { - krb5_set_error_message(context, status, "while reading kerberos container information"); goto cleanup; } @@ -302,10 +299,8 @@ krb5_ldap_create (krb5_context context, char *conf_section, char **db_args) goto cleanup; } - if ((status = krb5_ldap_create_realm(context, rparams, mask))) { - krb5_set_error_message(context, status, "while creating realm object entry"); + if ((status = krb5_ldap_create_realm(context, rparams, mask))) goto cleanup; - } /* We just created the Realm container. Here starts our transaction tracking */ realm_obj_created = TRUE; @@ -314,10 +309,8 @@ krb5_ldap_create (krb5_context context, char *conf_section, char **db_args) if ((status = krb5_ldap_read_realm_params(context, rparams->realm_name, &(ldap_context->lrparams), - &mask))) { - krb5_set_error_message(context, status, "while reading realm object entry"); + &mask))) goto cleanup; - } #ifdef HAVE_EDIRECTORY if ((mask & LDAP_REALM_KDCSERVERS) || (mask & LDAP_REALM_ADMINSERVERS) || |