-LDAP_SLAPD_F (slap_mask_t) global_restrictops;
-LDAP_SLAPD_F (slap_mask_t) global_allows;
-LDAP_SLAPD_F (slap_mask_t) global_disallows;
-LDAP_SLAPD_F (slap_mask_t) global_requires;
-LDAP_SLAPD_F (slap_ssf_set_t) global_ssf_set;
-
-LDAP_SLAPD_F (struct berval **) default_referral;
-LDAP_SLAPD_F (char *) replogfile;
-LDAP_SLAPD_F (const char) Versionstr[];
-LDAP_SLAPD_F (int) defsize;
-LDAP_SLAPD_F (int) deftime;
-LDAP_SLAPD_F (int) g_argc;
-LDAP_SLAPD_F (slap_access_t) global_default_access;
-LDAP_SLAPD_F (int) global_lastmod;
-LDAP_SLAPD_F (int) global_idletimeout;
-LDAP_SLAPD_F (int) global_schemacheck;
-LDAP_SLAPD_F (char) *global_host;
-LDAP_SLAPD_F (char) *global_realm;
-LDAP_SLAPD_F (char) *default_passwd_hash;
-LDAP_SLAPD_F (int) lber_debug;
-LDAP_SLAPD_F (int) ldap_syslog;
-LDAP_SLAPD_F (char *) default_search_base;
-LDAP_SLAPD_F (char *) default_search_nbase;
-
-LDAP_SLAPD_F (int) nSaslRegexp;
-LDAP_SLAPD_F (SaslRegexp_t*) SaslRegexp;
-
-LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) num_sent_mutex;
-LDAP_SLAPD_F (long) num_bytes_sent;
-LDAP_SLAPD_F (long) num_pdu_sent;
-LDAP_SLAPD_F (long) num_entries_sent;
-LDAP_SLAPD_F (long) num_refs_sent;
-
-LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) num_ops_mutex;
-LDAP_SLAPD_F (long) num_ops_completed;
-LDAP_SLAPD_F (long) num_ops_initiated;
-
-LDAP_SLAPD_F (char *) slapd_pid_file;
-LDAP_SLAPD_F (char *) slapd_args_file;
-LDAP_SLAPD_F (char) **g_argv;
-LDAP_SLAPD_F (time_t) starttime;
-
-LDAP_SLAPD_F (time_t) slap_get_time LDAP_P((void));
-
-LDAP_SLAPD_F (ldap_pvt_thread_pool_t) connection_pool;
-
-LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) entry2str_mutex;
-LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) replog_mutex;
+/*
+ * Other...
+ */
+#define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1)
+#define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1)
+
+LDAP_SLAPD_V(unsigned) num_subordinates;
+
+LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming;
+LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_auth;
+
+LDAP_SLAPD_V (slap_mask_t) global_restrictops;
+LDAP_SLAPD_V (slap_mask_t) global_allows;
+LDAP_SLAPD_V (slap_mask_t) global_disallows;
+LDAP_SLAPD_V (slap_mask_t) global_requires;
+LDAP_SLAPD_V (slap_ssf_set_t) global_ssf_set;
+
+LDAP_SLAPD_V (BVarray) default_referral;
+LDAP_SLAPD_V (char *) replogfile;
+LDAP_SLAPD_V (const char) Versionstr[];
+LDAP_SLAPD_V (struct slap_limits_set) deflimit;
+
+LDAP_SLAPD_V (slap_access_t) global_default_access;
+LDAP_SLAPD_V (int) global_lastmod;
+LDAP_SLAPD_V (int) global_idletimeout;
+LDAP_SLAPD_V (int) global_schemacheck;
+LDAP_SLAPD_V (char *) global_host;
+LDAP_SLAPD_V (char *) global_realm;
+LDAP_SLAPD_V (int) sasl_external_x509dn_convert;
+LDAP_SLAPD_V (char *) default_passwd_hash;
+LDAP_SLAPD_V (int) lber_debug;
+LDAP_SLAPD_V (int) ldap_syslog;
+LDAP_SLAPD_V (struct berval) default_search_base;
+LDAP_SLAPD_V (struct berval) default_search_nbase;
+
+LDAP_SLAPD_V (int) nSaslRegexp;
+LDAP_SLAPD_V (SaslRegexp_t*) SaslRegexp;
+
+LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_sent_mutex;
+LDAP_SLAPD_V (unsigned long) num_bytes_sent;
+LDAP_SLAPD_V (unsigned long) num_pdu_sent;
+LDAP_SLAPD_V (unsigned long) num_entries_sent;
+LDAP_SLAPD_V (unsigned long) num_refs_sent;
+
+LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_ops_mutex;
+LDAP_SLAPD_V (unsigned long) num_ops_completed;
+LDAP_SLAPD_V (unsigned long) num_ops_initiated;
+
+LDAP_SLAPD_V (char *) slapd_pid_file;
+LDAP_SLAPD_V (char *) slapd_args_file;
+LDAP_SLAPD_V (time_t) starttime;
+
+/* use time(3) -- no mutex */
+#define slap_get_time() time( NULL )
+
+LDAP_SLAPD_V (ldap_pvt_thread_pool_t) connection_pool;
+LDAP_SLAPD_V (int) connection_pool_max;
+
+LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) entry2str_mutex;
+LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) replog_mutex;