From ecdd6c1cfb668237d0af48231ee903407f656c20 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 19 Apr 2010 17:32:26 +0000
Subject: [PATCH] cleanup
---
servers/slapd/config.c | 48 +++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 071efb6f0f..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 },
--
GitLab