ITS#9363 Set appropriate defaults where needed

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 06af74ef374cefe8e4c7620cd9b890150a67cc94..6adafd63c444133448a6253d13dd6cb27962acd8 100644 (file)
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -110,7 +110,8 @@ static ConfigTable mdbcfg[] = {
                "( OLcfgDbAt:12.5 NAME 'olcDbRtxnSize' "
                "DESC 'Number of entries to process in one read transaction' "
                "EQUALITY integerMatch "
-               "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+               "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+               { .v_uint = DEFAULT_RTXN_SIZE } },
        { "searchstack", "depth", 2, 2, 0, ARG_INT|ARG_MAGIC|MDB_SSTACK,
                mdb_cf_gen, "( OLcfgDbAt:1.9 NAME 'olcDbSearchStack' "
                "DESC 'Depth of search stack in IDLs' "

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 7eb815e1b13c20047d0818876c7cfcd68d80897e..d0647f263fbf036e890267a8552c5e5306469132 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -424,11 +424,13 @@ static ConfigTable config_back_cf_table[] = {
        { "index_substr_any_len", "len", 2, 2, 0, ARG_UINT|ARG_NONZERO,
                &index_substr_any_len, "( OLcfgGlAt:22 NAME 'olcIndexSubstrAnyLen' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+                       { .v_uint = SLAP_INDEX_SUBSTR_ANY_LEN_DEFAULT } },
        { "index_substr_any_step", "step", 2, 2, 0, ARG_UINT|ARG_NONZERO,
                &index_substr_any_step, "( OLcfgGlAt:23 NAME 'olcIndexSubstrAnyStep' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+                       { .v_uint = SLAP_INDEX_SUBSTR_ANY_STEP_DEFAULT } },
        { "index_intlen", "len", 2, 2, 0, ARG_UINT|ARG_MAGIC|CFG_IX_INTLEN,
                &config_generic, "( OLcfgGlAt:84 NAME 'olcIndexIntLen' "
                        "EQUALITY integerMatch "
@@ -461,7 +463,8 @@ static ConfigTable config_back_cf_table[] = {
        { "localSSF", "ssf", 2, 2, 0, ARG_INT,
                &local_ssf, "( OLcfgGlAt:26 NAME 'olcLocalSSF' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+                       { .v_int = LDAP_PVT_SASL_LOCAL_SSF } },
        { "logfile", "file", 2, 2, 0, ARG_STRING|ARG_MAGIC|CFG_LOGFILE,
                &config_generic, "( OLcfgGlAt:27 NAME 'olcLogFile' "
                        "EQUALITY caseExactMatch "
@@ -686,11 +689,13 @@ static ConfigTable config_back_cf_table[] = {
        { "sockbuf_max_incoming", "max", 2, 2, 0, ARG_BER_LEN_T,
                &sockbuf_max_incoming, "( OLcfgGlAt:61 NAME 'olcSockbufMaxIncoming' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+                       { .v_ber_t = SLAP_SB_MAX_INCOMING_DEFAULT } },
        { "sockbuf_max_incoming_auth", "max", 2, 2, 0, ARG_BER_LEN_T,
                &sockbuf_max_incoming_auth, "( OLcfgGlAt:62 NAME 'olcSockbufMaxIncomingAuth' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+                       { .v_ber_t = SLAP_SB_MAX_INCOMING_AUTH } },
        { "sortvals", "attr", 2, 0, 0, ARG_MAGIC|CFG_SORTVALS,
                &config_generic, "( OLcfgGlAt:83 NAME 'olcSortVals' "
                        "DESC 'Attributes whose values will always be sorted' "

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index f25049d61b5d3fd5d450e8e16ce32e5fdd792061..14c3c088f0a19b60c8f19e241ceed922fb06245c 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -1292,14 +1292,16 @@ static ConfigTable sssvlv_cfg[] = {
                "( OLcfgOvAt:21.2 NAME 'olcSssVlvMaxKeys' "
                        "DESC 'Maximum number of Keys in a Sort request' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+               { .v_int = SSSVLV_DEFAULT_MAX_KEYS } },
        { "sssvlv-maxperconn", "num",
                2, 2, 0, ARG_INT|ARG_OFFSET,
                        (void *)offsetof(sssvlv_info, svi_max_percon),
                "( OLcfgOvAt:21.3 NAME 'olcSssVlvMaxPerConn' "
                        "DESC 'Maximum number of concurrent paged search requests per connection' "
                        "EQUALITY integerMatch "
-                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsInteger SINGLE-VALUE )", NULL,
+               { .v_int = SSSVLV_DEFAULT_MAX_REQUEST_PER_CONN } },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };