*/
struct slap_limits_set deflimit = {
SLAPD_DEFAULT_TIMELIMIT, /* backward compatible limits */
- SLAPD_DEFAULT_TIMELIMIT,
+ 0,
SLAPD_DEFAULT_SIZELIMIT, /* backward compatible limits */
- SLAPD_DEFAULT_SIZELIMIT,
+ 0,
-1, /* no limit on unchecked size */
0, /* page limit */
0, /* hide number of entries left */
- SLAPD_DEFAULT_SIZELIMIT /* number of total entries returned by pagedResults equal to hard limit */
+ 0 /* number of total entries returned by pagedResults equal to hard limit */
};
AccessControl *global_acl = NULL;
lutil_salt_format( cargv[1] );
- /* SASL config options */
- } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) {
- if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
- return 1;
#ifdef SLAP_SASL_REWRITE
/* use authid rewrite instead of sasl regexp */
- } else if ( strncasecmp( cargv[0], "authid-rewrite", sizeof("authid-rewrite") - 1 ) == 0 ) {
+ } else if ( strncasecmp( cargv[0], "auth-rewrite",
+ sizeof("auth-rewrite") - 1 ) == 0 )
+ {
int rc = slap_sasl_rewrite_config( fname, lineno,
cargc, cargv );
if ( rc ) {
}
#endif /* SLAP_SASL_REWRITE */
+ /* Auth + SASL config options */
+ } else if ( !strncasecmp( cargv[0], "auth", sizeof("auth")-1 ) ||
+ !strncasecmp( cargv[0], "sasl", sizeof("sasl")-1 ))
+ {
+ if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
+ return 1;
+
+
} else if ( strcasecmp( cargv[0], "schemadn" ) == 0 ) {
struct berval dn;
if ( cargc < 2 ) {
#endif
}
}
- lim->lms_s_hard = lim->lms_s_soft;
- lim->lms_s_pr_total = lim->lms_s_soft;
+ lim->lms_s_hard = 0;
}
}
#endif
}
}
- lim->lms_t_hard = lim->lms_t_soft;
+ lim->lms_t_hard = 0;
}
}