autofs-5.0.9 - amd lookup rework config handling

From: Ian Kent <ikent@redhat.com>

Re-work the autofs configuration sub-system to use sections.

Initially this means we have an anonomous section (for backward

compatibility) and an "autofs" section for the autofs global

configuration.

---

 daemon/automount.c  |    1 

 include/automount.h |   18 +

 include/defaults.h  |   27 +-

 lib/cache.c         |   19 -

 lib/defaults.c      |  836 +++++++++++++++++++++++++++++++++++++--------------

 5 files changed, 644 insertions(+), 257 deletions(-)

diff --git a/daemon/automount.c b/daemon/automount.c

index 0dd6477..fd5a19b 100644

--- a/daemon/automount.c

+++ b/daemon/automount.c

@@ -2339,6 +2339,7 @@ int main(int argc, char *argv[])

 		unlink(pid_file);

 		pid_file = NULL;

 	}

+	defaults_conf_release();

 	closelog();

 	release_flag_file();

 	macro_free_global_table();

diff --git a/include/automount.h b/include/automount.h

index 1aabfa4..6da1926 100644

--- a/include/automount.h

+++ b/include/automount.h

@@ -136,6 +136,24 @@ struct autofs_point;

 #define UMOUNT_RETRIES		8

 #define EXPIRE_RETRIES		3

+static u_int32_t inline hash(const char *key, unsigned int size)

+{

+	u_int32_t hashval;

+	char *s = (char *) key;

+

+	for (hashval = 0; *s != '\0';) {

+		hashval += (unsigned char) *s++;

+		hashval += (hashval << 10);

+		hashval ^= (hashval >> 6);

+	}

+

+	hashval += (hashval << 3);

+	hashval ^= (hashval >> 11);

+	hashval += (hashval << 15);

+

+	return hashval % size;

+}

+

 struct mapent_cache {

 	pthread_rwlock_t rwlock;

 	unsigned int size;

diff --git a/include/defaults.h b/include/defaults.h

index 871e14b..3bfcd49 100644

--- a/include/defaults.h

+++ b/include/defaults.h

@@ -2,7 +2,9 @@

  *

  *  defaults.h - system initialization defaults.

  *

- *   Copyright 2006 Ian Kent <raven@themaw.net>

+ *   Copyright 2013 Red Hat, Inc.

+ *   Copyright 2006, 2013 Ian Kent <raven@themaw.net>

+ *   All rights reserved.

  *

  *   This program is free software; you can redistribute it and/or modify

  *   it under the terms of the GNU General Public License as published by

@@ -22,15 +24,15 @@

 #define DEFAULT_MASTER_MAP_NAME	"auto.master"

-#define DEFAULT_TIMEOUT			600

-#define DEFAULT_NEGATIVE_TIMEOUT	60

-#define DEFAULT_MOUNT_WAIT		-1

-#define DEFAULT_UMOUNT_WAIT		12

-#define DEFAULT_BROWSE_MODE		1

-#define DEFAULT_LOGGING			0

+#define DEFAULT_TIMEOUT			"600"

+#define DEFAULT_NEGATIVE_TIMEOUT	"60"

+#define DEFAULT_MOUNT_WAIT		"-1"

+#define DEFAULT_UMOUNT_WAIT		"12"

+#define DEFAULT_BROWSE_MODE		"1"

+#define DEFAULT_LOGGING			"none"

-#define DEFAULT_LDAP_TIMEOUT		-1

-#define DEFAULT_LDAP_NETWORK_TIMEOUT	8

+#define DEFAULT_LDAP_TIMEOUT		"-1"

+#define DEFAULT_LDAP_NETWORK_TIMEOUT	"8"

 #define DEFAULT_MAP_OBJ_CLASS		"nisMap"

 #define DEFAULT_ENTRY_OBJ_CLASS		"nisObject"

@@ -38,11 +40,11 @@

 #define DEFAULT_ENTRY_ATTR		"cn"

 #define DEFAULT_VALUE_ATTR		"nisMapEntry"

-#define DEFAULT_NFS_MOUNT_PROTOCOL	3

-#define DEFAULT_APPEND_OPTIONS		1

+#define DEFAULT_MOUNT_NFS_DEFAULT_PROTOCOL	"3"

+#define DEFAULT_APPEND_OPTIONS		"1"

 #define DEFAULT_AUTH_CONF_FILE		AUTOFS_MAP_DIR "/autofs_ldap_auth.conf"

-#define DEFAULT_MAP_HASH_TABLE_SIZE	1024

+#define DEFAULT_MAP_HASH_TABLE_SIZE	"1024"

 #ifdef WITH_LDAP

 struct ldap_schema;

@@ -56,6 +58,7 @@ struct ldap_schema *defaults_get_schema(void);

 #endif

 unsigned int defaults_read_config(unsigned int);

+void defaults_conf_release(void);

 const char *defaults_get_master_map(void);

 int defaults_master_set(void);

 unsigned int defaults_get_timeout(void);

diff --git a/lib/cache.c b/lib/cache.c

index f2efcd3..9af1709 100644

--- a/lib/cache.c

+++ b/lib/cache.c

@@ -20,7 +20,6 @@

 #include <ctype.h>

 #include <stdio.h>

 #include <sys/param.h>

-#include <sys/types.h>

 #include <sys/stat.h>

 #include "automount.h"

@@ -362,24 +361,6 @@ struct mapent_cache *cache_init_null_cache(struct master *master)

 	return mc;

 }

