X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdnssrv.c;h=cc193e93582bef587dcfb15c511b60feaf00d18d;hb=fe86a81e251bda73f04841f765b2a93ac0354396;hp=f67cdbbe9df29905de1a18a7b9f948784d193250;hpb=5df2c83b3833d1a873f98f44bd9545110b7ddfc1;p=openldap

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index f67cdbbe9d..cc193e9358 100644
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -41,9 +41,8 @@ int ldap_dn2domain(
 	char *domain = NULL;
 	char **dn;
 
-	if( dn_in == NULL || domainp == NULL ) {
-		return -1;
-	}
+	assert( dn_in != NULL );
+	assert( domainp != NULL );
 
 	dn = ldap_explode_dn( dn_in, 0 );
 
@@ -147,12 +146,12 @@ int ldap_domain2dn(
     char *domain, *s, *tok_r, *dn;
     size_t loc;
 
-    if (domain_in == NULL || dnp == NULL) {
-	return LDAP_NO_MEMORY;
-    }
+	assert( domain_in != NULL );
+	assert( dnp != NULL );
+
     domain = LDAP_STRDUP(domain_in);
     if (domain == NULL) {
-	return LDAP_NO_MEMORY;
+		return LDAP_NO_MEMORY;
     }
     dn = NULL;
     loc = 0;
@@ -200,18 +199,16 @@ int ldap_domain2hostlist(
     int rc, len, cur = 0;
     unsigned char reply[1024];
 
-	if( domain == NULL || *domain == '\0' ) {
-		return LDAP_PARAM_ERROR;
-	}
+	assert( domain != NULL );
+	assert( list != NULL );
 
-	if( list == NULL ) {
+	if( *domain == '\0' ) {
 		return LDAP_PARAM_ERROR;
 	}
 
     request = LDAP_MALLOC(strlen(domain) + sizeof("_ldap._tcp."));
     if (request == NULL) {
-	rc = LDAP_NO_MEMORY;
-	goto out;
+		return LDAP_NO_MEMORY;
     }
     sprintf(request, "_ldap._tcp.%s", domain);