- set up defaults for automount maps

1 files changed, 27 insertions, 9 deletions

diff --git a/src/defaults.c b/src/defaults.c
index 617cb77..de4a30e 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -23,6 +23,7 @@
 #include "../config.h"
 #endif
 
+#include <fnmatch.h>
 #include <string.h>
 
 #define DEFAULT_ENTRY_FILTER "(&(nisMapName=%m)(objectClass=nisObject))"
@@ -30,24 +31,30 @@
 #define DEFAULT_VALUE_FORMAT "%{nisMapEntry}"
 
 static struct configuration {
-	char *map, *filter, *key_format, *value_format;
+	char *map;
+	enum { config_exact, config_glob } config_match;
+	char *filter, *key_format, *value_format;
 } config[] = {
-	{"passwd.byname",
+	{"passwd.byname", config_exact,
 	 "(objectClass=posixAccount)",
 	 "%{uid}",
 	 "%{uid}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"},
-	{"passwd.bynumber",
+	{"passwd.bynumber", config_exact,
 	 "(objectClass=posixAccount)",
 	 "%{uidNumber}",
 	 "%{uid}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"},
-	{"group.byname",
+	{"group.byname", config_exact,
 	 "(objectClass=posixGroup)",
 	 "%{cn}",
 	 "%{cn}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"},
-	{"group.bynumber",
+	{"group.bynumber", config_exact,
 	 "(objectClass=posixGroup)",
 	 "%{gidNumber}",
 	 "%{cn}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"},
+	{"auto.*", config_glob,
+	 "(objectClass=automount)",
+	 "%{automountKey}",
+	 "%{automountInformation}"},
 };
 
 void
@@ -61,10 +68,21 @@ defaults_get_map_config(const char *mapname,
 	*key_format = DEFAULT_KEY_FORMAT;
 	*value_format = DEFAULT_VALUE_FORMAT;
 	for (i = 0; i < sizeof(config) / sizeof(config[0]); i++) {
-		if (strcmp(mapname, config[i].map) == 0) {
-			*filter = config[i].filter;
-			*key_format = config[i].key_format;
-			*value_format = config[i].value_format;
+		switch (config[i].config_match) {
+		case config_exact:
+			if (strcmp(config[i].map, mapname) == 0) {
+				*filter = config[i].filter;
+				*key_format = config[i].key_format;
+				*value_format = config[i].value_format;
+			}
+			break;
+		case config_glob:
+			if (fnmatch(config[i].map, mapname,
+				    FNM_NOESCAPE) == 0) {
+				*filter = config[i].filter;
+				*key_format = config[i].key_format;
+				*value_format = config[i].value_format;
+			}
 			break;
 		}
 	}