- namespace nis-specific configuration

- format doesn't care about the secure flag, so don't bother returning its value

6 files changed, 75 insertions, 74 deletions

diff --git a/configure.ac b/configure.ac
index c235b2b..5f764a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,54 +113,55 @@ AC_DEFINE(DEFAULT_MAX_DGRAM_SIZE,YPMAXRECORD,[Define to the default maximum data
 AC_DEFINE(DEFAULT_MAX_VALUE_SIZE,(256 * 1024),[Define to the default maximum map entry key and value size.])
 AC_DEFINE(DEFAULT_TARGET_REPLY_SIZE,(4 * 1024),[Define to the default target size for a connected reply fragment.])
 
-baseattr=nis-base
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_BASE_ATTR,"$baseattr",
+nisbaseattr=nis-base
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_BASE_ATTR,"$nisbaseattr",
 		   [Define to name of the attribute which lists the containers for entries for a given map.])
-filterattr=nis-filter
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_FILTER_ATTR,"$filterattr",
+nisfilterattr=nis-filter
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_FILTER_ATTR,"$nisfilterattr",
 		   [Define to name of the attribute which holds the filter for selecting entries for a given map.])
-keyformatattr=nis-key-format
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_KEY_ATTR,"$keyformatattr",
+niskeyformatattr=nis-key-format
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_KEY_ATTR,"$niskeyformatattr",
 		   [Define to name of the map configuration attribute which holds the format specifier for single keys for a map entry.])
-keysformatattr=nis-keys-format
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_KEYS_ATTR,"$keysformatattr",
+niskeysformatattr=nis-keys-format
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_KEYS_ATTR,"$niskeysformatattr",
 		   [Define to name of the map configuration attribute which holds the format specifier for possibly-multiple keys for a map entry.])
-valueformatattr=nis-value-format
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_VALUE_ATTR,"$valueformatattr",
+nisvalueformatattr=nis-value-format
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_VALUE_ATTR,"$nisvalueformatattr",
 		   [Define to name of the map configuration attribute which holds the format specifier for the value for a map entry.])
 domainattr=nis-domain
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_DOMAIN_ATTR,"$domainattr",
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_DOMAIN_ATTR,"$domainattr",
 		   [Define to name of the map configuration attribute which holds the name of the domain of the map.])
 mapattr=nis-map
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_MAP_ATTR,"$mapattr",
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_MAP_ATTR,"$mapattr",
 		   [Define to name of the map configuration attribute which holds the name of the map.])
 disallowedcharsattr=nis-disallowed-chars
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_DISALLOWED_CHARS_ATTR,"$disallowedcharsattr",
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_DISALLOWED_CHARS_ATTR,"$disallowedcharsattr",
 		   [Define to the list of characters which should not be allowed in attribute values which are being considered.])
 secureattr=nis-secure
-AC_DEFINE_UNQUOTED(MAP_CONFIGURATION_SECURE_ATTR,"$secureattr",
+AC_DEFINE_UNQUOTED(NIS_MAP_CONFIGURATION_SECURE_ATTR,"$secureattr",
 		   [Define to name of the map configuration attribute which determines whether or not the map is treated a 'secure' map.])
+
 maxvalue_attr=nis-max-value-size
-AC_DEFINE_UNQUOTED(PLUGIN_CONFIGURATION_MAXVALUE_ATTR,"$maxvalue_attr",
+AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONFIGURATION_MAXVALUE_ATTR,"$maxvalue_attr",
 		   [Define to the name of the plugin configuration attribute which holds the maximum size for a NIS entry value.])
 maxdgram_attr=nis-max-dgram-size
-AC_DEFINE_UNQUOTED(PLUGIN_CONFIGURATION_MAXDGRAM_ATTR,"$maxdgram_attr",
+AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONFIGURATION_MAXDGRAM_ATTR,"$maxdgram_attr",
 		   [Define to the name of the plugin configuration attribute which holds the maximum size for a NIS datagram response.])
 securenet_attr=nis-securenet
-AC_DEFINE_UNQUOTED(PLUGIN_CONFIGURATION_SECURENET_ATTR,"$securenet_attr",
+AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONFIGURATION_SECURENET_ATTR,"$securenet_attr",
 		   [Define to the name of the plugin configuration attribute which holds a securenets entry.])
 tcpwrapname_attr=nis-tcp-wrappers-name
-AC_DEFINE_UNQUOTED(PLUGIN_CONFIGURATION_TCPWRAPNAME_ATTR,"$tcpwrapname_attr",
+AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONFIGURATION_TCPWRAPNAME_ATTR,"$tcpwrapname_attr",
 		   [Define to the name of the plugin configuration attribute which holds service name that will be used when evaluating hosts.allow and hosts.deny.])
 port_attr=nsslapd-pluginarg0
-AC_DEFINE_UNQUOTED(PLUGIN_CONFIGURATION_PORT_ATTR,"$port_attr",
+AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONFIGURATION_PORT_ATTR,"$port_attr",
 		   [Define to the name of the plugin configuration attribute which holds the port which the server should use by default.  If none is specified, the server will attempt to use any available port.])
 AC_SUBST(domainattr)
 AC_SUBST(mapattr)
-AC_SUBST(baseattr)
-AC_SUBST(filterattr)
-AC_SUBST(keyformatattr)
-AC_SUBST(valueformatattr)
+AC_SUBST(nisbaseattr)
+AC_SUBST(nisfilterattr)
+AC_SUBST(niskeyformatattr)
+AC_SUBST(nisvalueformatattr)
 AC_SUBST(maxvalue_attr)
 AC_SUBST(maxdgram_attr)
 AC_SUBST(securenet_attr)
diff --git a/doc/plugin.ldif.in b/doc/plugin.ldif.in
index f12c2da..54ac362 100644
--- a/doc/plugin.ldif.in
+++ b/doc/plugin.ldif.in
@@ -18,7 +18,7 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: passwd.byname
-@baseattr@: @people@, @mysuffix@
+@nisbaseattr@: @people@, @mysuffix@
 nis-secure: no
 
 dn: @domainattr@=@mydomain@+@mapattr@=passwd.byuid, cn=NIS Server, cn=plugins, cn=config
@@ -26,7 +26,7 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: passwd.byuid
-@baseattr@: @people@, @mysuffix@
+@nisbaseattr@: @people@, @mysuffix@
 nis-secure: no
 
 dn: @domainattr@=@mydomain@+@mapattr@=group.byname, cn=NIS Server, cn=plugins, cn=config
@@ -34,7 +34,7 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: group.byname
-@baseattr@: @groups@, @mysuffix@
+@nisbaseattr@: @groups@, @mysuffix@
 nis-secure: no
 
 dn: @domainattr@=@mydomain@+@mapattr@=group.bygid, cn=NIS Server, cn=plugins, cn=config
@@ -42,7 +42,7 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: group.bygid
-@baseattr@: @groups@, @mysuffix@
+@nisbaseattr@: @groups@, @mysuffix@
 nis-secure: no
 
 dn: @domainattr@=@mydomain@+@mapattr@=principals.byname, cn=NIS Server, cn=plugins, cn=config
@@ -50,10 +50,10 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: principals.byname
-@baseattr@: @people@, @mysuffix@
-@filterattr@: (&(krbPrincipalName=*)(uid=*))
-@keyformatattr@: %{uid}
-@valueformatattr@: %{uid}:%{krbPrincipalName}
+@nisbaseattr@: @people@, @mysuffix@
+@nisfilterattr@: (&(krbPrincipalName=*)(uid=*))
+@niskeyformatattr@: %{uid}
+@nisvalueformatattr@: %{uid}:%{krbPrincipalName}
 nis-secure: no
 
 dn: @domainattr@=@mydomain@+@mapattr@=principals.byprincipal, cn=NIS Server, cn=plugins, cn=config
@@ -61,9 +61,9 @@ objectclass: top
 objectclass: extensibleObject
 @domainattr@: @mydomain@
 @mapattr@: principals.byprincipal
-@baseattr@: @people@, @mysuffix@
-@filterattr@: (&(krbPrincipalName=*)(uid=*))
-@keyformatattr@: %{krbPrincipalName}
-@valueformatattr@: %{uid}:%{krbPrincipalName}
+@nisbaseattr@: @people@, @mysuffix@
+@nisfilterattr@: (&(krbPrincipalName=*)(uid=*))
+@niskeyformatattr@: %{krbPrincipalName}
+@nisvalueformatattr@: %{uid}:%{krbPrincipalName}
 nis-secure: no
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b2ea0d..2ff593f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(RUNTIME_CFLAGS)
-AM_LDFLAGS = -module -avoid-version -export-symbols-regex nis_plugin_init
+AM_LDFLAGS = -module -avoid-version -export-symbols-regex '.*_plugin_init'
 LIBPTHREAD = @LIBPTHREAD@
 LIBWRAP = @LIBWRAP@
 
diff --git a/src/back-nis.c b/src/back-nis.c
index 1c90d18..f63a30f 100644
--- a/src/back-nis.c
+++ b/src/back-nis.c
@@ -50,7 +50,7 @@
 #include "plug-nis.h"
 #include "map.h"
 
-#define MAP_CONFIGURATION_FILTER "(&(objectClass=*)(" MAP_CONFIGURATION_BASE_ATTR "=*)(" MAP_CONFIGURATION_DOMAIN_ATTR "=*)(" MAP_CONFIGURATION_MAP_ATTR "=*))"
+#define NIS_MAP_CONFIGURATION_FILTER "(&(objectClass=*)(" NIS_MAP_CONFIGURATION_BASE_ATTR "=*)(" NIS_MAP_CONFIGURATION_DOMAIN_ATTR "=*)(" NIS_MAP_CONFIGURATION_MAP_ATTR "=*))"
 
 /* The data we ask the map cache to keep, for us, for each map. */
 struct backend_map_data {
@@ -523,7 +523,7 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 				&default_disallowed_chars);
 	/* Read the values from the configuration entry. */
 	bases = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_BASE_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_BASE_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		count = slapi_valueset_count(values);
@@ -541,8 +541,8 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
 	entry_filter = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_FILTER_ATTR, &values,
-				   &disposition, &actual_attr,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_FILTER_ATTR,
+				   &values, &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		i = slapi_valueset_first_value(values, &value);
 		if (i != -1) {
@@ -565,7 +565,7 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
 	key_formats = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_KEY_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_KEY_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		key_formats = malloc((slapi_valueset_count(values) + 1) *
@@ -584,7 +584,7 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 					buffer_flags);
 	}
 	keys_formats = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_KEYS_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_KEYS_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		keys_formats = malloc((slapi_valueset_count(values) + 1) *
@@ -603,7 +603,7 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 					buffer_flags);
 	}
 	value_format = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_VALUE_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_VALUE_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		i = slapi_valueset_first_value(values, &value);
