Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-meta / config.c

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 0be9ed8de9461e34324decbb0fecc9e99298d384..abdae967d1bf51fd37056d3f810bec978d1927fb 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Copyright 1999-2014 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -23,6 +23,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ctype.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>
@@ -30,12 +31,11 @@
 #include "slap.h"
 #include "config.h"
 #include "lutil.h"
+#include "ldif.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
-#ifdef LDAP_DEVEL
 #define SLAP_AUTH_DN   1
-#endif
 
 static ConfigDriver meta_back_cf_gen;
 static ConfigLDAPadd meta_ldadd;
@@ -1711,7 +1711,7 @@ meta_back_cf_gen( ConfigArgs *c )
 
 #ifdef SLAPD_META_CLIENT_PR
                case LDAP_BACK_CFG_CLIENT_PR:
-                       mc->mc_ps == META_CLIENT_PR_DISABLE;
+                       mc->mc_ps = META_CLIENT_PR_DISABLE;
                        break;
 #endif /* SLAPD_META_CLIENT_PR */
 
@@ -1732,7 +1732,7 @@ meta_back_cf_gen( ConfigArgs *c )
                        break;
 
                case LDAP_BACK_CFG_NRETRIES:
-                       mc->mc_nretries == META_RETRY_DEFAULT;
+                       mc->mc_nretries = META_RETRY_DEFAULT;
                        break;
 
                case LDAP_BACK_CFG_QUARANTINE: