X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=0ebcf7da14f11feedbcaf2c314be833b68175d80;hb=ecdd6c1cfb668237d0af48231ee903407f656c20;hp=6cec953681ec67ea3ae1fe518f7fe96eef45e90e;hpb=1ebe532fb6fd5ca746710740c0f58469b2855092;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 6cec953681..0ebcf7da14 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1210,30 +1210,6 @@ static slap_verbmasks versionkey[] = {
 	{ BER_BVNULL, 0 }
 };
 
-static int
-slap_sb_uri(
-	struct berval *val,
-	void *bcp,
-	slap_cf_aux_table *tab0,
-	const char *tabmsg,
-	int unparse )
-{
-	slap_bindconf *bc = bcp;
-	if ( unparse ) {
-		if ( bc->sb_uri.bv_len >= val->bv_len )
-			return -1;
-		val->bv_len = bc->sb_uri.bv_len;
-		AC_MEMCPY( val->bv_val, bc->sb_uri.bv_val, val->bv_len );
-	} else {
-		bc->sb_uri = *val;
-#ifdef HAVE_TLS
-		if ( ldap_is_ldaps_url( val->bv_val ))
-			bc->sb_tls_do_init = 1;
-#endif
-	}
-	return 0;
-}
-
 static int 
 slap_keepalive_parse(
 	struct berval *val,
@@ -1320,6 +1296,30 @@ slap_keepalive_parse(
 	return 0;
 }
 
+static int
+slap_sb_uri(
+	struct berval *val,
+	void *bcp,
+	slap_cf_aux_table *tab0,
+	const char *tabmsg,
+	int unparse )
+{
+	slap_bindconf *bc = bcp;
+	if ( unparse ) {
+		if ( bc->sb_uri.bv_len >= val->bv_len )
+			return -1;
+		val->bv_len = bc->sb_uri.bv_len;
+		AC_MEMCPY( val->bv_val, bc->sb_uri.bv_val, val->bv_len );
+	} else {
+		bc->sb_uri = *val;
+#ifdef HAVE_TLS
+		if ( ldap_is_ldaps_url( val->bv_val ))
+			bc->sb_tls_do_init = 1;
+#endif
+	}
+	return 0;
+}
+
 static slap_cf_aux_table bindkey[] = {
 	{ BER_BVC("uri="), 0, 'x', 1, slap_sb_uri },
 	{ BER_BVC("version="), offsetof(slap_bindconf, sb_version), 'i', 0, versionkey },
@@ -1572,26 +1572,6 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0
 			}
 			break;
 
-		case 'x':
-			*ptr++ = ' ';
-			ptr = lutil_strcopy( ptr, tab->key.bv_val );
-			if ( tab->quote ) *ptr++ = '"';
-			if ( tab->aux != NULL ) {
-				struct berval value;
-				slap_cf_aux_table_parse_x *func = (slap_cf_aux_table_parse_x *)tab->aux;
-				int rc;
-
-				value.bv_val = ptr;
-				value.bv_len = buf + sizeof( buf ) - ptr;
-
-				rc = func( &value, (void *)((char *)src + tab->off), tab, "(unparse)", 1 );
-				if ( rc == 0 ) {
-					ptr += value.bv_len;
-				}
-			}
-			if ( tab->quote ) *ptr++ = '"';
-			break;
-
 		default:
 			assert( 0 );
 		}