@@ -614,7 +614,8 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
 	disallowed_chars = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_DISALLOWED_CHARS_ATTR,
+	if (slapi_vattr_values_get(e,
+				   NIS_MAP_CONFIGURATION_DISALLOWED_CHARS_ATTR,
 				   &values, &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		i = slapi_valueset_first_value(values, &value);
@@ -625,8 +626,8 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
 	*secure = FALSE;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_SECURE_ATTR, &values,
-				   &disposition, &actual_attr,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_SECURE_ATTR,
+				   &values, &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		i = slapi_valueset_first_value(values, &value);
 		if (i != -1) {
@@ -799,8 +800,8 @@ backend_map_config_entry_add_cb(Slapi_Entry *e, void *callback_data)
 
 	state = callback_data;
 	domains = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_DOMAIN_ATTR, &values,
-				   &disposition, &actual_attr,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_DOMAIN_ATTR,
+				   &values, &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		count = slapi_valueset_count(values);
 		domains = malloc(sizeof(char *) * (count + 1));
@@ -816,7 +817,7 @@ backend_map_config_entry_add_cb(Slapi_Entry *e, void *callback_data)
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
 	maps = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_MAP_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_MAP_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		count = slapi_valueset_count(values);
@@ -867,11 +868,11 @@ backend_read_params(struct plugin_state *state)
 	int disposition, buffer_flags, i, j;
 	unsigned int uvalue;
 	char *attrs[] = {
-		PLUGIN_CONFIGURATION_MAXVALUE_ATTR,
-		PLUGIN_CONFIGURATION_MAXDGRAM_ATTR,
-		PLUGIN_CONFIGURATION_PORT_ATTR,
-		PLUGIN_CONFIGURATION_SECURENET_ATTR,
-		PLUGIN_CONFIGURATION_TCPWRAPNAME_ATTR,
+		NIS_PLUGIN_CONFIGURATION_MAXVALUE_ATTR,
+		NIS_PLUGIN_CONFIGURATION_MAXDGRAM_ATTR,
+		NIS_PLUGIN_CONFIGURATION_PORT_ATTR,
+		NIS_PLUGIN_CONFIGURATION_SECURENET_ATTR,
+		NIS_PLUGIN_CONFIGURATION_TCPWRAPNAME_ATTR,
 		NULL,
 	};
 	our_dn = slapi_sdn_new_dn_byval(state->plugin_base);
@@ -984,7 +985,7 @@ backend_startup(struct plugin_state *state)
 	slapi_search_internal_set_pb(pb,
 				     state->plugin_base,
 				     LDAP_SCOPE_ONE,
-				     MAP_CONFIGURATION_FILTER,
+				     NIS_MAP_CONFIGURATION_FILTER,
 				     NULL, FALSE,
 				     NULL,
 				     NULL,
@@ -1057,7 +1058,7 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 
 	values = NULL;
 	value = NULL;
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_BASE_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_BASE_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		count = slapi_valueset_count(values);
@@ -1073,7 +1074,7 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 		}
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
-	if (slapi_vattr_values_get(e, MAP_CONFIGURATION_FILTER_ATTR, &values,
+	if (slapi_vattr_values_get(e, NIS_MAP_CONFIGURATION_FILTER_ATTR, &values,
 				   &disposition, &actual_attr,
 				   0, &buffer_flags) == 0) {
 		if (slapi_valueset_first_value(values, &value) != -1) {
@@ -1092,22 +1093,24 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 void
 backend_get_map_config(struct plugin_state *state,
 		       const char *domain, const char *map,
-		       bool_t *secure, char ***bases, char **entry_filter)
+		       char ***bases, char **entry_filter)
 {
 	Slapi_PBlock *pb;
 	char *filter;
-	char *attrs[] = {"filter", "base", NULL};
+	char *attrs[] = {NIS_MAP_CONFIGURATION_FILTER_ATTR,
+			 NIS_MAP_CONFIGURATION_BASE_ATTR,
+			 NULL};
 	const char *default_filter;
 	bool_t map_secure;
 	struct backend_get_map_config_cb cbdata;
 
 	/* Build the search filter. */
 	filter = malloc(strlen("(&("
-			       MAP_CONFIGURATION_DOMAIN_ATTR "=)("
-			       MAP_CONFIGURATION_MAP_ATTR "=)("
-			       MAP_CONFIGURATION_BASE_ATTR "=*))") +
+			       NIS_MAP_CONFIGURATION_DOMAIN_ATTR "=)("
+			       NIS_MAP_CONFIGURATION_MAP_ATTR "=)("
+			       NIS_MAP_CONFIGURATION_BASE_ATTR "=*))") +
 			strlen(domain) + strlen(map) +
-			strlen(MAP_CONFIGURATION_FILTER) + 1);
+			strlen(NIS_MAP_CONFIGURATION_FILTER) + 1);
 	if (filter == NULL) {
 		slapi_log_error(SLAPI_LOG_PLUGIN,
 				state->plugin_desc->spd_id,
@@ -1116,10 +1119,10 @@ backend_get_map_config(struct plugin_state *state,
 		return;
 	}
 	sprintf(filter, "(&("
-		MAP_CONFIGURATION_DOMAIN_ATTR "=%s)("
-		MAP_CONFIGURATION_MAP_ATTR "=%s)("
-		MAP_CONFIGURATION_BASE_ATTR "=*)%s)",
-		domain, map, MAP_CONFIGURATION_FILTER);
+		NIS_MAP_CONFIGURATION_DOMAIN_ATTR "=%s)("
+		NIS_MAP_CONFIGURATION_MAP_ATTR "=%s)("
+		NIS_MAP_CONFIGURATION_BASE_ATTR "=*)%s)",
+		domain, map, NIS_MAP_CONFIGURATION_FILTER);
 
 	/* Perform the search. */
 	pb = slapi_pblock_new();
@@ -1144,9 +1147,6 @@ backend_get_map_config(struct plugin_state *state,
 					  NULL);
 
 	/* Return the results. */
-	if (secure) {
-		*secure = map_secure;
-	}
 	*bases = cbdata.bases;
 	*entry_filter = backend_map_config_filter(cbdata.entry_filter,
 						  domain, map);
@@ -1224,7 +1224,7 @@ backend_entry_is_a_map(struct plugin_state *state,
 	Slapi_DN *entry_sdn, *plugin_sdn;
 	Slapi_Filter *filter;
 	bool_t ret;
-	char map_configuration_filter[] = MAP_CONFIGURATION_FILTER;
+	char map_configuration_filter[] = NIS_MAP_CONFIGURATION_FILTER;
 
 	/* First, just do the scope test. */
 	entry_sdn = slapi_sdn_new_ndn_byref(slapi_entry_get_ndn(e));
@@ -1266,7 +1266,7 @@ backend_entry_is_a_map(struct plugin_state *state,
 						"(didn't match filter "
 						"\"%s\")\n",
 						slapi_sdn_get_ndn(entry_sdn),
-						MAP_CONFIGURATION_FILTER);
+						NIS_MAP_CONFIGURATION_FILTER);
 				ret = FALSE;
 			}
 			slapi_filter_free(filter, 1);
diff --git a/src/back-nis.h b/src/back-nis.h
index b7da151..a97fc18 100644
--- a/src/back-nis.h
+++ b/src/back-nis.h
@@ -29,6 +29,6 @@ void backend_startup(struct plugin_state *state);
 void backend_init(struct slapi_pblock *pb, struct plugin_state *state);
 void backend_get_map_config(struct plugin_state *state,
 			    const char *domain, const char *map,
-			    bool_t *secure, char ***bases, char **entry_filter);
+			    char ***bases, char **entry_filter);
 void backend_free_map_config(char **bases, char *entry_filter);
 #endif
diff --git a/src/format.c b/src/format.c
index f598ac7..4734634 100644
--- a/src/format.c
+++ b/src/format.c
@@ -820,7 +820,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	/* Retrieve the map-specific paramters. */
 	map_filter = NULL;
 	map_bases = NULL;
-	backend_get_map_config(state, domain, argv[1], NULL,
+	backend_get_map_config(state, domain, argv[1],
 			       &map_bases, &map_filter);
 	if (map_filter == NULL) {
 		map_filter = "(objectClass=*)";