svn rev #22412: trunk/src/plugins/kdb/ldap/libkdb_ldap/

ghudson@MIT.EDU ghudson at MIT.EDU
Wed Jun 17 11:08:25 EDT 2009


http://src.mit.edu/fisheye/changelog/krb5/?cs=22412
Commit By: ghudson
Log Message:
In ldap_create.c, remove four incorrect uses of krb5_set_error_message
which resulted in obscured and confusing error diagnostics.



Changed Files:
U   trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c	2009-06-11 17:27:45 UTC (rev 22411)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c	2009-06-17 15:08:25 UTC (rev 22412)
@@ -280,13 +280,10 @@
 
 	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 @@
 	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 @@
     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) ||




More information about the cvs-krb5 mailing list