-static u_int32_t hash(const char *key, unsigned int size)

-{

-	u_int32_t hashval;

-	char *s = (char *) key;

-

-	for (hashval = 0; *s != '\0';) {

-		hashval += (unsigned char) *s++;

-		hashval += (hashval << 10);

-		hashval ^= (hashval >> 6);

-	}

-

-	hashval += (hashval << 3);

-	hashval ^= (hashval >> 11);

-	hashval += (hashval << 15);

-

-	return hashval % size;

-}

-

 static u_int32_t ino_hash(dev_t dev, ino_t ino, unsigned int size)

 {

 	u_int32_t hashval;

diff --git a/lib/defaults.c b/lib/defaults.c

index 7c65387..29f3f00 100644

--- a/lib/defaults.c

+++ b/lib/defaults.c

@@ -2,7 +2,9 @@

  *

  *  defaults.h - system initialization defaults.

  *

- *   Copyright 2006 Ian Kent <raven@themaw.net> - All Rights Reserved

+ *   Copyright 2013 Red Hat, Inc.

+ *   Copyright 2006, 2013 Ian Kent <raven@themaw.net>

+ *   All rights reserved.

  *

  *   This program is free software; you can redistribute it and/or modify

  *   it under the terms of the GNU General Public License as published by

@@ -16,6 +18,7 @@

 #include <stdio.h>

 #include <ctype.h>

 #include <string.h>

+#include <sys/stat.h>

 #include "config.h"

 #include "list.h"

@@ -26,132 +29,450 @@

 #include "log.h"

 #include "automount.h"

-#define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"

+#define AUTOFS_GLOBAL_SECTION		"autofs"

+

+#define DEFAULT_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"

 #define MAX_LINE_LEN			256

-#define ENV_NAME_MASTER_MAP		"MASTER_MAP_NAME"

+#define NAME_MASTER_MAP			"master_map_name"

+

+#define NAME_TIMEOUT			"timeout"

+#define NAME_NEGATIVE_TIMEOUT		"negative_timeout"

+#define NAME_BROWSE_MODE		"browse_mode"

+#define NAME_LOGGING			"logging"

+

+#define NAME_LDAP_URI			"ldap_uri"

+#define NAME_LDAP_TIMEOUT		"ldap_timeout"

+#define NAME_LDAP_NETWORK_TIMEOUT	"ldap_network_timeout"

+

+#define NAME_SEARCH_BASE		"search_base"

-#define ENV_NAME_TIMEOUT		"TIMEOUT"

-#define ENV_NAME_NEGATIVE_TIMEOUT	"NEGATIVE_TIMEOUT"

-#define ENV_NAME_BROWSE_MODE		"BROWSE_MODE"

-#define ENV_NAME_LOGGING		"LOGGING"

+#define NAME_MAP_OBJ_CLASS		"map_object_class"

+#define NAME_ENTRY_OBJ_CLASS		"entry_object_class"

+#define NAME_MAP_ATTR			"map_attribute"

+#define NAME_ENTRY_ATTR			"entry_attribute"

+#define NAME_VALUE_ATTR			"value_attribute"

-#define LDAP_URI			"LDAP_URI"

-#define ENV_LDAP_TIMEOUT		"LDAP_TIMEOUT"

-#define ENV_LDAP_NETWORK_TIMEOUT	"LDAP_NETWORK_TIMEOUT"

+#define NAME_MOUNT_NFS_DEFAULT_PROTOCOL	"mount_nfs_default_protocol"

+#define NAME_APPEND_OPTIONS		"append_options"

+#define NAME_MOUNT_WAIT			"mount_wait"

+#define NAME_UMOUNT_WAIT		"umount_wait"

+#define NAME_AUTH_CONF_FILE		"auth_conf_file"

-#define SEARCH_BASE			"SEARCH_BASE"

+#define NAME_MAP_HASH_TABLE_SIZE	"map_hash_table_size"

-#define ENV_NAME_MAP_OBJ_CLASS		"MAP_OBJECT_CLASS"

-#define ENV_NAME_ENTRY_OBJ_CLASS	"ENTRY_OBJECT_CLASS"

-#define ENV_NAME_MAP_ATTR		"MAP_ATTRIBUTE"

-#define ENV_NAME_ENTRY_ATTR		"ENTRY_ATTRIBUTE"

-#define ENV_NAME_VALUE_ATTR		"VALUE_ATTRIBUTE"

+/* Status returns */

+#define CFG_OK		0x0000

+#define CFG_FAIL	0x0001

+#define CFG_EXISTS	0x0002

+#define CFG_NOTFOUND	0x0004

-#define ENV_MOUNT_NFS_DEFAULT_PROTOCOL	"MOUNT_NFS_DEFAULT_PROTOCOL"

-#define ENV_APPEND_OPTIONS		"APPEND_OPTIONS"

-#define ENV_MOUNT_WAIT			"MOUNT_WAIT"

-#define ENV_UMOUNT_WAIT			"UMOUNT_WAIT"

-#define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"

+/* Config entry flags */

+#define CONF_ENV		0x00000001

-#define ENV_MAP_HASH_TABLE_SIZE		"MAP_HASH_TABLE_SIZE"

+#define CFG_TABLE_SIZE	128

 static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;

 static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;

+static const char *autofs_gbl_sec	   = AUTOFS_GLOBAL_SECTION;

+

+struct conf_option {

+	char *section;

+	char *name;

+	char *value;

+	unsigned long flags;

+	struct conf_option *next;

+};

+

+struct conf_cache {

+	struct conf_option **hash;

+	time_t modified;

+};

+static pthread_mutex_t conf_mutex = PTHREAD_MUTEX_INITIALIZER;

+static struct conf_cache *config = NULL;

+

+static int conf_load_autofs_defaults(void);

+static int conf_update(const char *, const char *, const char *, unsigned long);

+static void conf_delete(const char *, const char *);

+static struct conf_option *conf_lookup(const char *, const char *);

+

+

+static void message(unsigned int to_syslog, const char *msg, ...)

+{

+	va_list ap;

+

+	va_start(ap, msg);

+	if (to_syslog)

+		vsyslog(LOG_CRIT, msg, ap);

+	else {

+		vfprintf(stderr, msg, ap);

+		fputc('\n', stderr);

+	}

+	va_end(ap);

+

+	return;

+}

-static char *get_env_string(const char *name)

+static int conf_init(void)

 {

-	char *val, *res;

+	struct conf_cache *cc;

+	unsigned int size = CFG_TABLE_SIZE;

+	unsigned int i;

+

+	cc = malloc(sizeof(struct conf_cache));

+	if (!cc)

+		return CFG_FAIL;

+	cc->modified = 0;

+

+	cc->hash = malloc(size * sizeof(struct conf_option *));

+	if (!cc->hash) {

+		free(cc);

+		return CFG_FAIL;

+	}

-	val = getenv(name);

-	if (!val)

-		return NULL;

+	for (i = 0; i < size; i++) {

+		cc->hash[i] = NULL;

+	}

-	res = strdup(val);

-	if (!res)

-		return NULL;

+	config = cc;

-	return res;

+	return CFG_OK;

 }

-static long get_env_number(const char *name)

+static void __conf_release(void)

 {

-	char *val;

-	long res = -1;

-

-	val = getenv(name);

-	if (!val)

-		return -1;

+	struct conf_cache *cc = config;

+	unsigned int size = CFG_TABLE_SIZE;

+	struct conf_option *co, *next;

+	unsigned int i;

+

+	for (i = 0; i < size; i++) {

+		co = cc->hash[i];

+		if (co == NULL)

+			continue;

+		next = co->next;

+		free(co->section);

+		free(co->name);

+		if (co->value)

+			free(co->value);

+		free(co);

+

+		while (next) {

+			co = next;

+			next = co->next;

+			free(co->section);

+			free(co->name);

+			if (co->value)

+				free(co->value);

+			free(co);

+		}

+		cc->hash[i] = NULL;

+	}

-	if (isdigit(*val))

-		res = atol(val);

+	free(cc->hash);

+	free(cc);

+	config = NULL;

-	if (res < 0)

-		return -1;

+	return;

+}

-	return res;

+void defaults_conf_release(void)

+{

+	pthread_mutex_lock(&conf_mutex);

+	__conf_release();

+	pthread_mutex_unlock(&conf_mutex);

+	return;

 }

-static int get_env_yesno(const char *name)

+static int conf_load_autofs_defaults(void)

 {

-	const char *val;

-	int res = -1;

+	struct conf_option *co;

+	const char *sec = autofs_gbl_sec;

+	int ret;

-	val = getenv(name);

-	if (!val)

-		return -1;

+	ret = conf_update(sec, NAME_MASTER_MAP,

+			  DEFAULT_MASTER_MAP_NAME, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_TIMEOUT,

+			  DEFAULT_TIMEOUT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_NEGATIVE_TIMEOUT,

+			  DEFAULT_NEGATIVE_TIMEOUT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_BROWSE_MODE,

+			  DEFAULT_BROWSE_MODE, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_LOGGING,

+			  DEFAULT_LOGGING, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_LDAP_TIMEOUT,

+			  DEFAULT_LDAP_TIMEOUT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_LDAP_NETWORK_TIMEOUT,

+			  DEFAULT_LDAP_NETWORK_TIMEOUT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_MAP_OBJ_CLASS,

+			  DEFAULT_MAP_OBJ_CLASS, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_ENTRY_OBJ_CLASS,

+			  DEFAULT_ENTRY_OBJ_CLASS, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_MAP_ATTR,

+			  DEFAULT_MAP_ATTR, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_ENTRY_ATTR,

+			  DEFAULT_ENTRY_ATTR, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_VALUE_ATTR,

+			  DEFAULT_VALUE_ATTR, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_APPEND_OPTIONS,

+			  DEFAULT_APPEND_OPTIONS, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_MOUNT_WAIT,

+			  DEFAULT_MOUNT_WAIT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_UMOUNT_WAIT,

+			  DEFAULT_UMOUNT_WAIT, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_AUTH_CONF_FILE,

+			  DEFAULT_AUTH_CONF_FILE, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	ret = conf_update(sec, NAME_MOUNT_NFS_DEFAULT_PROTOCOL,

+			  DEFAULT_MOUNT_NFS_DEFAULT_PROTOCOL, CONF_ENV);

+	if (ret == CFG_FAIL)

+		goto error;

+

+	/* LDAP_URI nad SEARCH_BASE can occur multiple times */

+	while ((co = conf_lookup(sec, NAME_LDAP_URI)))

+		conf_delete(co->section, co->name);

+

+	while ((co = conf_lookup(sec, NAME_SEARCH_BASE)))

+		conf_delete(co->section, co->name);

-	if (isdigit(*val))

-		res = atoi(val);

-	else if (!strcasecmp(val, "yes"))

-		return 1;

-	else if (!strcasecmp(val, "no"))

-		return 0;

+	return 1;

-	return res;

+error:

+	return 0;

 }

-/*

- * We've changed the key names so we need to check for the

- * config key and it's old name for backward conpatibility.

-*/

-static int check_set_config_value(const char *res, const char *name, const char *value, unsigned to_syslog)

+static int conf_add(const char *section, const char *key, const char *value, unsigned long flags)

 {

-	char *old_name;

+	struct conf_option *co;

+	char *sec, *name, *val, *tmp;

+	unsigned int size = CFG_TABLE_SIZE;

+	u_int32_t index;

 	int ret;

-	if (!strcasecmp(res, name)) {

-		ret = setenv(name, value, 0);

-		if (ret) {

-			if (!to_syslog)

-				fprintf(stderr,

-				        "can't set config value for %s, "

-					"error %d\n", name, ret);

-			else

-				logmsg("can't set config value for %s, "

-				      "error %d", name, ret);

+	sec = name = val = NULL;

+

+	co = conf_lookup(section, key);

+	if (co) {

+		ret = CFG_EXISTS;

+		goto error;

+	}

+

+	ret = CFG_FAIL;

+

+	/* Environment overrides file value */

+	if (((flags & CFG_ENV) && (tmp = getenv(key))) || value) {

+		if (tmp)

+			val = strdup(tmp);

+		else

+			val = strdup(value);

+		if (!val)

+			goto error;

+	}

+

+	name = strdup(key);

+	if (!key)

+		goto error;

+

+	sec = strdup(section);

+	if (!sec)

+		goto error;

+

+	co = malloc(sizeof(struct conf_option));

+	if (!co)

+		goto error;

+

+	co->section = sec;

+	co->name = name;

+	co->value = val;

+	co->flags = flags;

+	co->next = NULL;

+

+	/* Don't change user set values in the environment */

+	if (flags & CONF_ENV)

+		setenv(name, value, 0);

+

+	index = hash(key, size);

+	if (!config->hash[index])

+		config->hash[index] = co;

+	else {

+		struct conf_option *last = NULL, *next;

+		next = config->hash[index];

+		while (next) {

+			last = next;

+			next = last->next;

 		}

-		return 1;

+		last->next = co;

 	}

-	old_name = alloca(strlen(name) + 9);

-	strcpy(old_name, "DEFAULT_");

-	strcat(old_name, name);

+	return CFG_OK;

+

+error:

+	if (name)

+		free(name);

+	if (val)

+		free(val);

+	if (sec)

+		free(sec);

+

+	return ret;

+}

-	if (!strcasecmp(res, old_name)) {

-		ret = setenv(name, value, 0);

-		if (ret) {

-			if (!to_syslog)

-				fprintf(stderr,

-				        "can't set config value for %s, "

-					"error %d\n", name, ret);

+static void conf_delete(const char *section, const char *key)

+{

+	struct conf_option *co, *last;

+	unsigned int size = CFG_TABLE_SIZE;

+

+	last = NULL;

+	for (co = config->hash[hash(key, size)]; co != NULL; co = co->next) {

+		if (strcasecmp(section, co->section))

+			continue;

+		if (!strcasecmp(key, co->name))

+			break;

+		last = co;

+	}

+

+	if (!co)

+		return;

+

+	if (last)

+		last->next = co->next;

+

+	free(co->section);

+	free(co->name);

+	if (co->value);

+		free(co->value);

+	free(co);

+}

+

+static int conf_update(const char *section,

+			const char *key, const char *value,

+			unsigned long flags)

+{

+	struct conf_option *co = NULL;

+	int ret;

+

+	ret = CFG_FAIL;

+	co = conf_lookup(section, key);

+	if (!co)

+		ret = conf_add(section, key, value, flags);

+	else {

+		char *val = NULL, *tmp;

+		/* Environment overrides file value */

+		if (((flags & CONF_ENV) && (tmp = getenv(key))) || value) {

+			if (tmp)

+				val = strdup(tmp);

 			else

-				logmsg("can't set config value for %s, "

-				      "error %d\n", name, ret);

+				val = strdup(value);

+			if (!val)

+				goto error;

 		}

-		return 1;

+		if (co->value)

+			free(co->value);

+		co->value = val;

+		if (flags)

+			co->flags = flags;

+		/* Don't change user set values in the environment */

+		if (flags & CONF_ENV)

+			setenv(key, value, 0);

 	}

-	return 0;

+

+	return CFG_OK;

+

+error:

+	return ret;

+}

+

+static struct conf_option *conf_lookup(const char *section, const char *key)

+{

+	struct conf_option *co;

+	unsigned int size = CFG_TABLE_SIZE;

+

+	if (!key || !section)

+		return NULL;

+

+	for (co = config->hash[hash(key, size)]; co != NULL; co = co->next) {

+		if (strcasecmp(section, co->section))

+			continue;

+		if (!strcasecmp(key, co->name))

+			break;

+		/*

+		 * Strip "DEFAULT_" and look for config entry for

+		 * backward compatibility with old style config names.

+		 */

+		if (strlen(key) <= 8)

+			continue;

+		if (!strncasecmp("DEFAULT_", key, 8) &&

+		    !strcasecmp(key + 8, co->name))

+			break;

+	}

+

+	return co;

+}

+

+/*

+ * We've changed the key names so we need to check for the

+ * config key and it's old name for backward conpatibility.

+*/

+static int check_set_config_value(const char *res, const char *value)

+{

+	const char *sec = autofs_gbl_sec;

+	int ret;

+

+	if (!strcasecmp(res, NAME_LDAP_URI))

+		ret = conf_add(sec, res, value, 0);

+	else if (!strcasecmp(res, NAME_SEARCH_BASE))

+		ret = conf_add(sec, res, value, 0);

+	else

+		ret = conf_update(sec, res, value, 0);

+

+	return ret;

 }

 static int parse_line(char *line, char **res, char **value)

@@ -200,6 +521,119 @@ static int parse_line(char *line, char **res, char **value)

 	return 1;

 }