rpms/autofs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to upstream 5.1.2 release.

Browse Source
This commit is contained in:
Ian Kent 2016-06-15 11:39:47 +08:00
parent 611c045b06
commit da6dff9c2b
105 changed files with 7 additions and 11118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ autofs-5.0.5.tar.bz2
/autofs-5.1.0-beta1.tar.gz
/autofs-5.1.0.tar.gz
/autofs-5.1.1.tar.gz
/autofs-5.1.2.tar.gz

52
autofs-5.0.9-fix-race-accessing-qdn-in-get_query_dn.patch
View File

@ -1,52 +0,0 @@
autofs-5.0.9 - fix race accessing qdn in get_query_dn()
From: Ian Kent <raven@themaw.net>
Fix a couple of obvious problems in get_query_dn().
First, check dn is not NULL before attempting to duplicate it.
And also protect the update of qdn in the context by a mutex.
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 1b4e2fe..e911682 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- add serialization to sasl init.
- dont allocate dev_ctl_ops too early.
- fix incorrect round robin host detection.
+- fix race accessing qdn in get_query_dn().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index aca3e05..5c16063 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -461,16 +461,19 @@ static int get_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt
}
free(query);
- qdn = strdup(dn);
- ldap_memfree(dn);
+ if (dn) {
+ qdn = strdup(dn);
+ ldap_memfree(dn);
+ }
ldap_msgfree(result);
if (!qdn)
return 0;
+ uris_mutex_lock(ctxt);
if (ctxt->qdn)
free(ctxt->qdn);
-
ctxt->qdn = qdn;
+ uris_mutex_unlock(ctxt);
return 1;
}

203
autofs-5.1.0-add-mutex-call-return-check-in-defaults_c.patch
View File

@ -1,203 +0,0 @@
autofs-5.1.0 - add mutex call return check in defaults.c
From: Ian Kent <ikent@redhat.com>
Even though pthread_mutex_lock() and pthread_mutex_unlock() should
never fail checking their return has very occassionally been useful
and isn't consistent with the usage elsewhere.
---
CHANGELOG | 1 +
lib/defaults.c | 55 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9cbccce..31a804d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
- fix some out of order evaluations in parse_amd.c.
- fix copy and paste error in dup_defaults_entry().
- fix leak in parse_mount().
+- add mutex call return check in defaults.c.
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/defaults.c b/lib/defaults.c
index 4e09c19..83f6ac7 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -172,6 +172,19 @@ 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 defaults_mutex_lock(void)
+{
+ int status = pthread_mutex_lock(&conf_mutex);
+ if (status)
+ fatal(status);
+}
+
+static void defaults_mutex_unlock(void)
+{
+ int status = pthread_mutex_unlock(&conf_mutex);
+ if (status)
+ fatal(status);
+}
static void message(unsigned int to_syslog, const char *msg, ...)
{
@@ -254,9 +267,9 @@ static void __conf_release(void)
void defaults_conf_release(void)
{
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
__conf_release();
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return;
}
@@ -728,11 +741,11 @@ static unsigned int conf_section_exists(const char *section)
return 0;
ret = 0;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(section, section);
if (co)
ret = 1;
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return ret;
}
@@ -1058,7 +1071,7 @@ unsigned int defaults_read_config(unsigned int to_syslog)
conf = oldconf = NULL;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
if (!config) {
if (conf_init()) {
message(to_syslog, "failed to init config");
@@ -1150,7 +1163,7 @@ out:
fclose(conf);
if (oldconf)
fclose(oldconf);
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return ret;
}
@@ -1159,11 +1172,11 @@ static char *conf_get_string(const char *section, const char *name)
struct conf_option *co;
char *val = NULL;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(section, name);
if (co && co->value)
val = strdup(co->value);
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return val;
}
@@ -1172,11 +1185,11 @@ static long conf_get_number(const char *section, const char *name)
struct conf_option *co;
long val = -1;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(section, name);
if (co && co->value)
val = atol(co->value);
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return val;
}
@@ -1185,7 +1198,7 @@ static int conf_get_yesno(const char *section, const char *name)
struct conf_option *co;
int val = -1;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(section, name);
if (co && co->value) {
if (isdigit(*co->value))
@@ -1195,7 +1208,7 @@ static int conf_get_yesno(const char *section, const char *name)
else if (!strcasecmp(co->value, "no"))
val = 0;
}
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return val;
}
@@ -1272,10 +1285,10 @@ struct list_head *defaults_get_uris(void)
return NULL;
}
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(autofs_gbl_sec, NAME_LDAP_URI);
if (!co) {
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
free(list);
return NULL;
}
@@ -1286,7 +1299,7 @@ struct list_head *defaults_get_uris(void)
add_uris(co->value, list);
co = co->next;
}
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
if (list_empty(list)) {
free(list);
@@ -1398,10 +1411,10 @@ struct ldap_searchdn *defaults_get_searchdns(void)
if (!defaults_read_config(0))
return NULL;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(autofs_gbl_sec, NAME_SEARCH_BASE);
if (!co) {
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return NULL;
}
@@ -1417,7 +1430,7 @@ struct ldap_searchdn *defaults_get_searchdns(void)
new = alloc_searchdn(co->value);
if (!new) {
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
defaults_free_searchdns(sdn);
return NULL;
}
@@ -1434,7 +1447,7 @@ struct ldap_searchdn *defaults_get_searchdns(void)
co = co->next;
}
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
return sdn;
}
@@ -1512,9 +1525,9 @@ int defaults_master_set(void)
{
struct conf_option *co;
- pthread_mutex_lock(&conf_mutex);
+ defaults_mutex_lock();
co = conf_lookup(autofs_gbl_sec, NAME_MASTER_MAP);
- pthread_mutex_unlock(&conf_mutex);
+ defaults_mutex_unlock();
if (co)
return 1;
return 0;

72
autofs-5.1.0-add-return-check-in-ldap-check_map_indirect.patch
View File

@ -1,72 +0,0 @@
autofs-5.1.0 - add return check in ldap check_map_indirect()
From: Ian Kent <ikent@redhat.com>
Fix not checking return from pthread_mutex_lock/pthread_mutex_unlock in
modules/lookup_ldap.c:check_map_indirect().
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index dfbaeb1..d7d161f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
- fix leak in get_network_proximity().
- fix buffer size checks in merge_options().
- check amd lex buffer len before copy.
+- add return check in ldap check_map_indirect().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 5c16063..ac2ef30 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -3420,12 +3420,15 @@ static int check_map_indirect(struct autofs_point *ap,
time_t now = time(NULL);
time_t t_last_read;
int ret, cur_state;
+ int status;
mc = source->mc;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
- pthread_mutex_lock(&ap->entry->current_mutex);
+ status = pthread_mutex_lock(&ap->entry->current_mutex);
+ if (status)
+ fatal(status);
if (is_amd_format) {
unsigned long timestamp = get_amd_timestamp(ctxt);
if (timestamp > ctxt->timestamp) {
@@ -3445,7 +3448,9 @@ static int check_map_indirect(struct autofs_point *ap,
ctxt->check_defaults = 0;
}
}
- pthread_mutex_unlock(&ap->entry->current_mutex);
+ status = pthread_mutex_unlock(&ap->entry->current_mutex);
+ if (status)
+ fatal(status);
ret = match_key(ap, source, key, key_len, ctxt);
if (ret == CHE_FAIL) {
@@ -3490,10 +3495,14 @@ static int check_map_indirect(struct autofs_point *ap,
}
cache_unlock(mc);
- pthread_mutex_lock(&ap->entry->current_mutex);
+ status = pthread_mutex_lock(&ap->entry->current_mutex);
+ if (status)
+ fatal(status);
if (t_last_read > ap->exp_runfreq && ret & CHE_UPDATED)
source->stale = 1;
- pthread_mutex_unlock(&ap->entry->current_mutex);
+ status = pthread_mutex_unlock(&ap->entry->current_mutex);
+ if (status)
+ fatal(status);
}
cache_readlock(mc);

96
autofs-5.1.0-add-serialization-to-sasl-init.patch
View File

@ -1,96 +0,0 @@
autofs-5.1.0 - add serialization to sasl init
From: Ian Kent <ikent@redhat.com>
Attempt to resolve crash in sasl initialization. We know that the
initial connection calls to connect to an LDAP server are not
thread safe and it looks like the sasl code doesn't take that into
consideration so adding serialization with a mutex is probably a
sensible thing to do.
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 58b94dc..92ee83b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
??/??/2014 autofs-5.1.1
=======================
- fix compile error in defaults.c.
+- add serialization to sasl init.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 8091ed2..aca3e05 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -578,7 +578,9 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
ctxt->auth_required, ctxt->sasl_mech);
if (ctxt->auth_required & LDAP_NEED_AUTH) {
+ ldapinit_mutex_lock();
rv = autofs_sasl_bind(logopt, ldap, ctxt);
+ ldapinit_mutex_unlock();
debug(logopt, MODPREFIX "autofs_sasl_bind returned %d", rv);
} else {
rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
@@ -922,7 +924,9 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
#ifdef WITH_SASL
/* Dispose of the sasl authentication connection and try again. */
if (!ldap && ctxt->auth_required & LDAP_NEED_AUTH) {
+ ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
+ ldapinit_mutex_unlock();
ldap = connect_to_server(logopt, ctxt->server, ctxt);
}
#endif
@@ -958,7 +962,9 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
* current server again before trying other servers in the list.
*/
if (!ldap && ctxt->auth_required & LDAP_NEED_AUTH) {
+ ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
+ ldapinit_mutex_unlock();
ldap = connect_to_server(logopt, ctxt->uri->uri, ctxt);
}
#endif
@@ -969,7 +975,9 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
find_server:
#ifdef WITH_SASL
+ ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
+ ldapinit_mutex_unlock();
#endif
/* Current server failed, try the rest or dc connection */
@@ -1742,11 +1750,14 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
#ifdef WITH_SASL
/* Init the sasl callbacks */
+ ldapinit_mutex_lock();
if (!autofs_sasl_client_init(LOGOPT_NONE)) {
error(LOGOPT_ANY, "failed to init sasl client");
+ ldapinit_mutex_unlock();
free_context(ctxt);
return 1;
}
+ ldapinit_mutex_unlock();
#endif
if (is_amd_format)
@@ -3678,8 +3689,10 @@ int lookup_done(void *context)
struct lookup_context *ctxt = (struct lookup_context *) context;
int rv = close_parse(ctxt->parse);
#ifdef WITH_SASL
+ ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
autofs_sasl_done();
+ ldapinit_mutex_unlock();
#endif
free_context(ctxt);
return rv;

192
autofs-5.1.0-check-amd-lex-buffer-len-before-copy.patch
View File

@ -1,192 +0,0 @@
autofs-5.1.0 - check amd lex buffer len before copy
From: Ian Kent <ikent@redhat.com>
Guard against lex to yacc communication buffer overflow.
---
CHANGELOG | 1 +
modules/amd_tok.l | 49 +++++++++++++++++++++++++++++++------------------
2 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 840e099..dfbaeb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
- fix buffer size checks in get_network_proximity().
- fix leak in get_network_proximity().
- fix buffer size checks in merge_options().
+- check amd lex buffer len before copy.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/amd_tok.l b/modules/amd_tok.l
index 5664f67..1d9c234 100644
--- a/modules/amd_tok.l
+++ b/modules/amd_tok.l
@@ -22,6 +22,7 @@
# undef ECHO
#endif
static void amd_echo(void); /* forward definition */
+static void amd_copy_buffer(void);
#define ECHO amd_echo()
int amd_wrap(void);
@@ -125,26 +126,26 @@ CUTSEP (\|\||\/)
{MAPOPT} {
BEGIN(MAPOPTVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return MAP_OPTION;
}
{FSOPTS} {
BEGIN(FSOPTVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return FS_OPTION;
}
{MNTOPT} {
BEGIN(MNTOPTVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return MNT_OPTION;
}
{SELOPT} {
BEGIN(SELOPTVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SELECTOR;
}
@@ -152,13 +153,13 @@ CUTSEP (\|\||\/)
{SEL1ARG} {
BEGIN(SELARGVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SELECTOR;
}
{SEL2ARG} {
BEGIN(SELARGVAL);
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SELECTOR;
}
@@ -171,7 +172,7 @@ CUTSEP (\|\||\/)
#.* { return COMMENT; }
{OTHR} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return OTHER;
}
}
@@ -201,22 +202,22 @@ CUTSEP (\|\||\/)
":=" { return OPTION_ASSIGN; }
{FSTYPE} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return FS_TYPE;
}
{MAPTYPE} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return MAP_TYPE;
}
{CHEOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return CACHE_OPTION;
}
{FOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return FS_OPT_VALUE;
}
}
@@ -246,7 +247,7 @@ CUTSEP (\|\||\/)
":=" { return OPTION_ASSIGN; }
{FOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return FS_OPT_VALUE;
}
}
@@ -278,7 +279,7 @@ CUTSEP (\|\||\/)
"," { return COMMA; }
{OPTS} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return OPTION;
}
}
@@ -310,7 +311,7 @@ CUTSEP (\|\||\/)
"!=" { return NOT_EQUAL; }
{SOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SELECTOR_VALUE;
}
}
@@ -335,24 +336,24 @@ CUTSEP (\|\||\/)
"(" { return LBRACKET; }
{NOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SEL_ARG_VALUE;
}
{SOPT}/"," {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SEL_ARG_VALUE;
}
"," { return COMMA; }
{SOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SEL_ARG_VALUE;
}
{FOPT} {
- strcpy(amd_lval.strtype, amd_text);
+ amd_copy_buffer();
return SEL_ARG_VALUE;
}
@@ -368,6 +369,18 @@ int amd_wrap(void)
return 1;
}
+static void amd_copy_buffer(void)
+{
+ if (amd_leng < 2048)
+ strcpy(amd_lval.strtype, amd_text);
+ else {
+ strncpy(amd_lval.strtype, amd_text, 2047);
+ amd_lval.strtype[2047] = '\0';
+ logmsg("warning: truncated option near %s\n",
+ &amd_lval.strtype[2030]);
+ }
+}
+
static void amd_echo(void)
{
logmsg("%s\n", amd_text);

38
autofs-5.1.0-check-host-macro-is-set-before-use.patch
View File

@ -1,38 +0,0 @@
autofs-5.1.0 - check host macro is set before use
From: Ian Kent <ikent@redhat.com>
Check marco lookup return for ${host} in match_my_name() before using it.
---
CHANGELOG | 1 +
modules/parse_amd.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index d7d161f..20290fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
- fix buffer size checks in merge_options().
- check amd lex buffer len before copy.
- add return check in ldap check_map_indirect().
+- check host macro is set before use.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 26d01ed..25fe4aa 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -238,6 +238,11 @@ static int match_my_name(unsigned int logopt, const char *name, struct substvar
return 1;
}
+ if (!v || !v->val) {
+ error(logopt, "error: ${host} not set");
+ goto out;
+ }
+
/* Check if comparison value is an alias */
memset(&hints, 0, sizeof(hints));

87
autofs-5.1.0-check-options-length-before-use-in-parse_amd_c.patch
View File

@ -1,87 +0,0 @@
autofs-5.1.0 - check options length before use in parse_amd.c
From: Ian Kent <ikent@redhat.com>
Check for temporary buffer overflow before copy at several places in
modules/parse_amd.c.
---
CHANGELOG | 1 +
modules/parse_amd.c | 36 ++++++++++++++++++++++++++++++++----
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 20290fc..81aadca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
- check amd lex buffer len before copy.
- add return check in ldap check_map_indirect().
- check host macro is set before use.
+- check options length before use in parse_amd.c.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 25fe4aa..6764152 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -906,9 +906,20 @@ static int do_auto_mount(struct autofs_point *ap, const char *name,
{
char target[PATH_MAX + 1];
- if (!entry->map_type)
+ if (!entry->map_type) {
+ if (strlen(entry->fs) > PATH_MAX) {
+ error(ap->logopt, MODPREFIX
+ "error: fs option length is too long");
+ return 0;
+ }
strcpy(target, entry->fs);
- else {
+ } else {
+ if (strlen(entry->fs) +
+ strlen(entry->map_type) + 5 > PATH_MAX) {
+ error(ap->logopt, MODPREFIX
+ "error: fs + maptype options length is too long");
+ return 0;
+ }
strcpy(target, entry->map_type);
strcat(target, ",amd:");
strcat(target, entry->fs);
@@ -925,10 +936,21 @@ static int do_link_mount(struct autofs_point *ap, const char *name,
const char *opts = (entry->opts && *entry->opts) ? entry->opts : NULL;
int ret;
- if (entry->sublink)
+ if (entry->sublink) {
+ if (strlen(entry->sublink) > PATH_MAX) {
+ error(ap->logopt, MODPREFIX
+ "error: sublink option length is too long");
+ return 0;
+ }
strcpy(target, entry->sublink);
- else
+ } else {
+ if (strlen(entry->fs) > PATH_MAX) {
+ error(ap->logopt, MODPREFIX
+ "error: fs option length is too long");
+ return 0;
+ }
strcpy(target, entry->fs);
+ }
if (!(flags & CONF_AUTOFS_USE_LOFS))
goto symlink;
@@ -1017,6 +1039,12 @@ static int do_nfs_mount(struct autofs_point *ap, const char *name,
unsigned int umount = 0;
int ret = 0;
+ if (strlen(entry->rhost) + strlen(entry->rfs) + 1 > PATH_MAX) {
+ error(ap->logopt, MODPREFIX
+ "error: rhost + rfs options length is too long");
+ return 0;
+ }
+
strcpy(target, entry->rhost);
strcat(target, ":");
strcat(target, entry->rfs);

49
autofs-5.1.0-clarify-multiple-mounts-description.patch
View File

@ -1,49 +0,0 @@
autofs-5.1.0 - clarify multiple mounts description
From: Ian Kent <ikent@redhat.com>
Try and clarify the "Multiple Mounts" and "Replicated Server" sections
in the autofs(5) man page.
---
CHANGELOG | 1 +
man/autofs.5 | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 519fea3..c6d8933 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@
- fix reset amd lexer scan buffer.
- ignore multiple commas in options strings.
- fix typo in flagdir configure option.
+- clarify multiple mounts description.
04/06/2014 autofs-5.1.0
=======================
diff --git a/man/autofs.5 b/man/autofs.5
index 81ae375..6c53520 100644
--- a/man/autofs.5
+++ b/man/autofs.5
@@ -211,15 +211,19 @@ can be used to name multiple filesystems to mount. It takes the form:
.RS +.2i
.ta 1.0i
.nf
-.BI "key [" -options "] [mount-point [" -options "] location...]..."
+.BI "key [ -options ] [[/] location [/relative-mount-point [ -options ] location...]..."
.fi
.RE
.sp
.P
This may extend over multiple lines, quoting the line-breaks with \`\\\'.
If present, the per-mountpoint mount-options are appended to the
-default mount-options.
+default mount-options. This behaviour may be overridden by the append_options
+configuration setting.
.SS Replicated Server
+A mount location can specify multiple hosts for a location, portentially
+with a different export path for the same file system. Historically these
+different locations are read-only and provide the same replicated file system.
.sp
.RS +.2i
.ta 1.5i

54
autofs-5.1.0-dont-add-wildcard-to-negative-cache.patch
View File

@ -1,54 +0,0 @@
autofs-5.1.0 - dont add wildcard to negative cache
From: Ian Kent <ikent@redhat.com>
If the wilcard is added to the negative cache it prevents any
further matching of the wildcard for the given map.
---
CHANGELOG | 1 +
daemon/lookup.c | 4 ++++
lib/cache.c | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 6903b5d..d09567a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@
- fix hosts map update on reload.
- make negative cache update consistent for all lookup modules.
- ensure negative cache isn't updated on remount.
+- dont add wildcard to negative cache.
04/06/2014 autofs-5.1.0
=======================
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 6444fa5..62071df 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -1057,6 +1057,10 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *so
if (source && source->depth)
return;
+ /* Don't update the wildcard */
+ if (strlen(name) == 1 && *name == '*')
+ return;
+
/* Have we recorded the lookup fail for negative caching? */
me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me)
diff --git a/lib/cache.c b/lib/cache.c
index 4bab5a3..666c9bc 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -762,6 +762,10 @@ void cache_update_negative(struct mapent_cache *mc,
struct mapent *me;
int rv = CHE_OK;
+ if (strlen(key) == 1 && *key == '*')
+ return;
+
+ /* Don't update the wildcard */
me = cache_lookup_distinct(mc, key);
if (me)
rv = cache_push_mapent(me, NULL);

87
autofs-5.1.0-dont-allocate-dev_ctl_ops-too-early.patch
View File

@ -1,87 +0,0 @@
autofs-5.1.0 - dont allocate dev_ctl_ops too early
From: Ian Kent <raven@themaw.net>
If the standard io file descriptors have been closed by the cloning
process the file handle for autofs device control can correspond to
a descriptor number of one of the standard io descriptors which will
be closed when the process is daemonized.
Avoid this by closing the device control descriptor opened when
performing sanity checks at startup so that it can be opened
on a higher numbered file descriptor after the process has switched
to daemon mode.
---
CHANGELOG | 1 +
lib/mounts.c | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 92ee83b..ece8c5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
=======================
- fix compile error in defaults.c.
- add serialization to sasl init.
+- dont allocate dev_ctl_ops too early.
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/mounts.c b/lib/mounts.c
index c9e1237..f635371 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -90,7 +90,7 @@ unsigned int linux_version_code(void)
unsigned int query_kproto_ver(void)
{
- struct ioctl_ops *ops = get_ioctl_ops();
+ struct ioctl_ops *ops;
char dir[] = "/tmp/autoXXXXXX", *t_dir;
char options[MAX_OPTIONS_LEN + 1];
pid_t pgrp = getpgrp();
@@ -131,10 +131,19 @@ unsigned int query_kproto_ver(void)
return 0;
}
+ ops = get_ioctl_ops();
+ if (!ops) {
+ umount(t_dir);
+ close(pipefd[0]);
+ rmdir(t_dir);
+ return 0;
+ }
+
ops->open(LOGOPT_NONE, &ioctlfd, st.st_dev, t_dir);
if (ioctlfd == -1) {
umount(t_dir);
close(pipefd[0]);
+ close_ioctl_ctl();
rmdir(t_dir);
return 0;
}
@@ -146,6 +155,7 @@ unsigned int query_kproto_ver(void)
ops->close(LOGOPT_NONE, ioctlfd);
umount(t_dir);
close(pipefd[0]);
+ close_ioctl_ctl();
rmdir(t_dir);
return 0;
}
@@ -155,6 +165,7 @@ unsigned int query_kproto_ver(void)
ops->close(LOGOPT_NONE, ioctlfd);
umount(t_dir);
close(pipefd[0]);
+ close_ioctl_ctl();
rmdir(t_dir);
return 0;
}
@@ -162,6 +173,7 @@ unsigned int query_kproto_ver(void)
ops->close(LOGOPT_NONE, ioctlfd);
umount(t_dir);
close(pipefd[0]);
+ close_ioctl_ctl();
rmdir(t_dir);
return 1;

53
autofs-5.1.0-ensure-negative-cache-isnt-updated-on-remount.patch
View File

@ -1,53 +0,0 @@
autofs-5.1.0 - ensure negative cache isn't updated on remount
From: Ian Kent <ikent@redhat.com>
The negative cache shouldn't be updated when re-connecting at
startup but a couple of lookup modules didn't check for this
case.
---
CHANGELOG | 1 +
modules/lookup_hosts.c | 3 +++
modules/lookup_program.c | 3 +++
3 files changed, 7 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 37b2cde..6903b5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
- fix typo in update_hosts_mounts().
- fix hosts map update on reload.
- make negative cache update consistent for all lookup modules.
+- ensure negative cache isn't updated on remount.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 02bf970..0d48356 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -151,6 +151,9 @@ static int do_parse_mount(struct autofs_point *ap, struct map_source *source,
if (ret) {
struct mapent_cache *mc = source->mc;
+ /* Don't update negative cache when re-connecting */
+ if (ap->flags & MOUNT_FLAG_REMOUNT)
+ return NSS_STATUS_TRYAGAIN;
cache_writelock(mc);
cache_update_negative(mc, source, name, ap->negative_timeout);
cache_unlock(mc);
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index bf0e350..8e8fd49 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -622,6 +622,9 @@ out_free:
free(mapent);
if (ret) {
+ /* Don't update negative cache when re-connecting */
+ if (ap->flags & MOUNT_FLAG_REMOUNT)
+ return NSS_STATUS_TRYAGAIN;
cache_writelock(mc);
cache_update_negative(mc, source, name, ap->negative_timeout);
cache_unlock(mc);

82
autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch
View File

@ -1,82 +0,0 @@
autofs-5.1.0 - fix FILE pointer check in defaults_read_config()
From: Ian Kent <raven@themaw.net>
Fix possible use after free usage of FILE pointer in defaults_read_config().
---
CHANGELOG | 1 +
lib/defaults.c | 15 +++++++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 21c3ecd..d978529 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
- fix race accessing qdn in get_query_dn().
- fix leak in cache_push_mapent().
- fix config entry read buffer not checked.
+- fix FILE pointer check in defaults_read_config().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/defaults.c b/lib/defaults.c
index a83dcee..1c3df56 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -1056,6 +1056,8 @@ unsigned int defaults_read_config(unsigned int to_syslog)
ret = 1;
+ conf = oldconf = NULL;
+
pthread_mutex_lock(&conf_mutex);
if (!config) {
if (conf_init()) {
@@ -1082,15 +1084,11 @@ unsigned int defaults_read_config(unsigned int to_syslog)
stb.st_mtime <= config->modified &&
(oldstat = fstat(fileno(oldconf), &oldstb) == -1) &&
oldstb.st_mtime <= config->modified) {
- fclose(conf);
- fclose(oldconf);
goto out;
}
if (conf || oldconf) {
if (!reset_defaults(to_syslog)) {
- fclose(conf);
- fclose(oldconf);
ret = 0;
goto out;
}
@@ -1108,10 +1106,8 @@ unsigned int defaults_read_config(unsigned int to_syslog)
}
}
- if (conf) {
+ if (conf)
read_config(to_syslog, conf, DEFAULT_CONFIG_FILE);
- fclose(conf);
- }
/*
* Read the old config file and override the installed
@@ -1132,7 +1128,6 @@ unsigned int defaults_read_config(unsigned int to_syslog)
clean_ldap_multi_option(NAME_LDAP_URI);
read_config(to_syslog, oldconf, OLD_CONFIG_FILE);
- fclose(oldconf);
if (ldap_search_base) {
co = conf_lookup(sec, NAME_SEARCH_BASE);
@@ -1151,6 +1146,10 @@ unsigned int defaults_read_config(unsigned int to_syslog)
}
}
out:
+ if (conf)
+ fclose(conf);
+ if (oldconf)
+ fclose(oldconf);
pthread_mutex_unlock(&conf_mutex);
return ret;
}

56
autofs-5.1.0-fix-buffer-size-checks-in-get_network_proximity.patch
View File

@ -1,56 +0,0 @@
autofs-5.1.0 - fix buffer size checks in get_network_proximity()
From: Ian Kent <raven@themaw.net>
Add several buffer size checks in get_network_proximity().
---
CHANGELOG | 1 +
lib/parse_subs.c | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6977443..86166d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
- fix FILE pointer check in defaults_read_config().
- fix memory leak in conf_amd_get_log_options().
- fix signed comparison in inet_fill_net().
+- fix buffer size checks in get_network_proximity().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index c1648c2..9af5106 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -437,7 +437,7 @@ unsigned int get_network_proximity(const char *name)
{
struct addrinfo hints;
struct addrinfo *ni, *this;
- char name_or_num[NI_MAXHOST];
+ char name_or_num[NI_MAXHOST + 1];
unsigned int proximity;
char *net;
int ret;
@@ -449,16 +449,18 @@ unsigned int get_network_proximity(const char *name)
if (net)
strcpy(name_or_num, net);
else {
- char this[NI_MAXHOST];
+ char this[NI_MAXHOST + 1];
char *mask;
+ if (strlen(name) > NI_MAXHOST)
+ return PROXIMITY_ERROR;
strcpy(this, name);
if ((mask = strchr(this, '/')))
*mask++ = '\0';
if (!strchr(this, '.'))
strcpy(name_or_num, this);
else {
- char buf[NI_MAXHOST], *new;
+ char buf[NI_MAXHOST + 1], *new;
new = inet_fill_net(this, buf);
if (!new)
return PROXIMITY_ERROR;

109
autofs-5.1.0-fix-buffer-size-checks-in-merge_options.patch
View File

@ -1,109 +0,0 @@
autofs-5.1.0 - fix buffer size checks in merge_options()
From: Ian Kent <raven@themaw.net>
Fix some buffer size overflow checks in merge_options().
---
CHANGELOG | 1 +
lib/parse_subs.c | 25 +++++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 92657c3..840e099 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
- fix signed comparison in inet_fill_net().
- fix buffer size checks in get_network_proximity().
- fix leak in get_network_proximity().
+- fix buffer size checks in merge_options().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 6e9f2d7..6145828 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -886,11 +886,11 @@ static char *hasopt(const char *str, const char *opt)
char *merge_options(const char *opt1, const char *opt2)
{
- char str[MAX_OPTIONS_LEN];
- char result[MAX_OPTIONS_LEN];
- char neg[MAX_OPTION_LEN];
+ char str[MAX_OPTIONS_LEN + 1];
+ char result[MAX_OPTIONS_LEN + 1];
+ char neg[MAX_OPTION_LEN + 1];
char *tok, *ptr = NULL;
- size_t len;
+ size_t resultlen, len;
if ((!opt1 || !*opt1) && (!opt2 || !*opt2))
return NULL;
@@ -910,9 +910,12 @@ char *merge_options(const char *opt1, const char *opt2)
if (!strcmp(opt1, opt2))
return strdup(opt1);
+ if (strlen(str) > MAX_OPTIONS_LEN)
+ return NULL;
memset(result, 0, sizeof(result));
strcpy(str, opt1);
+ resultlen = 0;
tok = strtok_r(str, ",", &ptr);
while (tok) {
const char *this = (const char *) tok;
@@ -920,12 +923,15 @@ char *merge_options(const char *opt1, const char *opt2)
if (eq) {
*eq = '\0';
if (!hasopt(opt2, this)) {
+ if (resultlen + strlen(this) > MAX_OPTIONS_LEN)
+ return NULL;
*eq = '=';
if (!*result)
strcpy(result, this);
else
strcat(result, this);
strcat(result, ",");
+ resultlen += strlen(this) + 1;
goto next;
}
}
@@ -946,10 +952,14 @@ char *merge_options(const char *opt1, const char *opt2)
goto next;
if (!strncmp(this, "no", 2)) {
+ if (strlen(this + 2) > MAX_OPTION_LEN)
+ return NULL;
strcpy(neg, this + 2);
if (hasopt(opt2, neg))
goto next;
} else {
+ if ((strlen(this) + 2) > MAX_OPTION_LEN)
+ return NULL;
strcpy(neg, "no");
strcat(neg, this);
if (hasopt(opt2, neg))
@@ -959,15 +969,22 @@ char *merge_options(const char *opt1, const char *opt2)
if (hasopt(opt2, tok))
goto next;
+ if (resultlen + strlen(this) + 1 > MAX_OPTIONS_LEN)
+ return NULL;
+
if (!*result)
strcpy(result, this);
else
strcat(result, this);
strcat(result, ",");
+ resultlen =+ strlen(this) + 1;
next:
tok = strtok_r(NULL, ",", &ptr);
}
+ if (resultlen + strlen(opt2) > MAX_OPTIONS_LEN)
+ return NULL;
+
if (!*result)
strcpy(result, opt2);
else

35
autofs-5.1.0-fix-compile-error-in-defaults_c.patch
View File

@ -1,35 +0,0 @@
autofs-5.1.0 - fix compile error in defaults.c
From: Ian Kent <raven@themaw.net>
Puzzling, suddenly I'm getting a compile error for defaults.c due
to a lack of including stdarg.h.
---
CHANGELOG | 4 ++++
lib/defaults.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 5a5964d..58b94dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+??/??/2014 autofs-5.1.1
+=======================
+- fix compile error in defaults.c.
+
04/06/2014 autofs-5.1.0
=======================
- fix mistake in assignment.
diff --git a/lib/defaults.c b/lib/defaults.c
index 2b03ea2..d29a976 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <sys/utsname.h>
#include <sys/stat.h>
+#include <stdarg.h>
#include "config.h"
#include "list.h"

49
autofs-5.1.0-fix-config-entry-read-buffer-not-checked.patch
View File

@ -1,49 +0,0 @@
autofs-5.1.0 - fix config entry read buffer not checked
From: Ian Kent <raven@themaw.net>
Check the length of config file line read in and report truncation
if it was too long.
---
CHANGELOG | 1 +
lib/defaults.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index bc8b9d1..21c3ecd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
- fix incorrect round robin host detection.
- fix race accessing qdn in get_query_dn().
- fix leak in cache_push_mapent().
+- fix config entry read buffer not checked.
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/defaults.c b/lib/defaults.c
index d29a976..a83dcee 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -835,7 +835,7 @@ static int parse_line(char *line, char **sec, char **res, char **value)
static int read_config(unsigned int to_syslog, FILE *f, const char *name)
{
- char buf[MAX_LINE_LEN];
+ char buf[MAX_LINE_LEN + 2];
char secbuf[MAX_SECTION_NAME];
char *new_sec;
char *res;
@@ -843,6 +843,12 @@ static int read_config(unsigned int to_syslog, FILE *f, const char *name)
new_sec = NULL;
while ((res = fgets(buf, MAX_LINE_LEN, f))) {
char *sec, *key, *value;
+
+ if (strlen(res) > MAX_LINE_LEN) {
+ message(to_syslog, "%s was truncated, ignored", res);
+ continue;
+ }
+
sec = key = value = NULL;
if (!parse_line(res, &sec, &key, &value))
continue;

35
autofs-5.1.0-fix-copy-and-paste-error-in-dup_defaults_entry.patch
View File

@ -1,35 +0,0 @@
autofs-5.1.0 - fix copy and paste error in dup_defaults_entry()
From: Ian Kent <ikent@redhat.com>
---
CHANGELOG | 1 +
modules/parse_amd.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4e00929..cb74c60 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
- check host macro is set before use.
- check options length before use in parse_amd.c.
- fix some out of order evaluations in parse_amd.c.
+- fix copy and paste error in dup_defaults_entry().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index c4992c1..a912385 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -1631,7 +1631,7 @@ static struct amd_entry *dup_defaults_entry(struct amd_entry *defaults)
entry->rfs = tmp;
}
- if (defaults->rhost && *defaults->rfs) {
+ if (defaults->rhost && *defaults->rhost) {
tmp = strdup(defaults->rhost);
if (tmp)
entry->rhost = tmp;

42
autofs-5.1.0-fix-fix-master-map-type-check.patch
View File

@ -1,42 +0,0 @@
autofs-5.1.0 - fix fix master map type check
From: Ian Kent <ikent@redhat.com>
The map type is of the form <type>[,<format>] but the master map type
check for the old style map syntax wasn't allowing for <format> to be
given (see commit 7c104167).
When fixing this an incorrect length was accidently used when checking
for the "yp" map type which causes it to never match.
---
CHANGELOG | 1 +
daemon/lookup.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index b0dce1e..9e2dc89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,7 @@
- clarify multiple mounts description.
- gaurd against incorrect umount return.
- update man page autofs(8) for systemd.
+- fix fix master map type check.
04/06/2014 autofs-5.1.0
=======================
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 1a0881f..6444fa5 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -233,8 +233,8 @@ int lookup_nss_read_master(struct master *master, time_t age)
memset(source, 0, 10);
if ((!strncmp(name, "file", 4) &&
(name[4] == ',' || name[4] == ':')) ||
- (!strncmp(name, "yp", 3) &&
- (name[3] == ',' || name[3] == ':')) ||
+ (!strncmp(name, "yp", 2) &&
+ (name[2] == ',' || name[2] == ':')) ||
(!strncmp(name, "nis", 3) &&
(name[3] == ',' || name[3] == ':')) ||
(!strncmp(name, "nisplus", 7) &&

68
autofs-5.1.0-fix-gcc5-complaints.patch
View File

@ -1,68 +0,0 @@
autofs-5.1.0 - fix gcc5 complaints
From: Ian Kent <raven@themaw.net>
gcc5 is not happy with the way dump_core() and master_get_logopt()
are declared inline, remove the inline and let the compiler decide.
---
CHANGELOG | 1 +
daemon/spawn.c | 2 +-
include/automount.h | 2 +-
include/master.h | 2 +-
lib/master.c | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
--- autofs-5.1.0.orig/CHANGELOG
+++ autofs-5.1.0/CHANGELOG
@@ -41,6 +41,7 @@
- ensure negative cache isn't updated on remount.
- dont add wildcard to negative cache.
- make service want network-online.
+- fix gcc5 complaints.
04/06/2014 autofs-5.1.0
=======================
--- autofs-5.1.0.orig/daemon/spawn.c
+++ autofs-5.1.0/daemon/spawn.c
@@ -36,7 +36,7 @@ static pthread_mutex_t spawn_mutex = PTH
#define MTAB_LOCK_RETRIES 3
-inline void dump_core(void)
+void dump_core(void)
{
sigset_t segv;
--- autofs-5.1.0.orig/include/automount.h
+++ autofs-5.1.0/include/automount.h
@@ -241,7 +241,7 @@ const char **copy_argv(int argc, const c
int compare_argv(int argc1, const char **argv1, int argc2, const char **argv2);
int free_argv(int argc, const char **argv);
-inline void dump_core(void);
+void dump_core(void);
int aquire_lock(void);
void release_lock(void);
int spawnl(unsigned logopt, const char *prog, ...);
--- autofs-5.1.0.orig/include/master.h
+++ autofs-5.1.0/include/master.h
@@ -120,7 +120,7 @@ void master_notify_state_change(struct m
int master_mount_mounts(struct master *, time_t, int);
int dump_map(struct master *, const char *, const char *);
int master_show_mounts(struct master *);
-extern inline unsigned int master_get_logopt(void);
+unsigned int master_get_logopt(void);
int master_list_empty(struct master *);
int master_done(struct master *);
int master_kill(struct master *);
--- autofs-5.1.0.orig/lib/master.c
+++ autofs-5.1.0/lib/master.c
@@ -1712,7 +1712,7 @@ int master_done(struct master *master)
return res;
}
-inline unsigned int master_get_logopt(void)
+unsigned int master_get_logopt(void)
{
return master_list ? master_list->logopt : LOGOPT_NONE;
}

36
autofs-5.1.0-fix-hosts-map-options-check-in-lookup_amd_instance.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.0 - fix hosts map options check in lookup_amd_instance()
From: Ian Kent <ikent@redhat.com>
Ongoing bug fixes have caused a hosts map source check in lookup_amd_instance()
to be inconsistent and consequently not find the iexpected map source.
---
CHANGELOG | 1 +
daemon/lookup.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index f291095..d693bce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
- fix leak in parse_mount().
- add mutex call return check in defaults.c.
- force disable browse mode for amd format maps.
+- fix hosts map options check in lookup_amd_instance().
04/06/2014 autofs-5.1.0
=======================
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 1761f7e..1a0881f 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -843,7 +843,7 @@ static int lookup_amd_instance(struct autofs_point *ap,
return NSS_STATUS_UNKNOWN;
}
- if (entry->opts) {
+ if (entry->opts && *entry->opts) {
argv[0] = entry->opts;
argv[1] = NULL;
pargv = argv;

84
autofs-5.1.0-fix-hosts-map-update-on-reload.patch
View File

@ -1,84 +0,0 @@
autofs-5.1.0 - fix hosts map update on reload
From: Ian Kent <ikent@redhat.com>
Commit aedfd5aa - "amd lookup fix host mount naming" introduced a
regression when updating sun format maps.
The amd host mount type assumes the lookup name is the host name for
the host mount but amd uses ${rhost} for this.
This introduces the possibility of multiple concurrent mount requests
since constructing a mount tree that isn't under the lookup name can't
take advantage of the kernel queuing of other concurrent lookups while
the mount tree is constructed.
Consequently multi-mount updates (currently only done for the internal
hosts map which the amd parser also uses for its hosts map) can't be
allowed for amd mounts.
---
CHANGELOG | 1 +
modules/parse_sun.c | 37 ++++++++++++++++++++++++++++---------
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 645efe5..59f2906 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@
- fix fix master map type check.
- init qdn before use in get_query_dn().
- fix typo in update_hosts_mounts().
+- fix hosts map update on reload.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index b881ee9..a3c736e 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1356,16 +1356,35 @@ int parse_mount(struct autofs_point *ap, const char *name,
}
cache_multi_writelock(me);
- /* Someone beat us to it, return success */
- if (me->multi) {
- free(options);
- cache_multi_unlock(me);
- cache_unlock(mc);
- pthread_setcancelstate(cur_state, NULL);
- return 0;
- }
/* So we know we're the multi-mount root */
- me->multi = me;
+ if (!me->multi)
+ me->multi = me;
+ else {
+ /*
+ * The amd host mount type assumes the lookup name
+ * is the host name for the host mount but amd uses
+ * ${rhost} for this.
+ *
+ * This introduces the possibility of multiple
+ * concurrent mount requests since constructing a
+ * mount tree that isn't under the lookup name can't
+ * take advantage of the kernel queuing of other
+ * concurrent lookups while the mount tree is
+ * constructed.
+ *
+ * Consequently multi-mount updates (currently only
+ * done for the internal hosts map which the amd
+ * parser also uses for its hosts map) can't be
+ * allowed for amd mounts.
+ */
+ if (source->flags & MAP_FLAG_FORMAT_AMD) {
+ free(options);
+ cache_multi_unlock(me);
+ cache_unlock(mc);
+ pthread_setcancelstate(cur_state, NULL);
+ return 0;
+ }
+ }
age = me->age;

35
autofs-5.1.0-fix-incorrect-round-robin-host-detection.patch
View File

@ -1,35 +0,0 @@
autofs-5.1.0 - fix incorrect round robin host detection
From: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/replicated.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index ece8c5c..1b4e2fe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
- fix compile error in defaults.c.
- add serialization to sasl init.
- dont allocate dev_ctl_ops too early.
+- fix incorrect round robin host detection.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/replicated.c b/modules/replicated.c
index 0c1a8a7..32860d5 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -946,7 +946,7 @@ try_name:
}
this = ni;
- while (this->ai_next) {
+ while (this) {
if (this->ai_family == AF_INET) {
struct sockaddr_in *addr = (struct sockaddr_in *) this->ai_addr;
if (addr->sin_addr.s_addr != INADDR_LOOPBACK)

36
autofs-5.1.0-fix-leak-in-cache_push_mapent.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.0 - fix leak in cache_push_mapent()
From: Ian Kent <raven@themaw.net>
cache_push_mapent() incorectly sets the cache entry mapent to the old
value which causes a memory leak when the new map entry isn't NULL.
---
CHANGELOG | 1 +
lib/cache.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index e911682..bc8b9d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
- dont allocate dev_ctl_ops too early.
- fix incorrect round robin host detection.
- fix race accessing qdn in get_query_dn().
+- fix leak in cache_push_mapent().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/cache.c b/lib/cache.c
index 8d08094..4bab5a3 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -203,7 +203,7 @@ int cache_push_mapent(struct mapent *me, char *mapent)
s->mapent = me->mapent;
s->age = me->age;
- me->mapent = mapent;
+ me->mapent = new;
if (me->stack)
s->next = me->stack;

39
autofs-5.1.0-fix-leak-in-get_network_proximity.patch
View File

@ -1,39 +0,0 @@
autofs-5.1.0 - fix leak in get_network_proximity()
From: Ian Kent <raven@themaw.net>
Fix variable net not freed after use in get_network_proximity().
---
CHANGELOG | 1 +
lib/parse_subs.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 86166d7..92657c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
- fix memory leak in conf_amd_get_log_options().
- fix signed comparison in inet_fill_net().
- fix buffer size checks in get_network_proximity().
+- fix leak in get_network_proximity().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 9af5106..6e9f2d7 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -446,9 +446,10 @@ unsigned int get_network_proximity(const char *name)
return PROXIMITY_ERROR;
net = get_network_number(name);
- if (net)
+ if (net) {
strcpy(name_or_num, net);
- else {
+ free(net);
+ } else {
char this[NI_MAXHOST + 1];
char *mask;

49
autofs-5.1.0-fix-leak-in-parse_mount.patch
View File

@ -1,49 +0,0 @@
autofs-5.1.0 - fix leak in parse_mount()
From: Ian Kent <ikent@redhat.com>
Fix a potential memory leak of the allocated mount location
in modules/parse_sun.c:parse_mount().
---
CHANGELOG | 1 +
modules/parse_sun.c | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index cb74c60..9cbccce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@
- check options length before use in parse_amd.c.
- fix some out of order evaluations in parse_amd.c.
- fix copy and paste error in dup_defaults_entry().
+- fix leak in parse_mount().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 1fdea0b..b881ee9 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1567,7 +1567,10 @@ int parse_mount(struct autofs_point *ap, const char *name,
*/
if ((strstr(options, "fstype=autofs") &&
strstr(options, "hosts"))) {
- loc = NULL;
+ if (loc) {
+ free(loc);
+ loc = NULL;
+ }
loclen = 0;
} else {
loclen = strlen(loc);
@@ -1591,7 +1594,8 @@ int parse_mount(struct autofs_point *ap, const char *name,
rv = sun_mount(ap, ap->path, name, name_len,
loc, loclen, options, ctxt);
- free(loc);
+ if (loc)
+ free(loc);
free(options);
pthread_setcancelstate(cur_state, NULL);
}

39
autofs-5.1.0-fix-mem-leak-in-create_client.patch
View File

@ -1,39 +0,0 @@
autofs-5.1.0 - fix memory leak in create_client()
From: Ian Kent <raven@themaw.net>
In create_client(), if the target host is unreachable the function
exists without freeing the addrinfo data returned from getaddrinfo(3).
---
CHANGELOG | 1 +
lib/rpc_subs.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index d693bce..0cb1d36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
- add mutex call return check in defaults.c.
- force disable browse mode for amd format maps.
- fix hosts map options check in lookup_amd_instance().
+- fix memory leak in create_client().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 5d6ead0..846c40e 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -720,8 +720,10 @@ static int create_client(struct conn_info *info, CLIENT **client)
ret = rpc_do_create_client(haddr->ai_addr, info, &fd, client);
if (ret == 0)
break;
- if (ret == -EHOSTUNREACH)
+ if (ret == -EHOSTUNREACH) {
+ freeaddrinfo(ai);
goto out_close;
+ }
if (!info->client && fd != RPC_ANYSOCK) {
close(fd);

34
autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch
View File

@ -1,34 +0,0 @@
autofs-5.1.0 - fix memory leak in conf_amd_get_log_options()
From: Ian Kent <raven@themaw.net>
Fix obvious memory leak in conf_amd_get_log_options().
---
CHANGELOG | 1 +
lib/defaults.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index d978529..f5bbb34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
- fix leak in cache_push_mapent().
- fix config entry read buffer not checked.
- fix FILE pointer check in defaults_read_config().
+- fix memory leak in conf_amd_get_log_options().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/defaults.c b/lib/defaults.c
index 1c3df56..4e09c19 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -1795,6 +1795,7 @@ unsigned int conf_amd_get_log_options(void)
if (log_level < LOG_CRIT)
log_level = LOG_CRIT;
}
+ free(tmp);
}
if (log_level == -1)

39
autofs-5.1.0-fix-memory-leak-in-get_defaults_entry.patch
View File

@ -1,39 +0,0 @@
autofs-5.1.0 - fix memory leak in get_defaults_entry()
From: Ian Kent <ikent@redhat.com>
In get_defaults_entry(), if parsing of the expanded defaults string fails
the expanded string used for the parse is not freed.
---
CHANGELOG | 1 +
modules/parse_amd.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2bb0500..439a51f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
- fix hosts map options check in lookup_amd_instance().
- fix memory leak in create_client().
- fix memory leak in get_exports().
+- fix memory leak in get_defaults_entry().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index a912385..ebf3807 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -1797,8 +1797,10 @@ static struct amd_entry *get_defaults_entry(struct autofs_point *ap,
char *expand;
if (!expand_selectors(ap, defaults, &expand, sv))
goto out;
- if (amd_parse_list(ap, expand, &dflts, &sv))
+ if (amd_parse_list(ap, expand, &dflts, &sv)) {
+ free(expand);
goto out;
+ }
entry = select_default_entry(ap, &dflts, sv);
if (!entry->map_type) {
/*

85
autofs-5.1.0-fix-memory-leak-in-get_exports.patch
View File

@ -1,85 +0,0 @@
autofs-5.1.0 - fix memory leak in get_exports()
From: Ian Kent <ikent@redhat.com>
In modules/lookup_hosts.c:get_exports() looping over the returned list of
exports uses the pointer that contains the list. The pointer is updated
in the process of creating the exports multi-mount so a pointer to the
returned list is no longer available to be freed when done.
---
CHANGELOG | 1 +
modules/lookup_hosts.c | 17 +++++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0cb1d36..2bb0500 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@
- force disable browse mode for amd format maps.
- fix hosts map options check in lookup_amd_instance().
- fix memory leak in create_client().
+- fix memory leak in get_exports().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index ea8f5d6..9d689ff 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -82,18 +82,19 @@ static char *get_exports(struct autofs_point *ap, const char *host)
{
char buf[MAX_ERR_BUF];
char *mapent;
- exports exp;
+ exports exp, this;
debug(ap->logopt, MODPREFIX "fetchng export list for %s", host);
exp = rpc_get_exports(host, 10, 0, RPC_CLOSE_NOLINGER);
mapent = NULL;
- while (exp) {
+ this = exp;
+ while (this) {
if (mapent) {
int len = strlen(mapent) + 1;
- len += strlen(host) + 2*(strlen(exp->ex_dir) + 2) + 3;
+ len += strlen(host) + 2*(strlen(this->ex_dir) + 2) + 3;
mapent = realloc(mapent, len);
if (!mapent) {
char *estr;
@@ -103,10 +104,10 @@ static char *get_exports(struct autofs_point *ap, const char *host)
return NULL;
}
strcat(mapent, " \"");
- strcat(mapent, exp->ex_dir);
+ strcat(mapent, this->ex_dir);
strcat(mapent, "\"");
} else {
- int len = 2*(strlen(exp->ex_dir) + 2) + strlen(host) + 3;
+ int len = 2*(strlen(this->ex_dir) + 2) + strlen(host) + 3;
mapent = malloc(len);
if (!mapent) {
@@ -117,16 +118,16 @@ static char *get_exports(struct autofs_point *ap, const char *host)
return NULL;
}
strcpy(mapent, "\"");
- strcat(mapent, exp->ex_dir);
+ strcat(mapent, this->ex_dir);
strcat(mapent, "\"");
}
strcat(mapent, " \"");
strcat(mapent, host);
strcat(mapent, ":");
- strcat(mapent, exp->ex_dir);
+ strcat(mapent, this->ex_dir);
strcat(mapent, "\"");
- exp = exp->ex_next;
+ this = this->ex_next;
}
rpc_exports_free(exp);

43
autofs-5.1.0-fix-out-of-order-clearing-of-options-buffer.patch
View File

@ -1,43 +0,0 @@
autofs-5.1.0 - fix out of order clearing of options buffer
From: Ian Kent <ikent@redhat.com>
When setting the result of parsing an options string the options buffer
was being cleared before use.
---
CHANGELOG | 1 +
modules/amd_parse.y | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 439a51f..51c935d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
- fix memory leak in create_client().
- fix memory leak in get_exports().
- fix memory leak in get_defaults_entry().
+- fix out of order clearing of options buffer.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/amd_parse.y b/modules/amd_parse.y
index f65ab7a..a7f38f8 100644
--- a/modules/amd_parse.y
+++ b/modules/amd_parse.y
@@ -396,7 +396,6 @@ option_assignment: MAP_OPTION OPTION_ASSIGN FS_TYPE
}
| MNT_OPTION OPTION_ASSIGN options
{
- memset(opts, 0, sizeof(opts));
if (!strcmp($1, "opts"))
entry.opts = amd_strdup(opts);
else if (!strcmp($1, "addopts"))
@@ -407,6 +406,7 @@ option_assignment: MAP_OPTION OPTION_ASSIGN FS_TYPE
amd_notify($1);
YYABORT;
}
+ memset(opts, 0, sizeof(opts));
}
| MNT_OPTION OPTION_ASSIGN
{

231
autofs-5.1.0-fix-reset-amd-lexer-scan-buffer.patch
View File

@ -1,231 +0,0 @@
autofs-5.1.0 - fix reset amd lexer scan buffer
From: Ian Kent <ikent@redhat.com>
When the amd parser encounters an error often the lexer is left in
a state where a new parse can't be started. Fix this by explicitly
naming our start states and resetting to the proper start state at
buffer initialization on each scan.
---
CHANGELOG | 1 +
modules/amd_tok.l | 59 +++++++++++++++++++++++++++++++--------------------
modules/parse_amd.c | 3 +++
3 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 51c935d..fe9b2f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@
- fix memory leak in get_exports().
- fix memory leak in get_defaults_entry().
- fix out of order clearing of options buffer.
+- fix reset amd lexer scan buffer.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/amd_tok.l b/modules/amd_tok.l
index 1d9c234..36bce49 100644
--- a/modules/amd_tok.l
+++ b/modules/amd_tok.l
@@ -1,4 +1,3 @@
-%{
/* ----------------------------------------------------------------------- *
*
* Copyright 2013 Ian Kent <raven@themaw.net>
@@ -18,6 +17,12 @@
*
* ----------------------------------------------------------------------- */
+%s START MAPOPTVAL FSOPTVAL MNTOPTVAL SELOPTVAL SELARGVAL
+
+%{
+
+static int reset_start_state = 0;
+
#ifdef ECHO
# undef ECHO
#endif
@@ -71,8 +76,6 @@ int amd_yyinput(char *, int);
%option nounput
-%x MAPOPTVAL FSOPTVAL MNTOPTVAL SELOPTVAL SELARGVAL
-
NL \r?\n
OPTWS [[:blank:]]*
OTHR [^!;:=/|\- \t\r\n#]*
@@ -120,7 +123,14 @@ CUTSEP (\|\||\/)
%%
-<INITIAL>{
+%{
+ if (reset_start_state) {
+ BEGIN START;
+ reset_start_state = 0;
+ }
+%}
+
+<START>{
{NL} |
\x00 { }
@@ -179,23 +189,23 @@ CUTSEP (\|\||\/)
<MAPOPTVAL>{
{NL} {
- BEGIN(INITIAL);
+ BEGIN(START);
yyless(1);
}
\x00 {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
yyless(1);
}
";" {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
}
{OPTWS} {
- BEGIN(INITIAL);
+ BEGIN(START);
return SPACE;
}
@@ -224,23 +234,23 @@ CUTSEP (\|\||\/)
<FSOPTVAL>{
{NL} {
- BEGIN(INITIAL);
+ BEGIN(START);
yyless(1);
}
\x00 {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
yyless(1);
}
";" {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
}
{OPTWS} {
- BEGIN(INITIAL);
+ BEGIN(START);
return SPACE;
}
@@ -254,23 +264,23 @@ CUTSEP (\|\||\/)
<MNTOPTVAL>{
{NL} {
- BEGIN(INITIAL);
+ BEGIN(START);
yyless(1);
}
\x00 {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
yyless(1);
}
";" {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
}
{OPTWS} {
- BEGIN(INITIAL);
+ BEGIN(START);
return SPACE;
}
@@ -286,23 +296,23 @@ CUTSEP (\|\||\/)
<SELOPTVAL>{
{NL} {
- BEGIN(INITIAL);
+ BEGIN(START);
yyless(1);
}
\x00 {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
yyless(1);
}
";" {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
}
{OPTWS} {
- BEGIN(INITIAL);
+ BEGIN(START);
return SPACE;
}
@@ -318,18 +328,18 @@ CUTSEP (\|\||\/)
<SELARGVAL>{
{NL} {
- BEGIN(INITIAL);
+ BEGIN(START);
yyless(1);
}
\x00 {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
yyless(1);
}
";" {
- BEGIN(INITIAL);
+ BEGIN(START);
return SEPERATOR;
}
@@ -391,6 +401,9 @@ static void amd_echo(void)
void amd_set_scan_buffer(const char *buffer)
{
+ YY_FLUSH_BUFFER;
+ reset_start_state = 1;
+
line = buffer;
line_pos = &line[0];
/*
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index ebf3807..9590cf4 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -1798,6 +1798,9 @@ static struct amd_entry *get_defaults_entry(struct autofs_point *ap,
if (!expand_selectors(ap, defaults, &expand, sv))
goto out;
if (amd_parse_list(ap, expand, &dflts, &sv)) {
+ error(ap->logopt, MODPREFIX
+ "failed to parse defaults entry, "
+ "attempting to use internal default");
free(expand);
goto out;
}

36
autofs-5.1.0-fix-signed-comparison-in-inet_fill_net.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.0 - fix signed comparison in inet_fill_net()
From: Ian Kent <raven@themaw.net>
Fix the less than 0 comparison of an incorrectly declared var in
inet_fill_net().
---
CHANGELOG | 1 +
lib/parse_subs.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index f5bbb34..6977443 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
- fix config entry read buffer not checked.
- fix FILE pointer check in defaults_read_config().
- fix memory leak in conf_amd_get_log_options().
+- fix signed comparison in inet_fill_net().
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index d3dfa57..c1648c2 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -378,7 +378,7 @@ unsigned int get_proximity(struct sockaddr *host_addr)
static char *inet_fill_net(const char *net_num, char *net)
{
char *np;
- unsigned int dots = 3;
+ int dots = 3;
if (strlen(net_num) > INET_ADDRSTRLEN)
return NULL;

107
autofs-5.1.0-fix-some-out-of-order-evaluations-in-parse_amd_c.patch
View File

@ -1,107 +0,0 @@
autofs-5.1.0 - fix some out of order evaluations in parse_amd.c
From: Ian Kent <ikent@redhat.com>
Fix some check contents before NULL check ordering in modules/parse_amd.c.
---
CHANGELOG | 1 +
modules/parse_amd.c | 33 ++++++++++++++-------------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 81aadca..4e00929 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@
- add return check in ldap check_map_indirect().
- check host macro is set before use.
- check options length before use in parse_amd.c.
+- fix some out of order evaluations in parse_amd.c.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 6764152..c4992c1 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -1226,13 +1226,12 @@ static unsigned int validate_auto_options(unsigned int logopt,
* left blank the mount must be expected to fail so don't
* report the error.
*/
- if (!*entry->fs)
- return 0;
- else if (!entry->fs) {
+ if (!entry->fs) {
error(logopt, MODPREFIX
"%s: file system not given", entry->type);
return 0;
- }
+ } else if (!*entry->fs)
+ return 0;
return 1;
}
@@ -1255,13 +1254,12 @@ static unsigned int validate_nfs_options(unsigned int logopt,
* expected to fail.
*/
if (!entry->rfs || !*entry->rfs) {
- if (!*entry->rfs)
+ if (entry->rfs && !*entry->rfs)
return 0;
/* Map option fs has been intentionally left blank */
if (entry->fs && !*entry->fs)
return 0;
- if (entry->fs)
- entry->rfs = strdup(entry->fs);
+ entry->rfs = strdup(entry->fs);
if (!entry->rfs) {
error(logopt, MODPREFIX
"%s: remote file system not given", entry->type);
@@ -1285,24 +1283,22 @@ static unsigned int validate_generic_options(unsigned int logopt,
* expected to fail so don't report the error.
*/
if (fstype != AMD_MOUNT_TYPE_LOFS) {
- if (!*entry->dev)
- return 0;
- else if (!entry->dev) {
+ if (!entry->dev) {
error(logopt, MODPREFIX
"%s: mount device not given", entry->type);
return 0;
- }
- } else {
- if (!*entry->rfs)
+ } else if (!*entry->dev)
return 0;
- else if (!entry->rfs) {
+ } else {
+ if (!entry->rfs) {
/*
* Can't use entry->type as the mount type to reprot
* the error since entry->type == "bind" not "lofs".
*/
error(logopt, "lofs: mount device not given");
return 0;
- }
+ } else if (!*entry->rfs)
+ return 0;
}
if (entry->sublink && !entry->fs) {
error(logopt, MODPREFIX
@@ -1337,13 +1333,12 @@ static unsigned int validate_host_options(unsigned int logopt,
* if it isn't given in the map entry. Don't report an error
* if it has been left empty since it's expected to fail.
*/
- if (!*entry->rhost)
- return 0;
- else if (!entry->rhost) {
+ if (!entry->rhost) {
error(logopt, MODPREFIX
"%s: remote host name not given", entry->type);
return 0;
- }
+ } else if (!*entry->rhost)
+ return 0;
return 1;
}

51
autofs-5.1.0-fix-typo-in-flagdir-configure-option.patch
View File

@ -1,51 +0,0 @@
autofs-5.1.0 - fix typo in flagdir configure option
From: Michael Tokarev <mjt@tls.msk.ru>
This problem was originally reported, and a patch offered, by
Michael Tokarev but was inadvertantly missed, so the change is
credited to him in retrospect.
---
CHANGELOG | 1 +
configure | 2 +-
configure.in | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2b7d55a..519fea3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
- fix out of order clearing of options buffer.
- fix reset amd lexer scan buffer.
- ignore multiple commas in options strings.
+- fix typo in flagdir configure option.
04/06/2014 autofs-5.1.0
=======================
diff --git a/configure b/configure
index dcb82cd..2349bf9 100755
--- a/configure
+++ b/configure
@@ -2381,7 +2381,7 @@ if test "${with_flagdir+set}" = set; then :
then
:
else
- filagdir="${withval}"
+ flagdir="${withval}"
fi
fi
diff --git a/configure.in b/configure.in
index cd3e7a3..b92f3c5 100644
--- a/configure.in
+++ b/configure.in
@@ -114,7 +114,7 @@ AC_ARG_WITH(flagdir,
then
:
else
- filagdir="${withval}"
+ flagdir="${withval}"
fi
)
AC_MSG_CHECKING([for autofs flag file directory])

35
autofs-5.1.0-fix-typo-in-update_hosts_mounts.patch
View File

@ -1,35 +0,0 @@
autofs-5.1.0 - fix typo in update_hosts_mounts()
From: Ian Kent <ikent@redhat.com>
Correct the stutter in the update exports message.
---
CHANGELOG | 1 +
modules/lookup_hosts.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7c0a7bb..645efe5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@
- update man page autofs(8) for systemd.
- fix fix master map type check.
- init qdn before use in get_query_dn().
+- fix typo in update_hosts_mounts().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 9d689ff..407cf31 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -214,7 +214,7 @@ next:
goto cont;
debug(ap->logopt, MODPREFIX
- "attempt to update exports for exports for %s", me->key);
+ "attempt to update exports for %s", me->key);
master_source_current_wait(ap->entry);
ap->entry->current = source;

52
autofs-5.1.0-force-disable-browse-mode-for-amd-format-maps.patch
View File

@ -1,52 +0,0 @@
autofs-5.1.0 - force disable browse mode for amd format maps
From: Ian Kent <ikent@redhat.com>
As in am-utils amd format maps using autofs file system don't support
the browse option and in autofs they don't work properly if it is used.
This might be implemented later but for now forcefully disable it.
---
CHANGELOG | 1 +
lib/master_parse.y | 2 ++
modules/mount_autofs.c | 2 ++
3 files changed, 5 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 31a804d..f291095 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@
- fix copy and paste error in dup_defaults_entry().
- fix leak in parse_mount().
- add mutex call return check in defaults.c.
+- force disable browse mode for amd format maps.
04/06/2014 autofs-5.1.0
=======================
diff --git a/lib/master_parse.y b/lib/master_parse.y
index e31023d..9da78fc 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -810,6 +810,8 @@ int master_parse_entry(const char *buffer, unsigned int default_timeout, unsigne
logopt = LOGOPT_DEBUG;
else if (loglevel <= LOG_INFO && loglevel > LOG_ERR)
logopt = LOGOPT_VERBOSE;
+ /* amd mounts don't support browse mode */
+ ghost = 0;
}
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index c7cba3a..4846e7f 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -261,6 +261,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,
nap->pref = am_entry->pref;
am_entry->pref = NULL;
}
+ /* amd mounts don't support browse mode */
+ nap->flags &= ~MOUNT_FLAG_GHOST;
}
if (handle_mounts_startup_cond_init(&suc)) {

63
autofs-5.1.0-gaurd-against-incorrect-umount-return.patch
View File

@ -1,63 +0,0 @@
autofs-5.1.0 - gaurd against incorrect umount return
From: Ian Kent <ikent@redhat.com>
If umount(8) returns a fail but the mount is actually umounted autofs
can incorrectly try reconstruct mount triggers. This can lead to the
automount point becoming unresponsive.
---
CHANGELOG | 1 +
daemon/automount.c | 3 ++-
lib/mounts.c | 6 ++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c6d8933..f7b2ec1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@
- ignore multiple commas in options strings.
- fix typo in flagdir configure option.
- clarify multiple mounts description.
+- gaurd against incorrect umount return.
04/06/2014 autofs-5.1.0
=======================
diff --git a/daemon/automount.c b/daemon/automount.c
index 64dc305..229cb1a 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -532,7 +532,8 @@ static int umount_subtree_mounts(struct autofs_point *ap, const char *path, unsi
if (!is_mm_root && is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
struct amd_entry *entry;
debug(ap->logopt, "unmounting dir = %s", path);
- if (umount_ent(ap, path)) {
+ if (umount_ent(ap, path) &&
+ is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
warn(ap->logopt, "could not umount dir %s", path);
left++;
goto done;
diff --git a/lib/mounts.c b/lib/mounts.c
index f635371..27ea744 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -2165,7 +2165,8 @@ int umount_multi_triggers(struct autofs_point *ap, struct mapent *me, char *root
*/
if (is_mounted(_PATH_MOUNTED, root, MNTS_REAL)) {
info(ap->logopt, "unmounting dir = %s", root);
- if (umount_ent(ap, root)) {
+ if (umount_ent(ap, root) &&
+ is_mounted(_PATH_MOUNTED, root, MNTS_REAL)) {
if (mount_multi_triggers(ap, me, root, strlen(root), "/") < 0)
warn(ap->logopt,
"failed to remount offset triggers");
@@ -2266,7 +2267,8 @@ int clean_stale_multi_triggers(struct autofs_point *ap,
*/
if (oe->ioctlfd != -1 ||
is_mounted(_PROC_MOUNTS, oe->key, MNTS_REAL)) {
- if (umount_ent(ap, oe->key)) {
+ if (umount_ent(ap, oe->key) &&
+ is_mounted(_PROC_MOUNTS, oe->key, MNTS_REAL)) {
debug(ap->logopt,
"offset %s has active mount, invalidate",
oe->key);

56
autofs-5.1.0-ignore-multiple-commas-in-options-strings.patch
View File

@ -1,56 +0,0 @@
autofs-5.1.0 - ignore multiple commas in options strings
From: Ian Kent <ikent@redhat.com>
When parsing options strings (such as opts, addopts or remopts) the parser
would object to multiple occurrances of the comma character. But this is
probably not a significant problem and the parser should just ignore them.
---
CHANGELOG | 1 +
modules/amd_parse.y | 4 ++++
modules/amd_tok.l | 4 ++--
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index fe9b2f9..2b7d55a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@
- fix memory leak in get_defaults_entry().
- fix out of order clearing of options buffer.
- fix reset amd lexer scan buffer.
+- ignore multiple commas in options strings.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/amd_parse.y b/modules/amd_parse.y
index a7f38f8..ce8623d 100644
--- a/modules/amd_parse.y
+++ b/modules/amd_parse.y
@@ -465,6 +465,10 @@ options: OPTION
{
prepend_opt(opts, $1);
}
+ | OPTION COMMA
+ {
+ prepend_opt(opts, $1);
+ }
;
%%
diff --git a/modules/amd_tok.l b/modules/amd_tok.l
index 36bce49..03e716f 100644
--- a/modules/amd_tok.l
+++ b/modules/amd_tok.l
@@ -284,9 +284,9 @@ CUTSEP (\|\||\/)
return SPACE;
}
- ":=" { return OPTION_ASSIGN; }
+ (:=)(,+)? { return OPTION_ASSIGN; }
- "," { return COMMA; }
+ ,+ { return COMMA; }
{OPTS} {
amd_copy_buffer();

35
autofs-5.1.0-init-qdn-before-use.patch
View File

@ -1,35 +0,0 @@
autofs-5.1.0 - init qdn before use in get_query_dn()
From: Ian Kent <ikent@redhat.com>
Ensure qdn is initialized before use in case there's garbage in it.
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9e2dc89..7c0a7bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@
- gaurd against incorrect umount return.
- update man page autofs(8) for systemd.
- fix fix master map type check.
+- init qdn before use in get_query_dn().
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index ac2ef30..5da613e 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -335,7 +335,7 @@ LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_conte
static int get_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
{
char buf[MAX_ERR_BUF];
- char *query, *dn, *qdn;
+ char *query, *dn, *qdn = NULL;
LDAPMessage *result = NULL, *e;
char *attrs[2];
struct berval **value;

108
autofs-5.1.0-make-negative-cache-update-consistent-for-all-lookup-modules.patch
View File

@ -1,108 +0,0 @@
autofs-5.1.0 - make negative cache update consistent for all lookup modules
From: Ian Kent <ikent@redhat.com>
Use common function for negative cache update everywhere to ensure consistency.
---
CHANGELOG | 1 +
modules/lookup_hosts.c | 14 +-------------
modules/lookup_nisplus.c | 13 +------------
modules/lookup_program.c | 14 +-------------
4 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 59f2906..37b2cde 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@
- init qdn before use in get_query_dn().
- fix typo in update_hosts_mounts().
- fix hosts map update on reload.
+- make negative cache update consistent for all lookup modules.
04/06/2014 autofs-5.1.0
=======================
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 407cf31..02bf970 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -149,22 +149,10 @@ static int do_parse_mount(struct autofs_point *ap, struct map_source *source,
ret = ctxt->parse->parse_mount(ap, name, name_len,
mapent, ctxt->parse->context);
if (ret) {
- time_t now = time(NULL);
struct mapent_cache *mc = source->mc;
- struct mapent *me;
- int rv = CHE_OK;
cache_writelock(mc);
- me = cache_lookup_distinct(mc, name);
- if (me)
- rv = cache_push_mapent(me, NULL);
- else
- rv = cache_update(mc, source, name, NULL, now);
- if (rv != CHE_FAIL) {
- me = cache_lookup_distinct(mc, name);
- if (me)
- me->status = now + ap->negative_timeout;
- }
+ cache_update_negative(mc, source, name, ap->negative_timeout);
cache_unlock(mc);
return NSS_STATUS_TRYAGAIN;
}
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index db1b162..d5eba47 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -777,24 +777,13 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
ret = ctxt->parse->parse_mount(ap, key, key_len,
mapent, ctxt->parse->context);
if (ret) {
- time_t now = time(NULL);
- int rv = CHE_OK;
-
free(mapent);
/* Don't update negative cache when re-connecting */
if (ap->flags & MOUNT_FLAG_REMOUNT)
return NSS_STATUS_TRYAGAIN;
cache_writelock(mc);
- me = cache_lookup_distinct(mc, key);
- if (me)
- rv = cache_push_mapent(me, NULL);
- else
- rv = cache_update(mc, source, key, NULL, now);
- if (rv != CHE_FAIL) {
- me = cache_lookup_distinct(mc, key);
- me->status = time(NULL) + ap->negative_timeout;
- }
+ cache_update_negative(mc, source, key, ap->negative_timeout);
cache_unlock(mc);
return NSS_STATUS_TRYAGAIN;
}
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index aae0ec0..bf0e350 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -622,20 +622,8 @@ out_free:
free(mapent);
if (ret) {
- time_t now = time(NULL);
- int rv = CHE_OK;
-
cache_writelock(mc);
- me = cache_lookup_distinct(mc, name);
- if (me)
- rv = cache_push_mapent(me, NULL);
- else
- rv = cache_update(mc, source, name, NULL, now);
- if (rv != CHE_FAIL) {
- me = cache_lookup_distinct(mc, name);
- if (me)
- me->status = now + ap->negative_timeout;
- }
+ cache_update_negative(mc, source, name, ap->negative_timeout);
cache_unlock(mc);
return NSS_STATUS_TRYAGAIN;
}

42
autofs-5.1.0-make-service-want-network-online.patch
View File

@ -1,42 +0,0 @@
autofs-5.1.0 - make service want network-online
From: Ian Kent <ikent@redhat.com>
autofs often fails to start properly in Fedora with recent systemd.
Changing the systemd unit to Want the network-online target works
around this.
I'm not sure if this will cause problems for people that use file
maps and expect autofs to start without the network up but I hope
that's a small minority, if there are any at all.
---
CHANGELOG | 1 +
samples/autofs.service.in | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index d09567a..9b8de1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@
- make negative cache update consistent for all lookup modules.
- ensure negative cache isn't updated on remount.
- dont add wildcard to negative cache.
+- make service want network-online.
04/06/2014 autofs-5.1.0
=======================
diff --git a/samples/autofs.service.in b/samples/autofs.service.in
index 777463d..d4de6ff 100644
--- a/samples/autofs.service.in
+++ b/samples/autofs.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Automounts filesystems on demand
-After=network.target ypbind.service sssd.service
+After=network.target ypbind.service sssd.service network-online.target
+Wants=network-online.target
[Service]
Type=forking

116
autofs-5.1.0-update-man-page-autofs-8-for-systemd.patch
View File

@ -1,116 +0,0 @@
autofs-5.1.0 - update man page autofs(8) for systemd
From: Ian Kent <ikent@redhat.com>
Update the autofs(8) man page to account for systems using systemd.
---
CHANGELOG | 1 +
man/autofs.8.in | 51 +++++++++++++++++++++++++++++++++++++--------------
2 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f7b2ec1..b0dce1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@
- fix typo in flagdir configure option.
- clarify multiple mounts description.
- gaurd against incorrect umount return.
+- update man page autofs(8) for systemd.
04/06/2014 autofs-5.1.0
=======================
diff --git a/man/autofs.8.in b/man/autofs.8.in
index 7ab4242..dffbeac 100644
--- a/man/autofs.8.in
+++ b/man/autofs.8.in
@@ -1,23 +1,30 @@
.TH AUTOFS 8 "9 Sep 1997"
.SH NAME
-@@initdir@@/autofs \- Control Script for automounter
+Service control for the automounter
.SH SYNOPSIS
+If a SysV init script system is being used:
+.br
.B @@initdir@@/autofs
.I start|stop|restart|reload|status
+.P
+or if the systemd init system is being used:
+.br
+.B systemctl
+.I start|stop|restart|reload|status
+.B autofs.service
.SH "DESCRIPTION"
.B autofs
controls the operation of the
.BR automount (8)
-daemons running on the Linux system. Usually
+daemon(s) running on the Linux system. Usually
.B autofs
is invoked at system boot time with the
.I start
parameter and at shutdown time with the
.I stop
-parameter. The
-.B autofs
-script can also be manually invoked by the system administrator to shut
-down, restart or reload the automounters.
+parameter. Service control actions can also be manually invoked by
+the system administrator to shut down, restart, reload or obtain
+service status.
.P
.SH "OPERATION"
.B autofs
@@ -31,28 +38,44 @@ will mount and start a thread, with the appropriate parameters, to
manage the mount point.
.P
.B @@initdir@@/autofs reload
-will check the current auto.master map against running daemons. It will kill
-those daemons whose entries have changed and then start daemons for new or
-changed entries.
+or
+.B systemctl autofs.service reload
+will check the current auto.master map against the current automount managed
+mounts. It will terminate those daemons or threads (depending on
+.B autofs
+version) whose entries have been removed, re-read the automount maps for
+entries that have changed and start new daemons or threads for entries
+that have been added.
.P
-If a map is modified then the change will become effective immediately. If
-the
+If an indirect map is modified then the change will become effective immediately.
+If an indirect map uses the
+.B browse
+option, the master map contains direct mount maps or the
.I auto.master
map is modified then the
.B autofs
-script must be rerun to activate the changes.
+service control reload action must be rerun to activate the changes.
.P
.B @@initdir@@/autofs status
+or
+.B systemctl autofs.service status
will display the status of,
.BR automount (8)
-,running or not.
+,running or not. When using the systemd init system the status output includes
+somewhat more information related to the service status.
+.P
+.B systemctl(1)
+has more functions than the actions mentioned here, see
+.B systemctl(1)
+for more information.
.SH "SEE ALSO"
.BR automount (8),
.BR autofs (5),
.BR autofs.conf (5),
.BR auto.master (5).
.BR autofs_ldap_auth.conf (5)
+.BR systemctl(1)
.SH AUTHOR
This manual page was written by Christoph Lameter <chris@waterf.org>,
for the Debi GNU/Linux system. Edited by H. Peter Anvin
-<hpa@transmeta.com>.
+<hpa@transmeta.com> and Ian Kent <raven@themaw.net>.

243
autofs-5.1.1-Add-a-mode-option-for-master-map-entries.patch
View File

@ -1,243 +0,0 @@
autofs-5.1.1 - Add a mode option for master map entries
From: Cyril B <cbay@excellency.fr>
Add a --mode map option to change the mode for the base location mount
point. If this option is given, autofs will chmod the mount point right
after mounting it (as the kernel autofs filesystem doesn't support a
'mode' option).
Changing the mode of the base location mount point is normally not needed,
but if one wants to do that, it's much better to do it inside autofs rather
than outside to avoid race conditions and making sure the correct permissions
are always set.
Signed-off-by: Cyril B <cbay@excellency.fr>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/direct.c | 4 ++++
daemon/indirect.c | 4 ++++
include/automount.h | 1 +
lib/master.c | 1 +
lib/master_parse.y | 9 ++++++++-
lib/master_tok.l | 19 ++++++++++++++++++-
man/auto.master.5.in | 5 +++++
8 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8d27e55..f954018 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
- add configuration option to use fqdn in mounts.
- fix out of order call in program map lookup.
- fix error handling of is_mounted().
+- Add a mode option for master map entries.
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/direct.c b/daemon/direct.c
index 5569299..1962a58 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -339,6 +339,7 @@ int do_mount_autofs_direct(struct autofs_point *ap,
int status, ret, ioctlfd;
const char *map_name;
time_t runfreq;
+ int err;
if (timeout) {
/* Calculate the expire run frequency */
@@ -433,6 +434,9 @@ int do_mount_autofs_direct(struct autofs_point *ap,
goto out_umount;
}
+ if (ap->mode && (err = chmod(me->key, ap->mode)))
+ warn(ap->logopt, "failed to change mode of %s", me->key);
+
ops->open(ap->logopt, &ioctlfd, st.st_dev, me->key);
if (ioctlfd < 0) {
crit(ap->logopt, "failed to create ioctl fd for %s", me->key);
diff --git a/daemon/indirect.c b/daemon/indirect.c
index a04a624..bfd181d 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -95,6 +95,7 @@ static int do_mount_autofs_indirect(struct autofs_point *ap, const char *root)
struct stat st;
struct mnt_list *mnts;
int ret;
+ int err;
ap->exp_runfreq = (timeout + CHECK_RATIO - 1) / CHECK_RATIO;
@@ -163,6 +164,9 @@ static int do_mount_autofs_indirect(struct autofs_point *ap, const char *root)
goto out_umount;
}
+ if (ap->mode && (err = chmod(root, ap->mode)))
+ warn(ap->logopt, "failed to change mode of %s", ap->path);
+
if (ops->open(ap->logopt, &ap->ioctlfd, st.st_dev, root)) {
crit(ap->logopt,
"failed to create ioctl fd for autofs path %s", ap->path);
diff --git a/include/automount.h b/include/automount.h
index 3ea2381..c56e265 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -508,6 +508,7 @@ struct kernel_mod_version {
struct autofs_point {
pthread_t thid;
char *path; /* Mount point name */
+ mode_t mode; /* Mount point mode */
char *pref; /* amd prefix */
int pipefd; /* File descriptor for pipe */
int kpipefd; /* Kernel end descriptor for pipe */
diff --git a/lib/master.c b/lib/master.c
index 6c38b1c..4588fa7 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -129,6 +129,7 @@ int master_add_autofs_point(struct master_mapent *entry, unsigned logopt,
free(ap);
return 0;
}
+ ap->mode = 0;
entry->ap = ap;
diff --git a/lib/master_parse.y b/lib/master_parse.y
index 9da78fc..0011429 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -63,6 +63,7 @@ static unsigned ghost;
extern unsigned global_selection_options;
static unsigned random_selection;
static unsigned use_weight;
+static unsigned long mode;
static char **tmp_argv;
static int tmp_argc;
static char **local_argv;
@@ -101,7 +102,7 @@ static int master_fprintf(FILE *, char *, ...);
%token COMMENT
%token MAP
%token OPT_TIMEOUT OPT_NTIMEOUT OPT_NOBIND OPT_NOGHOST OPT_GHOST OPT_VERBOSE
-%token OPT_DEBUG OPT_RANDOM OPT_USE_WEIGHT OPT_SYMLINK
+%token OPT_DEBUG OPT_RANDOM OPT_USE_WEIGHT OPT_SYMLINK OPT_MODE
%token COLON COMMA NL DDASH
%type <strtype> map
%type <strtype> options
@@ -126,6 +127,7 @@ static int master_fprintf(FILE *, char *, ...);
%token <strtype> MAPXFN
%token <strtype> MAPNAME
%token <longtype> NUMBER
+%token <longtype> OCTALNUMBER
%token <strtype> OPTION
%start file
@@ -192,6 +194,7 @@ line:
| PATH OPT_GHOST { master_notify($1); YYABORT; }
| PATH OPT_NOGHOST { master_notify($1); YYABORT; }
| PATH OPT_VERBOSE { master_notify($1); YYABORT; }
+ | PATH OPT_MODE { master_notify($1); YYABORT; }
| PATH { master_notify($1); YYABORT; }
| QUOTE { master_notify($1); YYABORT; }
| OPTION { master_notify($1); YYABORT; }
@@ -576,6 +579,7 @@ daemon_option: OPT_TIMEOUT NUMBER { timeout = $2; }
| OPT_DEBUG { debug = 1; }
| OPT_RANDOM { random_selection = 1; }
| OPT_USE_WEIGHT { use_weight = 1; }
+ | OPT_MODE OCTALNUMBER { mode = $2; }
;
mount_option: OPTION
@@ -644,6 +648,7 @@ static void local_init_vars(void)
ghost = defaults_get_browse_mode();
random_selection = global_selection_options & MOUNT_FLAG_RANDOM_SELECT;
use_weight = 0;
+ mode = 0;
tmp_argv = NULL;
tmp_argc = 0;
local_argv = NULL;
@@ -847,6 +852,8 @@ int master_parse_entry(const char *buffer, unsigned int default_timeout, unsigne
entry->ap->flags |= MOUNT_FLAG_SYMLINK;
if (negative_timeout)
entry->ap->negative_timeout = negative_timeout;
+ if (mode && mode < LONG_MAX)
+ entry->ap->mode = mode;
/*
source = master_find_map_source(entry, type, format,
diff --git a/lib/master_tok.l b/lib/master_tok.l
index c692e14..b32918d 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -84,7 +84,7 @@ unsigned int tlen;
%option nounput
-%x PATHSTR MAPSTR DNSTR OPTSTR
+%x PATHSTR MAPSTR DNSTR OPTSTR OCTAL
WS [[:blank:]]+
OPTWS [[:blank:]]*
@@ -95,6 +95,7 @@ OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=(\"?([[:alnum:]_\-\:])+\"?))?)+)
MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-\.])*)=([[:alnum:]_\-\.])+)
SLASHIFYSTR (--(no-)?slashify-colons)
NUMBER [0-9]+
+OCTALNUMBER [0-7]+
DNSERVSTR1 ([[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?:)
DNSERVSTR2 (\[([[:xdigit:]]:.)+\](:[0-9]+)?:)
@@ -125,6 +126,8 @@ MTYPE ((file|program|exec|sss|yp|nis|nisplus|ldap|ldaps|hesiod|userdir)(,(sun|h
OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeout{OPTWS}={OPTWS})
+MODE (--mode{OPTWS}|--mode{OPTWS}={OPTWS})
+
%%
<INITIAL>{
@@ -392,6 +395,11 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
-w|--use-weight-only { return(OPT_USE_WEIGHT); }
-r|--random-multimount-selection { return(OPT_RANDOM); }
+ {MODE}/{OCTALNUMBER} {
+ BEGIN(OCTAL);
+ return(OPT_MODE);
+ }
+
{OPTWS}","{OPTWS} { return(COMMA); }
{OPTWS} {}
@@ -423,6 +431,15 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
<<EOF>> { BEGIN(INITIAL); }
}
+<OCTAL>{
+ {OCTALNUMBER} {
+ master_lval.longtype = strtoul(master_text, NULL, 8);
+ return(OCTALNUMBER);
+ }
+
+ . { BEGIN(OPTSTR); yyless(0); }
+}
+
%%
#include "automount.h"
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
index 2e475dc..ba28494 100644
--- a/man/auto.master.5.in
+++ b/man/auto.master.5.in
@@ -211,6 +211,11 @@ or in the configuration.
Set the timeout for caching failed key lookups. This option can be
used to override the global default given either on the command line
or in the configuration.
+.TP
+.I "\-\-mode <octal_mode>"
+Set the directory mode for the base location of the \fBautofs\fP mount point.
+If this option is given, \fBautofs\fP will chmod that directory with this
+mode.
.SH BUILTIN MAP \-hosts
If "\-hosts" is given as the map then accessing a key under the mount point
which corresponds to a hostname will allow access to the exports of that

198
autofs-5.1.1-add-configuration-option-to-use-hostname-in-mounts.patch
View File

@ -1,198 +0,0 @@
autofs-5.1.1 - add configuration option to use fqdn in mounts
From: Ian Kent <raven@themaw.net>
When a server name returns multiple IP addresses autofs uses the IP
address when performing the mount to ensure that the the host proximity
order is respected, and that servers that aren't responding aren't
tried.
But sometimes people need to use the server name for the mount so
add a configuration option to enable that.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
include/defaults.h | 3 +++
lib/defaults.c | 18 ++++++++++++++++++
man/autofs.conf.5.in | 18 ++++++++++++++++++
modules/mount_nfs.c | 3 ++-
modules/replicated.c | 6 ++++++
redhat/autofs.conf.default.in | 8 ++++++++
samples/autofs.conf.default.in | 8 ++++++++
8 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2b8d224..2c516e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@
- fix update_hosts_mounts() return.
- change lookup to use reinit instead of reopen.
- update map_hash_table_size description.
+- add configuration option to use fqdn in mounts.
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/defaults.h b/include/defaults.h
index 4f32e12..3788078 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -47,6 +47,8 @@
#define DEFAULT_MAP_HASH_TABLE_SIZE "1024"
+#define DEFAULT_USE_HOSTNAME_FOR_MOUNTS "0"
+
/* Config entry flags */
#define CONF_NONE 0x00000000
#define CONF_ENV 0x00000001
@@ -162,6 +164,7 @@ unsigned int defaults_get_mount_wait(void);
unsigned int defaults_get_umount_wait(void);
const char *defaults_get_auth_conf_file(void);
unsigned int defaults_get_map_hash_table_size(void);
+unsigned int defaults_use_hostname_for_mounts(void);
unsigned int conf_amd_mount_section_exists(const char *);
char *conf_amd_get_arch(void);
diff --git a/lib/defaults.c b/lib/defaults.c
index 74fafc5..7159536 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -73,6 +73,8 @@
#define NAME_MAP_HASH_TABLE_SIZE "map_hash_table_size"
+#define NAME_USE_HOSTNAME_FOR_MOUNTS "use_hostname_for_mounts"
+
#define NAME_AMD_ARCH "arch"
#define NAME_AMD_AUTO_ATTRCACHE "auto_attrcache"
#define NAME_AMD_AUTO_DIR "auto_dir"
@@ -335,6 +337,11 @@ static int conf_load_autofs_defaults(void)
if (ret == CFG_FAIL)
goto error;
+ ret = conf_update(sec, NAME_USE_HOSTNAME_FOR_MOUNTS,
+ DEFAULT_USE_HOSTNAME_FOR_MOUNTS, CONF_ENV);
+ if (ret == CFG_FAIL)
+ goto error;
+
/* LDAP_URI and SEARCH_BASE can occur multiple times */
while ((co = conf_lookup(sec, NAME_LDAP_URI)))
conf_delete(co->section, co->name);
@@ -1701,6 +1708,17 @@ unsigned int defaults_get_map_hash_table_size(void)
return (unsigned int) size;
}
+unsigned int defaults_use_hostname_for_mounts(void)
+{
+ int res;
+
+ res = conf_get_yesno(autofs_gbl_sec, NAME_USE_HOSTNAME_FOR_MOUNTS);
+ if (res < 0)
+ res = atoi(DEFAULT_USE_HOSTNAME_FOR_MOUNTS);
+
+ return res;
+}
+
unsigned int conf_amd_mount_section_exists(const char *section)
{
return conf_section_exists(section);
diff --git a/man/autofs.conf.5.in b/man/autofs.conf.5.in
index 4434eb8..6eb5d02 100644
--- a/man/autofs.conf.5.in
+++ b/man/autofs.conf.5.in
@@ -111,6 +111,24 @@ entries, in this case, is usually much less than the number of entries
in the map. In this last case it would be unusual for the map entry
cache to grow large enough to warrant increasing the default before
an event that cleans stale entries, a map re-read for example.
+.TP
+.B use_hostname_for_mounts
+.br
+NFS mounts where the host name resolves to more than one IP address
+are probed for availability and to establish the order in which mounts
+to them should be tried. To ensure that mount attempts are made only
+to hosts that are responding and are tried in the order of hosts with
+the quickest response the IP address of the host needs to be used for
+the mount.
+
+If it is necessary to use the hostname given in the map entry for the
+mount regardless, then set this option to "yes".
+
+Be aware that if this is done there is no defense against the host
+name resolving to one that isn't responding and while the number
+of attempts at a successful mount will correspond to the number of
+addresses the host name resolves to the order will also not correspond
+to fastest responding hosts.
.SS LDAP Configuration
.P
Configuration settings available are:
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 15e1043..aa786f3 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -316,7 +316,8 @@ dont_probe:
/* Not a local host - do an NFS mount */
- if (this->rr && this->addr) {
+ if (this->rr && this->addr &&
+ !defaults_use_hostname_for_mounts()) {
socklen_t len = INET6_ADDRSTRLEN;
char n_buf[len + 1];
const char *n_addr;
diff --git a/modules/replicated.c b/modules/replicated.c
index 32860d5..8437f5f 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -667,6 +667,12 @@ int prune_host_list(unsigned logopt, struct host **list,
if (!*list)
return 0;
+ /* If we're using the host name then there's no point probing
+ * avialability and respose time.
+ */
+ if (defaults_use_hostname_for_mounts())
+ return 1;
+
/* Use closest hosts to choose NFS version */
first = *list;
diff --git a/redhat/autofs.conf.default.in b/redhat/autofs.conf.default.in
index da0882f..b751043 100644
--- a/redhat/autofs.conf.default.in
+++ b/redhat/autofs.conf.default.in
@@ -142,6 +142,14 @@ mount_nfs_default_protocol = 4
#
#map_hash_table_size = 1024
#
+# use_hostname_for_mounts - nfs mounts where the host name resolves
+# to more than one IP address normally need
+# to use the IP address to esure a mount to
+# a host that isn't responding isn't done.
+# If that behaviour is not wanted then set
+# ths to "yes", default is "no".
+#
+#use_hostname_for_mounts = "no"
#
# Otions for the amd parser within autofs.
#
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 80abb43..4b48c63 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -141,6 +141,14 @@ browse_mode = no
#
#map_hash_table_size = 1024
#
+# use_hostname_for_mounts - nfs mounts where the host name resolves
+# to more than one IP address normally need
+# to use the IP address to esure a mount to
+# a host that isn't responding isn't done.
+# If that behaviour is not wanted then set
+# ths to "yes", default is "no".
+#
+#use_hostname_for_mounts = "no"
#
# Otions for the amd parser within autofs.
#

666
autofs-5.1.1-add-reinit-entry-point-to-modules.patch
View File

@ -1,666 +0,0 @@
autofs-5.1.1 - add reinit entry point to modules
From: Ian Kent <raven@themaw.net>
In order to avoid closing and then re-opening lookup modules
on HUP signal (since there init entry point needs to be called
for initialization) add a reinit entry point to lookup, parse
and mount modules.
Signed-off-by: Ian Kent <raven@themaw.net>
---
daemon/module.c | 39 +++++++++++++++++++++++++++++++++++++++
include/automount.h | 15 +++++++++++++++
modules/lookup_dir.c | 9 ++++++++-
modules/lookup_file.c | 9 ++++++++-
modules/lookup_hesiod.c | 9 ++++++++-
modules/lookup_hosts.c | 9 ++++++++-
modules/lookup_ldap.c | 9 ++++++++-
modules/lookup_multi.c | 9 ++++++++-
modules/lookup_nisplus.c | 9 ++++++++-
modules/lookup_program.c | 9 ++++++++-
modules/lookup_sss.c | 9 ++++++++-
modules/lookup_userhome.c | 9 ++++++++-
modules/lookup_yp.c | 9 ++++++++-
modules/mount_afs.c | 5 +++++
modules/mount_autofs.c | 5 +++++
modules/mount_bind.c | 5 +++++
modules/mount_changer.c | 5 +++++
modules/mount_ext2.c | 5 +++++
modules/mount_generic.c | 5 +++++
modules/mount_nfs.c | 5 +++++
modules/parse_amd.c | 5 +++++
modules/parse_hesiod.c | 5 +++++
modules/parse_sun.c | 5 +++++
23 files changed, 192 insertions(+), 11 deletions(-)
diff --git a/daemon/module.c b/daemon/module.c
index 9028aaa..3bd7a0c 100644
--- a/daemon/module.c
+++ b/daemon/module.c
@@ -105,6 +105,7 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
}
if (!(mod->lookup_init = (lookup_init_t) dlsym(dh, "lookup_init")) ||
+ !(mod->lookup_reinit = (lookup_reinit_t) dlsym(dh, "lookup_reinit")) ||
!(mod->lookup_read_master = (lookup_read_master_t) dlsym(dh, "lookup_read_master")) ||
!(mod->lookup_read_map = (lookup_read_map_t) dlsym(dh, "lookup_read_map")) ||
!(mod->lookup_mount = (lookup_mount_t) dlsym(dh, "lookup_mount")) ||
@@ -127,6 +128,19 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
return NSS_STATUS_SUCCESS;
}
+int reinit_lookup(struct lookup_mod *mod, const char *name,
+ const char *err_prefix, const char *mapfmt,
+ int argc, const char *const *argv)
+{
+ if (mod->lookup_reinit(mapfmt, argc, argv, &mod->context)) {
+ if (err_prefix)
+ logerr("%scould not reinit lookup module %s",
+ err_prefix, name);
+ return 1;
+ }
+ return 0;
+}
+
int close_lookup(struct lookup_mod *mod)
{
int rv = mod->lookup_done(mod->context);
@@ -185,6 +199,7 @@ struct parse_mod *open_parse(const char *name, const char *err_prefix,
}
if (!(mod->parse_init = (parse_init_t) dlsym(dh, "parse_init")) ||
+ !(mod->parse_reinit = (parse_reinit_t) dlsym(dh, "parse_reinit")) ||
!(mod->parse_mount = (parse_mount_t) dlsym(dh, "parse_mount")) ||
!(mod->parse_done = (parse_done_t) dlsym(dh, "parse_done"))) {
if (err_prefix)
@@ -204,6 +219,18 @@ struct parse_mod *open_parse(const char *name, const char *err_prefix,
return mod;
}
+int reinit_parse(struct parse_mod *mod, const char *name,
+ const char *err_prefix, int argc, const char *const *argv)
+{
+ if (mod->parse_reinit(argc, argv, &mod->context)) {
+ if (err_prefix)
+ logerr("%scould not reinit parse module %s",
+ err_prefix, name);
+ return 1;
+ }
+ return 0;
+}
+
int close_parse(struct parse_mod *mod)
{
int rv = mod->parse_done(mod->context);
@@ -261,6 +288,7 @@ struct mount_mod *open_mount(const char *name, const char *err_prefix)
}
if (!(mod->mount_init = (mount_init_t) dlsym(dh, "mount_init")) ||
+ !(mod->mount_reinit = (mount_reinit_t) dlsym(dh, "mount_reinit")) ||
!(mod->mount_mount = (mount_mount_t) dlsym(dh, "mount_mount")) ||
!(mod->mount_done = (mount_done_t) dlsym(dh, "mount_done"))) {
if (err_prefix)
@@ -280,6 +308,17 @@ struct mount_mod *open_mount(const char *name, const char *err_prefix)
return mod;
}
+int reinit_mount(struct mount_mod *mod, const char *name, const char *err_prefix)
+{
+ if (mod->mount_reinit(&mod->context)) {
+ if (err_prefix)
+ logerr("%scould not reinit mount module %s",
+ err_prefix, name);
+ return 1;
+ }
+ return 0;
+}
+
int close_mount(struct mount_mod *mod)
{
int rv = mod->mount_done(mod->context);
diff --git a/include/automount.h b/include/automount.h
index d614c10..ab3e360 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -281,12 +281,14 @@ int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key);
#ifdef MODULE_LOOKUP
int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context);
+int lookup_reinit(const char *mapfmt, int argc, const char *const *argv, void **context);
int lookup_read_master(struct master *master, time_t age, void *context);
int lookup_read_map(struct autofs_point *, time_t, void *context);
int lookup_mount(struct autofs_point *, const char *, int, void *);
int lookup_done(void *);
#endif
typedef int (*lookup_init_t) (const char *, int, const char *const *, void **);
+typedef int (*lookup_reinit_t) (const char *, int, const char *const *, void **);
typedef int (*lookup_read_master_t) (struct master *master, time_t, void *);
typedef int (*lookup_read_map_t) (struct autofs_point *, time_t, void *);
typedef int (*lookup_mount_t) (struct autofs_point *, const char *, int, void *);
@@ -294,6 +296,7 @@ typedef int (*lookup_done_t) (void *);
struct lookup_mod {
lookup_init_t lookup_init;
+ lookup_reinit_t lookup_reinit;
lookup_read_master_t lookup_read_master;
lookup_read_map_t lookup_read_map;
lookup_mount_t lookup_mount;
@@ -304,6 +307,9 @@ struct lookup_mod {
int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
int argc, const char *const *argv, struct lookup_mod **lookup);
+int reinit_lookup(struct lookup_mod *mod, const char *name,
+ const char *err_prefix, const char *mapfmt,
+ int argc, const char *const *argv);
int close_lookup(struct lookup_mod *);
/* parse module */
@@ -312,16 +318,19 @@ int close_lookup(struct lookup_mod *);
#ifdef MODULE_PARSE
int parse_init(int argc, const char *const *argv, void **context);
+int parse_reinit(int argc, const char *const *argv, void **context);
int parse_mount(struct autofs_point *ap, const char *name,
int name_len, const char *mapent, void *context);
int parse_done(void *);
#endif
typedef int (*parse_init_t) (int, const char *const *, void **);
+typedef int (*parse_reinit_t) (int, const char *const *, void **);
typedef int (*parse_mount_t) (struct autofs_point *, const char *, int, const char *, void *);
typedef int (*parse_done_t) (void *);
struct parse_mod {
parse_init_t parse_init;
+ parse_reinit_t parse_reinit;
parse_mount_t parse_mount;
parse_done_t parse_done;
void *dlhandle;
@@ -330,6 +339,8 @@ struct parse_mod {
struct parse_mod *open_parse(const char *name, const char *err_prefix,
int argc, const char *const *argv);
+int reinit_parse(struct parse_mod *, const char *name,
+ const char *err_prefix, int argc, const char *const *argv);
int close_parse(struct parse_mod *);
/* mount module */
@@ -338,17 +349,20 @@ int close_parse(struct parse_mod *);
#ifdef MODULE_MOUNT
int mount_init(void **context);
+int mount_reinit(void **context);
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options, void *context);
int mount_done(void *context);
#endif
typedef int (*mount_init_t) (void **);
+typedef int (*mount_reinit_t) (void **);
typedef int (*mount_mount_t) (struct autofs_point *, const char *, const char *, int,
const char *, const char *, const char *, void *);
typedef int (*mount_done_t) (void *);
struct mount_mod {
mount_init_t mount_init;
+ mount_reinit_t mount_reinit;
mount_mount_t mount_mount;
mount_done_t mount_done;
void *dlhandle;
@@ -356,6 +370,7 @@ struct mount_mod {
};
struct mount_mod *open_mount(const char *name, const char *err_prefix);
+int reinit_mount(struct mount_mod *mod, const char *name, const char *err_prefix);
int close_mount(struct mount_mod *);
/* buffer management */
diff --git a/modules/lookup_dir.c b/modules/lookup_dir.c
index cbeda1f..7a95e24 100644
--- a/modules/lookup_dir.c
+++ b/modules/lookup_dir.c
@@ -51,7 +51,8 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -105,6 +106,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
static int acceptable_dirent_p(const struct dirent *e)
{
size_t namesz;
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 7c982c6..c32a4cd 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -50,7 +50,8 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -112,6 +113,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
static int read_one(unsigned logopt, FILE *f, char *key, unsigned int *k_len, char *mapent, unsigned int *m_len)
{
char *kptr, *p;
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index 526f294..de5ec08 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -39,7 +39,8 @@ int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
/* This initializes a context (persistent non-global data) for queries to
this module. */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt = NULL;
char buf[MAX_ERR_BUF];
@@ -96,6 +97,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
return NSS_STATUS_UNKNOWN;
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 53aa9d6..8ba0a4a 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -46,7 +46,8 @@ int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
exports rpc_get_exports(const char *host, long seconds, long micros, unsigned int option);
void rpc_exports_free(exports list);
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -73,6 +74,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
return NSS_STATUS_UNKNOWN;
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index d846d8e..0f5bc48 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1687,7 +1687,8 @@ static void validate_uris(struct list_head *list)
* This initializes a context (persistent non-global data) for queries to
* this module. Return zero if we succeed.
*/
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
unsigned int is_amd_format;
struct lookup_context *ctxt;
@@ -1835,6 +1836,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
struct lookup_context *ctxt = (struct lookup_context *) context;
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index ba8d4f0..0ee20f5 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -150,7 +150,8 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
return NULL;
}
-int lookup_init(const char *my_mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *my_mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -244,6 +245,12 @@ error_out:
return 1;
}
+int lookup_reinit(const char *my_mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
return NSS_STATUS_UNKNOWN;
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index d5eba47..0c66152 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -30,7 +30,8 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -76,6 +77,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
struct lookup_context *ctxt = (struct lookup_context *) context;
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index a3a7e98..fa4f54d 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -49,7 +49,8 @@ struct parse_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -100,6 +101,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int lookup_read_master(struct master *master, time_t age, void *context)
{
return NSS_STATUS_UNKNOWN;
diff --git a/modules/lookup_sss.c b/modules/lookup_sss.c
index 720b5e3..c58a272 100644
--- a/modules/lookup_sss.c
+++ b/modules/lookup_sss.c
@@ -56,7 +56,8 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -137,6 +138,12 @@ lib_names_fail:
return 1;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
static int setautomntent(unsigned int logopt,
struct lookup_context *ctxt, const char *mapname,
void **sss_ctxt)
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index fb3caaa..c21dee9 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -29,7 +29,14 @@
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0; /* Nothing to do */
+}
+
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
return 0; /* Nothing to do */
}
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index fcf470a..1e5a7ed 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -103,7 +103,8 @@ static unsigned int get_map_order(const char *domain, const char *map)
return (unsigned int) last_changed;
}
-int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context)
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
@@ -165,6 +166,12 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
return 0;
}
+int lookup_reinit(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int yp_all_master_callback(int status, char *ypkey, int ypkeylen,
char *val, int vallen, char *ypcb_data)
{
diff --git a/modules/mount_afs.c b/modules/mount_afs.c
index 50628ce..2a776bd 100644
--- a/modules/mount_afs.c
+++ b/modules/mount_afs.c
@@ -25,6 +25,11 @@ int mount_init(void **context)
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options, void *context)
{
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 4846e7f..39948e6 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -39,6 +39,11 @@ int mount_init(void **context)
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name,
int name_len, const char *what, const char *fstype,
const char *c_options, void *context)
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index ac954e3..4864ea5 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -67,6 +67,11 @@ out:
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options, void *context)
{
diff --git a/modules/mount_changer.c b/modules/mount_changer.c
index 5e2b47c..798f23b 100644
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -41,6 +41,11 @@ int mount_init(void **context)
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options, void *context)
{
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index 3c87512..c00e3d5 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -33,6 +33,11 @@ int mount_init(void **context)
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options, void *context)
{
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index c4108e6..ae63787 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -33,6 +33,11 @@ int mount_init(void **context)
return 0;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options,
void *context)
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 315fc99..15e1043 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -54,6 +54,11 @@ int mount_init(void **context)
return !mount_bind;
}
+int mount_reinit(void **context)
+{
+ return 0;
+}
+
int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len,
const char *what, const char *fstype, const char *options,
void *context)
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 2e3d21f..0626bf4 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -130,6 +130,11 @@ int parse_init(int argc, const char *const *argv, void **context)
return 0;
}
+int parse_reinit(int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
static struct substvar *add_lookup_vars(struct autofs_point *ap,
const char *key, int key_len,
struct map_source *source,
diff --git a/modules/parse_hesiod.c b/modules/parse_hesiod.c
index 237fd50..0b2b57f 100644
--- a/modules/parse_hesiod.c
+++ b/modules/parse_hesiod.c
@@ -261,6 +261,11 @@ int parse_init(int argc, const char *const *argv, void **context)
return 0;
}
+int parse_reinit(int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
int parse_done(void *context)
{
return 0;
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 10dbd0c..35d6da5 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -413,6 +413,11 @@ options_done:
return 0;
}
+int parse_reinit(int argc, const char *const *argv, void **context)
+{
+ return 0;
+}
+
static const char *parse_options(const char *str, char **ret, unsigned int logopt)
{
const char *cp = str;

101
autofs-5.1.1-add-type-to-struct-lookup_mod.patch
View File

@ -1,101 +0,0 @@
autofs-5.1.1 - add type to struct lookup_mod
From: Ian Kent <raven@themaw.net>
Add opened map type field to struct lookup_mod for module comparison
during reinit.
Signed-off-by: Ian Kent <raven@themaw.net>
---
daemon/module.c | 18 ++++++++++++++++++
include/automount.h | 1 +
2 files changed, 19 insertions(+)
diff --git a/daemon/module.c b/daemon/module.c
index 3bd7a0c..d9921f4 100644
--- a/daemon/module.c
+++ b/daemon/module.c
@@ -61,6 +61,7 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
char buf[MAX_ERR_BUF];
char fnbuf[PATH_MAX];
size_t size;
+ char *type;
void *dh;
int *ver;
@@ -75,10 +76,20 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
return NSS_STATUS_UNAVAIL;
}
+ type = strdup(name);
+ if (!type) {
+ free(mod);
+ if (err_prefix) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr("%s%s", err_prefix, estr);
+ }
+ }
+
size = snprintf(fnbuf, sizeof(fnbuf),
"%s/lookup_%s.so", AUTOFS_LIB_DIR, name);
if (size >= sizeof(fnbuf)) {
free(mod);
+ free(type);
if (err_prefix) {
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr("%s%s", err_prefix, estr);
@@ -91,6 +102,7 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
logerr("%scannot open lookup module %s (%s)",
err_prefix, name, dlerror());
free(mod);
+ free(type);
return NSS_STATUS_UNAVAIL;
}
@@ -101,6 +113,7 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
err_prefix, name);
dlclose(dh);
free(mod);
+ free(type);
return NSS_STATUS_UNAVAIL;
}
@@ -114,14 +127,18 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
logerr("%slookup module %s corrupt", err_prefix, name);
dlclose(dh);
free(mod);
+ free(type);
return NSS_STATUS_UNAVAIL;
}
if (mod->lookup_init(mapfmt, argc, argv, &mod->context)) {
dlclose(dh);
free(mod);
+ free(type);
return NSS_STATUS_NOTFOUND;
}
+
+ mod->type = type;
mod->dlhandle = dh;
*lookup = mod;
@@ -145,6 +162,7 @@ int close_lookup(struct lookup_mod *mod)
{
int rv = mod->lookup_done(mod->context);
dlclose(mod->dlhandle);
+ free(mod->type);
free(mod);
return rv;
}
diff --git a/include/automount.h b/include/automount.h
index ab3e360..3ea2381 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -301,6 +301,7 @@ struct lookup_mod {
lookup_read_map_t lookup_read_map;
lookup_mount_t lookup_mount;
lookup_done_t lookup_done;
+ char *type;
void *dlhandle;
void *context;
};

77
autofs-5.1.1-change-lookup-to-use-reinit-instead-of-reopen.patch
View File

@ -1,77 +0,0 @@
autofs-5.1.1 - change lookup to use reinit instead of reopen
From: Ian Kent <raven@themaw.net>
When a HUP signal is received lookup module are cloed and then re-opened.
This can occassionally cause a problem with library data segemets and
lead to a SEGV.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/lookup.c | 32 +++++++++++++++++++++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 77aad99..16e5344 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@
- fix direct map expire not set for initail empty map.
- fix missing source sss in multi map lookup.
- fix update_hosts_mounts() return.
+- change lookup to use reinit instead of reopen.
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 0579f98..afd14ab 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -300,17 +300,27 @@ static int do_read_map(struct autofs_point *ap, struct map_source *map, time_t a
struct lookup_mod *lookup;
int status;
- status = open_lookup(map->type, "", map->format,
- map->argc, map->argv, &lookup);
- if (status != NSS_STATUS_SUCCESS) {
- debug(ap->logopt, "lookup module %s failed", map->type);
- return status;
- }
-
+ lookup = NULL;
master_source_writelock(ap->entry);
- if (map->lookup)
- close_lookup(map->lookup);
- map->lookup = lookup;
+ if (!map->lookup) {
+ status = open_lookup(map->type, "", map->format,
+ map->argc, map->argv, &lookup);
+ if (status != NSS_STATUS_SUCCESS) {
+ master_source_unlock(ap->entry);
+ debug(ap->logopt,
+ "lookup module %s open failed", map->type);
+ return status;
+ }
+ map->lookup = lookup;
+ } else {
+ lookup = map->lookup;
+ status = lookup->lookup_reinit(map->format,
+ map->argc, map->argv,
+ &lookup->context);
+ if (status)
+ warn(ap->logopt,
+ "lookup module %s reinit failed", map->type);
+ }
master_source_unlock(ap->entry);
if (!map->stale)
@@ -742,7 +752,7 @@ int do_lookup_mount(struct autofs_point *ap, struct map_source *map, const char
map->format, map->argc, map->argv, &lookup);
if (status != NSS_STATUS_SUCCESS) {
debug(ap->logopt,
- "lookup module %s failed", map->type);
+ "lookup module %s open failed", map->type);
return status;
}
map->lookup = lookup;

170
autofs-5.1.1-change-remaining-gettimeofday-to-use-clock_gettime.patch
View File

@ -1,170 +0,0 @@
autofs-5.1.1 - change remaining gettimeofday() to use clock_gettime()
From: Yu Ning <ning.yu@ubuntu.com>
The time returned by gettimeofday() is affected by discontinuous jumps
in the system time, so it causes an issue that autofs may not auto
unmount a mount point if system time is manually changed by the system
administrator.
To fix the issue we need to convert to using a monotonic clock source
instead of the clock source used by gettimeofday().
Change the reamining gettimeofday() function calls to clock_gettime()
calls.
Signed-off-by: Yu Ning <ning.yu@ubuntu.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
lib/rpc_subs.c | 9 ++++-----
modules/replicated.c | 30 ++++++++++++++----------------
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c243a8a..49520d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@
- define pending condition init helper function.
- use monotonic clock for direct mount condition.
- use monotonic clock for indirect mount condition.
+- change remaining gettimeofday() to use clock_gettime().
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index e0e1979..4a84c16 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -1092,19 +1092,18 @@ int rpc_time(const char *host,
{
int status;
double taken;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
int proto = (ping_proto & RPC_PING_UDP) ? IPPROTO_UDP : IPPROTO_TCP;
unsigned long vers = ping_vers;
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = __rpc_ping(host, vers, proto, seconds, micros, option);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == RPC_PING_FAIL || status < 0)
return status;
- taken = elapsed(start, end);
+ taken = monotonic_elapsed(start, end);
if (result != NULL)
*result = taken;
diff --git a/modules/replicated.c b/modules/replicated.c
index 8437f5f..f4cae3e 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -231,8 +231,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
socklen_t len = INET6_ADDRSTRLEN;
char buf[len + 1];
struct pmap parms;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
unsigned int supported = 0;
double taken = 0;
int status, count = 0;
@@ -292,9 +291,9 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -306,7 +305,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
debug(logopt,
"nfs v4 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end);
debug(logopt, "nfs v4 rpc ping time: %f", reply);
}
taken += reply;
@@ -351,9 +350,9 @@ v3_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT) {
supported = status;
goto done_ver;
@@ -365,7 +364,7 @@ v3_ver:
debug(logopt,
"nfs v3 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);
+ reply = monotonic_elapsed(start, end);
debug(logopt, "nfs v3 rpc ping time: %f", reply);
}
taken += reply;
@@ -407,9 +406,9 @@ v2_ver:
supported = status;
goto done_ver;
} else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status == -ETIMEDOUT)
supported = status;
else if (status > 0) {
@@ -420,7 +419,7 @@ v2_ver:
debug(logopt,
"nfs v2 random selection time: %f", reply);
} else {
- reply = elapsed(start, end);;
+ reply = monotonic_elapsed(start, end);;
debug(logopt, "nfs v2 rpc ping time: %f", reply);
}
taken += reply;
@@ -523,8 +522,7 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
struct conn_info pm_info, rpc_info;
int proto;
unsigned int vers;
- struct timeval start, end;
- struct timezone tz;
+ struct timespec start, end;
double taken = 0;
time_t timeout = RPC_TIMEOUT;
int status = 0;
@@ -610,16 +608,16 @@ static int get_supported_ver_and_cost(unsigned logopt, struct host *host,
if (status == -EHOSTUNREACH)
goto done;
else if (!status) {
- gettimeofday(&start, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &start);
status = rpc_ping_proto(&rpc_info);
- gettimeofday(&end, &tz);
+ clock_gettime(CLOCK_MONOTONIC, &end);
if (status > 0) {
if (random_selection) {
/* Random value between 0 and 1 */
taken = ((float) random())/((float) RAND_MAX+1);
debug(logopt, "random selection time %f", taken);
} else {
- taken = elapsed(start, end);
+ taken = monotonic_elapsed(start, end);
debug(logopt, "rpc ping time %f", taken);
}
}

581
autofs-5.1.1-change-time-to-use-monotonic_clock.patch
View File

@ -1,581 +0,0 @@
autofs-5.1.1 - change time() to use monotonic_clock()
From: Yu Ning <ning.yu@ubuntu.com>
The time returned by gettimeofday() is affected by discontinuous jumps
in the system time, so it causes an issue that autofs may not auto
unmount a mount point if system time is manually changed by the system
administrator.
To fix the issue we need to convert to using a monotonic clock source
instead of the clock source used by gettimeofday().
Finally hange the time() function calls to monotonic_clock() calls.
Signed-off-by: Yu Ning <ning.yu@ubuntu.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/automount.c | 4 ++--
daemon/direct.c | 4 ++--
daemon/indirect.c | 4 ++--
daemon/lookup.c | 6 +++---
daemon/state.c | 2 +-
lib/cache.c | 2 +-
lib/master.c | 4 ++--
modules/dclist.c | 2 +-
modules/lookup_file.c | 8 ++++----
modules/lookup_hesiod.c | 6 +++---
modules/lookup_hosts.c | 4 ++--
modules/lookup_ldap.c | 10 +++++-----
modules/lookup_nisplus.c | 10 +++++-----
modules/lookup_program.c | 10 +++++-----
modules/lookup_sss.c | 6 +++---
modules/lookup_userhome.c | 2 +-
modules/lookup_yp.c | 8 ++++----
modules/mount_autofs.c | 2 +-
modules/parse_amd.c | 2 +-
modules/replicated.c | 4 ++--
21 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 49520d3..4f589db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
- use monotonic clock for direct mount condition.
- use monotonic clock for indirect mount condition.
- change remaining gettimeofday() to use clock_gettime().
+- change time() to use monotonic_clock().
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/automount.c b/daemon/automount.c
index 6cba3db..74e62a1 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1454,7 +1454,7 @@ static void *statemachine(void *arg)
break;
case SIGHUP:
- do_hup_signal(master_list, time(NULL));
+ do_hup_signal(master_list, monotonic_time(NULL));
break;
default:
@@ -2005,7 +2005,7 @@ int main(int argc, char *argv[])
unsigned ghost, logging, daemon_check;
unsigned dumpmaps, foreground, have_global_options;
time_t timeout;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
struct rlimit rlim;
const char *options = "+hp:t:vmdD:fVrO:l:n:CF";
static const struct option long_options[] = {
diff --git a/daemon/direct.c b/daemon/direct.c
index 9b7fd76..d427580 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -468,7 +468,7 @@ int mount_autofs_direct(struct autofs_point *ap)
struct mapent_cache *nc, *mc;
struct mapent *me, *ne, *nested;
struct mnt_list *mnts;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
if (strcmp(ap->path, "/-")) {
error(ap->logopt, "expected direct map, exiting");
@@ -1387,7 +1387,7 @@ int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_
}
/* Check if we recorded a mount fail for this key */
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
ops->send_fail(ap->logopt,
ioctlfd, pkt->wait_queue_token, -ENOENT);
ops->close(ap->logopt, ioctlfd);
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 263fff1..4c32bdb 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -201,7 +201,7 @@ out_err:
int mount_autofs_indirect(struct autofs_point *ap, const char *root)
{
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int status;
int map;
@@ -817,7 +817,7 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, pkt->name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
ops->send_fail(ap->logopt, ap->ioctlfd,
pkt->wait_queue_token, -ENOENT);
cache_unlock(me->mc);
diff --git a/daemon/lookup.c b/daemon/lookup.c
index afd14ab..0129f75 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -841,7 +841,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
struct map_source *instance;
char src_file[] = "file";
char src_prog[] = "program";
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
struct stat st;
char *type, *format;
@@ -881,7 +881,7 @@ static int lookup_name_source_instance(struct autofs_point *ap, struct map_sourc
{
struct map_source *instance;
const char *format;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
if (*name == '/' && map->flags & MAP_FLAG_FORMAT_AMD)
return lookup_amd_instance(ap, map, name, name_len);
@@ -1045,7 +1045,7 @@ static void update_negative_cache(struct autofs_point *ap, struct map_source *so
else
map = entry->maps;
if (map) {
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int rv = CHE_FAIL;
cache_writelock(map->mc);
diff --git a/daemon/state.c b/daemon/state.c
index 6c8c4f6..3ef8d95 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -564,7 +564,7 @@ static unsigned int st_readmap(struct autofs_point *ap)
pthread_t thid;
struct readmap_args *ra;
int status;
- int now = time(NULL);
+ int now = monotonic_time(NULL);
debug(ap->logopt, "state %d path %s", ap->state, ap->path);
diff --git a/lib/cache.c b/lib/cache.c
index 631d275..44e323d 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -775,7 +775,7 @@ void cache_update_negative(struct mapent_cache *mc,
struct map_source *ms, const char *key,
time_t timeout)
{
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
struct mapent *me;
int rv = CHE_OK;
diff --git a/lib/master.c b/lib/master.c
index 4588fa7..9ffdd1a 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -1484,7 +1484,7 @@ int dump_map(struct master *master, const char *type, const char *name)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
this = list_entry(p, struct master_mapent, list);
p = p->next;
@@ -1602,7 +1602,7 @@ int master_show_mounts(struct master *master)
struct map_source *source;
struct master_mapent *this;
struct autofs_point *ap;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
unsigned int count = 0;
this = list_entry(p, struct master_mapent, list);
diff --git a/modules/dclist.c b/modules/dclist.c
index af21ce0..4daa199 100644
--- a/modules/dclist.c
+++ b/modules/dclist.c
@@ -568,7 +568,7 @@ struct dclist *get_dc_list(unsigned int logopt, const char *uri)
if (!list)
goto out_error;
- dclist->expire = time(NULL) + min_ttl;
+ dclist->expire = monotonic_time(NULL) + min_ttl;
dclist->uri = list;
return dclist;
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index aed3cba..72444fe 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -795,7 +795,7 @@ static int match_key(struct autofs_point *ap,
{
char buf[MAX_ERR_BUF];
struct mapent_cache *mc;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
char *lkp_key;
char *prefix;
size_t map_key_len;
@@ -860,7 +860,7 @@ static int lookup_one(struct autofs_point *ap,
struct mapent_cache *mc = source->mc;
char mkey[KEY_MAX_LEN + 1];
char mapent[MAPENT_MAX_LEN + 1];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
FILE *f;
unsigned int k_len, m_len;
int entry, ret;
@@ -966,7 +966,7 @@ static int lookup_wild(struct autofs_point *ap,
struct mapent_cache *mc;
char mkey[KEY_MAX_LEN + 1];
char mapent[MAPENT_MAX_LEN + 1];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
FILE *f;
unsigned int k_len, m_len;
int entry, ret;
@@ -1170,7 +1170,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index c0f7f51..12ccf41 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -222,7 +222,7 @@ static int lookup_one(struct autofs_point *ap,
}
cache_writelock(mc);
- ret = cache_update(mc, source, key, best_record, time(NULL));
+ ret = cache_update(mc, source, key, best_record, monotonic_time(NULL));
cache_unlock(mc);
if (ret == CHE_FAIL) {
hesiod_free_list(ctxt->hesiod_context, hes_result);
@@ -287,7 +287,7 @@ static int lookup_one_amd(struct autofs_point *ap,
}
cache_writelock(mc);
- ret = cache_update(mc, source, lkp_key, *hes_result, time(NULL));
+ ret = cache_update(mc, source, lkp_key, *hes_result, monotonic_time(NULL));
cache_unlock(mc);
if (hes_result)
@@ -398,7 +398,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 0a64655..163b02d 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -302,7 +302,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
struct mapent *me;
char *mapent = NULL;
int mapent_len;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
int ret;
source = ap->entry->current;
@@ -314,7 +314,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 578d6c6..afc89c1 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -995,7 +995,7 @@ static int do_reconnect(unsigned logopt,
uris_mutex_lock(ctxt);
if (ctxt->dclist) {
- if (!ldap || ctxt->dclist->expire < time(NULL)) {
+ if (!ldap || ctxt->dclist->expire < monotonic_time(NULL)) {
free_dclist(ctxt->dclist);
ctxt->dclist = NULL;
}
@@ -2961,7 +2961,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
struct mapent_cache *mc;
int rv, i, l, ql, count;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
char *query;
LDAPMessage *result = NULL, *e;
char *class, *info, *entry;
@@ -3326,7 +3326,7 @@ static int lookup_one_amd(struct autofs_point *ap,
struct berval **bvKey;
struct berval **bvValues;
char buf[MAX_ERR_BUF];
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int rv, l, ql, count;
int ret = CHE_MISSING;
@@ -3531,7 +3531,7 @@ static int check_map_indirect(struct autofs_point *ap,
unsigned int is_amd_format = source->flags & MAP_FLAG_FORMAT_AMD;
struct mapent_cache *mc;
struct mapent *me;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
time_t t_last_read;
int ret, cur_state;
int status;
@@ -3669,7 +3669,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 5fd1d89..27f9856 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -338,7 +338,7 @@ static int lookup_one(struct autofs_point *ap,
nis_result *result;
nis_object *this;
char *mapent;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int ret, cur_state;
char buf[MAX_ERR_BUF];
@@ -450,7 +450,7 @@ static int lookup_wild(struct autofs_point *ap,
nis_result *result;
nis_object *this;
char *mapent;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int ret, cur_state;
char buf[MAX_ERR_BUF];
@@ -537,7 +537,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,
mapent = ENTRY_VAL(this, 1);
cache_writelock(mc);
- ret = cache_update(mc, source, "/defaults", mapent, time(NULL));
+ ret = cache_update(mc, source, "/defaults", mapent, monotonic_time(NULL));
cache_unlock(mc);
nis_freeresult(result);
@@ -555,7 +555,7 @@ static int check_map_indirect(struct autofs_point *ap,
unsigned int is_amd_format = source->flags & MAP_FLAG_FORMAT_AMD;
struct mapent_cache *mc;
struct mapent *me, *exists;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
time_t t_last_read;
int ret = 0;
@@ -700,7 +700,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index a46ff0e..b3f1c1f 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -430,7 +430,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,
while (isblank(*start))
start++;
cache_writelock(mc);
- ret = cache_update(mc, source, "/defaults", start, time(NULL));
+ ret = cache_update(mc, source, "/defaults", start, monotonic_time(NULL));
cache_unlock(mc);
if (ret == CHE_FAIL) {
free(ment);
@@ -499,7 +499,7 @@ static int match_key(struct autofs_point *ap,
start++;
}
cache_writelock(mc);
- ret = cache_update(mc, source, lkp_key, start, time(NULL));
+ ret = cache_update(mc, source, lkp_key, start, monotonic_time(NULL));
cache_unlock(mc);
if (ret == CHE_FAIL) {
free(ment);
@@ -552,7 +552,7 @@ static int match_key(struct autofs_point *ap,
while (isblank(*start))
start++;
cache_writelock(mc);
- ret = cache_update(mc, source, match, start, time(NULL));
+ ret = cache_update(mc, source, match, start, monotonic_time(NULL));
cache_unlock(mc);
if (ret == CHE_FAIL) {
free(match);
@@ -598,7 +598,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, name, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
@@ -647,7 +647,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
* proceed with the program map lookup.
*/
if (strchr(name, '/') ||
- me->age + ap->negative_timeout > time(NULL)) {
+ me->age + ap->negative_timeout > monotonic_time(NULL)) {
char *ent = NULL;
if (me->mapent) {
diff --git a/modules/lookup_sss.c b/modules/lookup_sss.c
index 2f32e94..e01dd28 100644
--- a/modules/lookup_sss.c
+++ b/modules/lookup_sss.c
@@ -447,7 +447,7 @@ static int lookup_one(struct autofs_point *ap,
struct mapent_cache *mc;
struct mapent *we;
void *sss_ctxt = NULL;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
char buf[MAX_ERR_BUF];
char *value = NULL;
char *s_key;
@@ -568,7 +568,7 @@ static int check_map_indirect(struct autofs_point *ap,
struct map_source *source;
struct mapent_cache *mc;
struct mapent *me;
- time_t now = time(NULL);
+ time_t now = monotonic_time(NULL);
time_t t_last_read;
int ret, cur_state;
@@ -662,7 +662,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index c21dee9..8117640 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -84,7 +84,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
}
cache_writelock(mc);
- ret = cache_update(mc, source, name, NULL, time(NULL));
+ ret = cache_update(mc, source, name, NULL, monotonic_time(NULL));
cache_unlock(mc);
if (ret == CHE_FAIL) {
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index e31c2cf..eda2aba 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -461,7 +461,7 @@ static int lookup_one(struct autofs_point *ap,
char *mapname;
char *mapent;
int mapent_len;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int ret;
mc = source->mc;
@@ -573,7 +573,7 @@ static int lookup_wild(struct autofs_point *ap,
char *mapname;
char *mapent;
int mapent_len;
- time_t age = time(NULL);
+ time_t age = monotonic_time(NULL);
int ret;
mc = source->mc;
@@ -654,7 +654,7 @@ static int lookup_amd_defaults(struct autofs_point *ap,
return CHE_FAIL;
cache_writelock(mc);
- ret = cache_update(mc, source, "/defaults", mapent, time(NULL));
+ ret = cache_update(mc, source, "/defaults", mapent, monotonic_time(NULL));
cache_unlock(mc);
return ret;
@@ -809,7 +809,7 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
/* Check if we recorded a mount fail for this key anywhere */
me = lookup_source_mapent(ap, key, LKP_DISTINCT);
if (me) {
- if (me->status >= time(NULL)) {
+ if (me->status >= monotonic_time(NULL)) {
cache_unlock(me->mc);
return NSS_STATUS_NOTFOUND;
} else {
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 39948e6..c6a3199 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -247,7 +247,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,
source = master_add_map_source(entry,
info->type, info->format,
- time(NULL), argc, argv);
+ monotonic_time(NULL), argc, argv);
if (!source) {
error(ap->logopt,
MODPREFIX "failed to add map source to entry");
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 0626bf4..b8e0078 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -1188,7 +1188,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name,
"hosts", "sun", argc, pargv);
if (!instance) {
instance = master_add_source_instance(source,
- "hosts", "sun", time(NULL), argc, pargv);
+ "hosts", "sun", monotonic_time(NULL), argc, pargv);
if (!instance) {
error(ap->logopt, MODPREFIX
"failed to create source instance for hosts map");
diff --git a/modules/replicated.c b/modules/replicated.c
index f4cae3e..315e300 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -69,14 +69,14 @@ void seed_random(void)
fd = open_fd("/dev/urandom", O_RDONLY);
if (fd < 0) {
- srandom(time(NULL));
+ srandom(monotonic_time(NULL));
return;
}
if (read(fd, &seed, sizeof(seed)) != -1)
srandom(seed);
else
- srandom(time(NULL));
+ srandom(monotonic_time(NULL));
close(fd);

91
autofs-5.1.1-define-monotonic-clock-helper-functions.patch
View File

@ -1,91 +0,0 @@
autofs-5.1.1 - define monotonic clock helper functions
From: Yu Ning <ning.yu@ubuntu.com>
The time returned by gettimeofday() is affected by discontinuous jumps
in the system time, so it causes an issue that autofs may not auto
unmount a mount point if system time is manually changed by the system
administrator.
To fix the issue we need to convert to using a monotonic clock source
instead of the clock source used by gettimeofday().
Start by defining two helper functions that will be used by later
patches.
Signed-off-by: Yu Ning <ning.yu@ubuntu.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
include/automount.h | 10 ++++++++++
include/rpc_subs.h | 1 +
lib/rpc_subs.c | 11 +++++++++++
4 files changed, 23 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index f954018..566a6c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
- fix out of order call in program map lookup.
- fix error handling of is_mounted().
- Add a mode option for master map entries.
+- define monotonic clock helper functions.
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/automount.h b/include/automount.h
index c56e265..9e82048 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -582,6 +582,16 @@ do { \
fatal(_m_unlock); \
} while(0)
+static inline time_t monotonic_time(time_t *t)
+{
+ struct timespec ts;
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ if (t)
+ *t = (time_t) ts.tv_sec;
+ return (time_t) ts.tv_sec;
+}
+
/* Expire alarm handling routines */
int alarm_start_handler(void);
int alarm_add(struct autofs_point *ap, time_t seconds);
diff --git a/include/rpc_subs.h b/include/rpc_subs.h
index b6d59f9..e329224 100644
--- a/include/rpc_subs.h
+++ b/include/rpc_subs.h
@@ -71,6 +71,7 @@ int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);
int rpc_ping_proto(struct conn_info *);
int rpc_ping(const char *, long, long, unsigned int);
double elapsed(struct timeval, struct timeval);
+double monotonic_elapsed(struct timespec, struct timespec);
int rpc_time(const char *, unsigned int, unsigned int, long, long, unsigned int, double *);
const char *get_addr_string(struct sockaddr *, char *, socklen_t);
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 68d68f4..e0e1979 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -1075,6 +1075,17 @@ double elapsed(struct timeval start, struct timeval end)
return t2-t1;
}
+double monotonic_elapsed(struct timespec start, struct timespec end)
+{
+ double t1, t2;
+
+ t1 = (double) start.tv_sec +
+ (double) (start.tv_nsec/(1000*1000*1000));
+ t2 = (double) end.tv_sec +
+ (double) (end.tv_nsec/(1000*1000*1000));
+ return t2 - t1;
+}
+
int rpc_time(const char *host,
unsigned int ping_vers, unsigned int ping_proto,
long seconds, long micros, unsigned int option, double *result)

68
autofs-5.1.1-define-pending-condition-init-helper-function.patch
View File

@ -1,68 +0,0 @@
autofs-5.1.1 - define pending condition init helper function
From: Yu Ning <ning.yu@ubuntu.com>
The time returned by gettimeofday() is affected by discontinuous jumps
in the system time, so it causes an issue that autofs may not auto
unmount a mount point if system time is manually changed by the system
administrator.
To fix the issue we need to convert to using a monotonic clock source
instead of the clock source used by gettimeofday().
We also want to use a monotonic clock source for the condition wait
of both the direct and indirect mount thread creation as well the
expire thread creation of each. So create a common helper function
to initialize a condition variable to use a monotonic clock source.
Signed-off-by: Yu Ning <ning.yu@ubuntu.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
include/automount.h | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index c443f49..20a64a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
- Add a mode option for master map entries.
- define monotonic clock helper functions.
- use monotonic clock for alarm thread condition wait.
+- define pending condition init helper function.
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/automount.h b/include/automount.h
index 9e82048..2cf0611 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -429,6 +429,27 @@ struct pending_args {
};
#ifdef INCLUDE_PENDING_FUNCTIONS
+static void pending_cond_init(void *arg)
+{
+ struct pending_args *mt = (struct pending_args *) arg;
+ pthread_condattr_t condattrs;
+ int status;
+
+ status = pthread_condattr_init(&condattrs);
+ if (status)
+ fatal(status);
+
+ status = pthread_condattr_setclock(&condattrs, CLOCK_MONOTONIC);
+ if (status)
+ fatal(status);
+
+ status = pthread_cond_init(&mt->cond, &condattrs);
+ if (status)
+ fatal(status);
+
+ pthread_condattr_destroy(&condattrs);
+}
+
static void pending_cond_destroy(void *arg)
{
struct pending_args *mt = (struct pending_args *) arg;

203
autofs-5.1.1-factor-out-alloc-multi-map-context.patch
View File

@ -1,203 +0,0 @@
autofs-5.1.1 - factor out alloc multi map context
From: Ian Kent <raven@themaw.net>
Seperate out the context allocation function for the multi map module.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_multi.c | 161 +++++++++++++++++++++++++-----------------------
1 file changed, 85 insertions(+), 76 deletions(-)
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 36ace11..433b424 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -40,6 +40,84 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
+static int free_multi_context(struct lookup_context *);
+
+static struct lookup_context *alloc_context(const char *format,
+ int argc, const char *const *argv)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+ char **args;
+ int i, an;
+ char *estr;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt)
+ goto nomem;
+
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (argc < 1) {
+ logerr(MODPREFIX "No map list");
+ goto error_out;
+ }
+
+ ctxt->n = 1; /* Always at least one map */
+ for (i = 0; i < argc; i++) {
+ if (!strcmp(argv[i], "--")) /* -- separates maps */
+ ctxt->n++;
+ }
+
+ if (!(ctxt->m = malloc(ctxt->n * sizeof(struct module_info))) ||
+ !(ctxt->argl = malloc((argc + 1) * sizeof(const char *))))
+ goto nomem;
+
+ memset(ctxt->m, 0, ctxt->n * sizeof(struct module_info));
+
+ memcpy(ctxt->argl, argv, (argc + 1) * sizeof(const char *));
+
+ args = NULL;
+ for (i = an = 0; ctxt->argl[an]; an++) {
+ if (ctxt->m[i].argc == 0)
+ args = (char **) &ctxt->argl[an];
+
+ if (strcmp(ctxt->argl[an], "--"))
+ ctxt->m[i].argc++;
+ else {
+ ctxt->argl[an] = NULL;
+ if (!args) {
+ logerr(MODPREFIX "error assigning map args");
+ goto error_out;
+ }
+ ctxt->m[i].argv = copy_argv(ctxt->m[i].argc,
+ (const char **) args);
+ if (!ctxt->m[i].argv)
+ goto nomem;
+ args = NULL;
+ i++;
+ }
+ }
+
+ /* catch the last one */
+ if (args) {
+ ctxt->m[i].argv = copy_argv(ctxt->m[i].argc, (const char **) args);
+ if (!ctxt->m[i].argv)
+ goto nomem;
+ }
+
+ return ctxt;
+
+nomem:
+ estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "error: %s", estr);
+
+error_out:
+ free_multi_context(ctxt);
+ free(ctxt);
+
+ return NULL;
+}
+
static int free_multi_context(struct lookup_context *ctxt)
{
int rv;
@@ -180,95 +258,26 @@ int lookup_init(const char *my_mapfmt,
int argc, const char *const *argv, void **context)
{
struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
- char **args;
- int i, an;
- char *estr;
+ int i;
- ctxt = malloc(sizeof(struct lookup_context));
+ ctxt = alloc_context(my_mapfmt, argc, argv);
if (!ctxt)
- goto nomem;
-
- memset(ctxt, 0, sizeof(struct lookup_context));
-
- if (argc < 1) {
- logerr(MODPREFIX "No map list");
- goto error_out;
- }
-
- ctxt->n = 1; /* Always at least one map */
- for (i = 0; i < argc; i++) {
- if (!strcmp(argv[i], "--")) /* -- separates maps */
- ctxt->n++;
- }
-
- if (!(ctxt->m = malloc(ctxt->n * sizeof(struct module_info))) ||
- !(ctxt->argl = malloc((argc + 1) * sizeof(const char *))))
- goto nomem;
-
- memset(ctxt->m, 0, ctxt->n * sizeof(struct module_info));
-
- memcpy(ctxt->argl, argv, (argc + 1) * sizeof(const char *));
-
- args = NULL;
- for (i = an = 0; ctxt->argl[an]; an++) {
- if (ctxt->m[i].argc == 0) {
- args = (char **) &ctxt->argl[an];
- }
- if (!strcmp(ctxt->argl[an], "--")) {
- ctxt->argl[an] = NULL;
- if (!args) {
- logerr(MODPREFIX "error assigning map args");
- goto error_out;
- }
- ctxt->m[i].argv = copy_argv(ctxt->m[i].argc, (const char **) args);
- if (!ctxt->m[i].argv)
- goto nomem;
- args = NULL;
- i++;
- } else {
- ctxt->m[i].argc++;
- }
- }
-
- /* catch the last one */
- if (args) {
- ctxt->m[i].argv = copy_argv(ctxt->m[i].argc, (const char **) args);
- if (!ctxt->m[i].argv)
- goto nomem;
- }
+ return 1;
for (i = 0; i < ctxt->n; i++) {
ctxt->m[i].mod = nss_open_lookup(my_mapfmt,
ctxt->m[i].argc, ctxt->m[i].argv);
if (!ctxt->m[i].mod) {
logerr(MODPREFIX "error opening module");
- goto error_out;
+ free_multi_context(ctxt);
+ free(ctxt);
+ return 1;
}
}
*context = ctxt;
- return 0;
-nomem:
- estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "error: %s", estr);
-error_out:
- if (ctxt) {
- if (ctxt->m) {
- for (i = 0; i < ctxt->n; i++) {
- if (ctxt->m[i].mod)
- close_lookup(ctxt->m[i].mod);
- if (ctxt->m[i].argv)
- free_argv(ctxt->m[i].argc, ctxt->m[i].argv);
- }
- free(ctxt->m);
- }
- if (ctxt->argl)
- free(ctxt->argl);
- free(ctxt);
- }
- return 1;
+ return 0;
}
int lookup_reinit(const char *my_mapfmt,

68
autofs-5.1.1-factor-out-free-multi-map-context.patch
View File

@ -1,68 +0,0 @@
autofs-5.1.1 - factor out free multi map context
From: Ian Kent <raven@themaw.net>
Seperate out the free context function for the multi map module.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_multi.c | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 0ee20f5..36ace11 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -40,6 +40,32 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
+static int free_multi_context(struct lookup_context *ctxt)
+{
+ int rv;
+
+ if (!ctxt)
+ return 0;
+
+ rv = 0;
+ if (ctxt->m) {
+ int i;
+
+ for (i = 0; i < ctxt->n; i++) {
+ if (ctxt->m[i].mod)
+ rv = rv || close_lookup(ctxt->m[i].mod);
+ if (ctxt->m[i].argv)
+ free_argv(ctxt->m[i].argc, ctxt->m[i].argv);
+ }
+ free(ctxt->m);
+ }
+
+ if (ctxt->argl)
+ free(ctxt->argl);
+
+ return rv;
+}
+
static struct lookup_mod *nss_open_lookup(const char *format, int argc, const char **argv)
{
struct list_head nsslist;
@@ -306,16 +332,10 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
int lookup_done(void *context)
{
struct lookup_context *ctxt = (struct lookup_context *) context;
- int i, rv = 0;
+ int rv;
- for (i = 0; i < ctxt->n; i++) {
- if (ctxt->m[i].mod)
- rv = rv || close_lookup(ctxt->m[i].mod);
- if (ctxt->m[i].argv)
- free_argv(ctxt->m[i].argc, ctxt->m[i].argv);
- }
- free(ctxt->argl);
- free(ctxt->m);
+ rv = free_multi_context(ctxt);
free(ctxt);
+
return rv;
}

58
autofs-5.1.1-fix-config-old-name-lookup.patch
View File

@ -1,58 +0,0 @@
autofs-5.1.1 - fix config old name lookup
From: Ian Kent <raven@themaw.net>
There are three cases needed to handle configuration name lookup.
First there's the configuration key name, the name match is case
insensitive so the recent case change isn't a seperate case.
But the much older configuration key names that began with "DEFAULT_"
need special handling.
There are two cases that need to be covered:
1) an old name is given but a new name needs to be located.
2) a new name is given but an old name needs to be located.
Only 1) is currently covered, so fix that in conf_lookup().
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
lib/defaults.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 3bd7145..ebd66d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
- make find_server() return a status.
- fix return handling of do_reconnect() in ldap module.
- fix rwlock unlock crash.
+- fix config old name lookup.
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/defaults.c b/lib/defaults.c
index 5711e65..74fafc5 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -728,6 +728,17 @@ static struct conf_option *conf_lookup(const char *section, const char *key)
*/
if (strlen(key) > 8 && !strncasecmp("DEFAULT_", key, 8))
co = conf_lookup_key(section, key + 8);
+ else {
+ /* A new key name has been given but the value
+ * we seek is stored under an old key name (which
+ * includes the "DEFAULT_" prefix or doesn't exist.
+ */
+ char old_key[PATH_MAX + 1];
+
+ strcpy(old_key, "DEFAULT_");
+ strcat(old_key, key);
+ co = conf_lookup_key(section, old_key);
+ }
}
return co;

56
autofs-5.1.1-fix-direct-map-expire-not-set-for-initial-empty-map.patch
View File

@ -1,56 +0,0 @@
autofs-5.1.1 - fix direct map expire not set for initial empty map
From: Ian Kent <raven@themaw.net>
If an empty direct map is present at startup the expire alarm can't be
set because the expire run frequency isn't known. But if the map is
re-read and is no longer empty the expire alarm wasn't being set.
Fix suggested by xuw at redhat dot com, thanks.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/state.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 7bd261a..52b166d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
- fix config old name lookup.
- fix error handling on ldap bind fail.
- fix direct mount stale instance flag reset.
+- fix direct map expire not set for initail empty map.
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/state.c b/daemon/state.c
index 3bea4af..6c8c4f6 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -488,6 +488,7 @@ static void *do_readmap(void *arg)
status = lookup_ghost(ap, ap->path);
} else {
struct mapent *me;
+ unsigned int append_alarm = !ap->exp_runfreq;
mnts = tree_make_mnt_tree(_PROC_MOUNTS, "/");
pthread_cleanup_push(tree_mnts_cleanup, mnts);
@@ -517,6 +518,15 @@ static void *do_readmap(void *arg)
map->stale = 0;
map = map->next;
}
+
+ /* If the direct mount map was empty at startup no expire
+ * alarm will have been added. So add it here if there are
+ * now map entries.
+ */
+ if (append_alarm && ap->exp_runfreq)
+ alarm_add(ap, ap->exp_runfreq +
+ rand() % ap->exp_runfreq);
+
pthread_cleanup_pop(1);
pthread_cleanup_pop(1);
pthread_cleanup_pop(1);

38
autofs-5.1.1-fix-direct-mount-stale-instance-flag-reset.patch
View File

@ -1,38 +0,0 @@
autofs-5.1.1 - fix direct mount stale instance flag reset
From: Ian Kent <raven@themaw.net>
When re-reading a direct map the stale map instance flag was not being
reset. This caused the map to be seen as stale on subsequent lookups
thereby triggering a map re-read.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/state.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index cbe039c..7bd261a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
- fix rwlock unlock crash.
- fix config old name lookup.
- fix error handling on ldap bind fail.
+- fix direct mount stale instance flag reset.
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/state.c b/daemon/state.c
index 3174a9c..3bea4af 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -513,6 +513,7 @@ static void *do_readmap(void *arg)
}
lookup_prune_one_cache(ap, map->mc, now);
pthread_cleanup_pop(1);
+ clear_stale_instances(map);
map->stale = 0;
map = map->next;
}

71
autofs-5.1.1-fix-error-handling-of-is_mounted.patch
View File

@ -1,71 +0,0 @@
autofs-5.1.1 - fix error handling of is_mounted()
From: Ian Kent <raven@themaw.net>
If the ops->ismountpoint() ioctl call fails for some reason is_mounted()
would return 0 indicating the path isn't mounted even if it is.
In this case fall back to the resource intensive mount table lookup.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
lib/mounts.c | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3dd28cc..8d27e55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@
- update map_hash_table_size description.
- add configuration option to use fqdn in mounts.
- fix out of order call in program map lookup.
+- fix error handling of is_mounted().
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/mounts.c b/lib/mounts.c
index f665721..455bdca 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -1032,12 +1032,19 @@ static int table_is_mounted(const char *table, const char *path, unsigned int ty
return ret;
}
-static int ioctl_is_mounted(const char *path, unsigned int type)
+static int ioctl_is_mounted(const char *table, const char *path, unsigned int type)
{
struct ioctl_ops *ops = get_ioctl_ops();
unsigned int mounted;
+ int ret;
+
+ /* If the ioctl fails fall back to the potentially resource
+ * intensive mount table check.
+ */
+ ret = ops->ismountpoint(LOGOPT_NONE, -1, path, &mounted);
+ if (ret == -1)
+ return table_is_mounted(table, path, type);
- ops->ismountpoint(LOGOPT_NONE, -1, path, &mounted);
if (mounted) {
switch (type) {
case MNTS_ALL:
@@ -1056,7 +1063,7 @@ int is_mounted(const char *table, const char *path, unsigned int type)
struct ioctl_ops *ops = get_ioctl_ops();
if (ops->ismountpoint)
- return ioctl_is_mounted(path, type);
+ return ioctl_is_mounted(table, path, type);
else
return table_is_mounted(table, path, type);
}
@@ -1439,7 +1446,7 @@ int tree_is_mounted(struct mnt_list *mnts, const char *path, unsigned int type)
int mounted = 0;
if (ops->ismountpoint)
- return ioctl_is_mounted(path, type);
+ return ioctl_is_mounted(_PROC_MOUNTS, path, type);
INIT_LIST_HEAD(&list);

91
autofs-5.1.1-fix-error-handling-on-ldap-bind-fail.patch
View File

@ -1,91 +0,0 @@
autofs-5.1.1 - fix error handling on ldap bind fail
From: Ian Kent <raven@themaw.net>
When calling unbind_ldap_connection() if a sasl connection is
being used then autofs_sasl_unbind() should be called and not
ldap_unbind_ext(), otherwise the ldap connection release code
could be called twice.
So, in unbind_ldap_connection() check if a sasl connection is in
use and unbind it if it is otherwise call ldap_unbind_ext() to
release the ldap connection.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 17 ++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ebd66d8..cbe039c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
- fix return handling of do_reconnect() in ldap module.
- fix rwlock unlock crash.
- fix config old name lookup.
+- fix error handling on ldap bind fail.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 7e23869..d846d8e 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -216,15 +216,18 @@ int bind_ldap_simple(unsigned logopt, LDAP *ldap, const char *uri, struct lookup
int __unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
{
- int rv;
+ int rv = LDAP_SUCCESS;
if (ctxt->use_tls == LDAP_TLS_RELEASE)
ctxt->use_tls = LDAP_TLS_INIT;
#ifdef WITH_SASL
- autofs_sasl_unbind(ctxt);
-#endif
-
+ if (ctxt->auth_required & LDAP_NEED_AUTH)
+ autofs_sasl_unbind(ctxt);
+ else
+ rv = ldap_unbind_ext(ldap, NULL, NULL);
+#else
rv = ldap_unbind_ext(ldap, NULL, NULL);
+#endif
if (rv != LDAP_SUCCESS)
error(logopt, "unbind failed: %s", ldap_err2string(rv));
@@ -302,7 +305,7 @@ LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_con
rv = ldap_start_tls_s(ldap, NULL, NULL);
if (rv != LDAP_SUCCESS) {
- __unbind_ldap_connection(logopt, ldap, ctxt);
+ ldap_unbind_ext(ldap, NULL, NULL);
if (ctxt->tls_required) {
error(logopt, MODPREFIX
"TLS required but START_TLS failed: %s",
@@ -576,14 +579,13 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
char *host = NULL, *nhost;
int rv;
+ ldapinit_mutex_lock();
#ifdef WITH_SASL
debug(logopt, MODPREFIX "auth_required: %d, sasl_mech %s",
ctxt->auth_required, ctxt->sasl_mech);
if (ctxt->auth_required & LDAP_NEED_AUTH) {
- ldapinit_mutex_lock();
rv = autofs_sasl_bind(logopt, ldap, ctxt);
- ldapinit_mutex_unlock();
debug(logopt, MODPREFIX "autofs_sasl_bind returned %d", rv);
} else {
rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
@@ -593,6 +595,7 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
debug(logopt, MODPREFIX "ldap simple bind returned %d", rv);
#endif
+ ldapinit_mutex_unlock();
if (rv != 0)
return 0;

23
autofs-5.1.1-fix-fix-gcc5-complaints.patch
View File

@ -1,23 +0,0 @@
autofs-5.1.1 - fix fix gcc5 complaints
From: Ian Kent <raven@themaw.net>
Remove a stray declare of dump_core().
Signed-off-by: Ian Kent <raven@themaw.net>
---
lib/rpc_subs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 846c40e..84fae9e 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -77,7 +77,6 @@ static const rpcvers_t mount_vers[] = {
};
static int connect_nb(int, struct sockaddr *, socklen_t, struct timeval *);
-inline void dump_core(void);
/*
* Perform a non-blocking connect on the socket fd.

41
autofs-5.1.1-fix-left-mount-count-return.patch
View File

@ -1,41 +0,0 @@
autofs-5.1.1 - fix left mount count return from umount_multi_triggers()
From: Xu Wang <xuw@redhat.com>
If a umount of an NFS mount at the root of a multi-mount fails
umount_multi_triggers() will return an zero (success) when it should
return 1 (a fail). In this case do_expire_direct() will close the
me->ioctlfd fd used for expires stopping further expires of the
direct mount.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
lib/mounts.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3a9266d..bd7b981 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
=======================
- update libtirpc workaround for new soname.
- revert fix libtirpc name clash.
+- fix left mount count return from umount_multi_triggers().
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/mounts.c b/lib/mounts.c
index 84af6be..f665721 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -2131,7 +2131,7 @@ int umount_multi_triggers(struct autofs_point *ap, struct mapent *me, char *root
if (mount_multi_triggers(ap, me, root, strlen(root), "/") < 0)
warn(ap->logopt,
"failed to remount offset triggers");
- return left++;
+ return ++left;
}
}

47
autofs-5.1.1-fix-map-format-check-in-nss_open_lookup-multi-map-module.patch
View File

@ -1,47 +0,0 @@
autofs-5.1.1 - fix map format check in nss_open_lookup() multi map module
From: Ian Kent <raven@themaw.net>
The nss_open_lookup() function doesn't properly allow for map format when
it's given with the map type.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_multi.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 433b424..f8ebf94 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -24,6 +24,8 @@
#include "automount.h"
#include "nsswitch.h"
+#define MAX_MAP_TYPE_STRING 20
+
#define MODPREFIX "lookup(multi): "
struct module_info {
@@ -166,11 +168,17 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
!strncmp(argv[0], "ldaps", 5) ||
!strncmp(argv[0], "ldap", 4) ||
!strncmp(argv[0], "sss", 3)) {
- const char *fmt = strchr(argv[0], ',');
- if (fmt)
+ char type[MAX_MAP_TYPE_STRING];
+ char *fmt;
+
+ strcpy(type, argv[0]);
+ fmt = strchr(type, ',');
+ if (!fmt)
+ fmt = (char *) format;
+ else {
+ *fmt = '\0';
fmt++;
- else
- fmt = format;
+ }
open_lookup(argv[0], MODPREFIX, fmt, argc - 1, argv + 1, &mod);
return mod;
}

36
autofs-5.1.1-fix-memory-leak-in-get_network_proximity.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.1 - fix memory leak in get_network_proximity()
From: Ian Kent <raven@themaw.net>
Fix an obvious memory leak in the get_network_proximity() function.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
lib/parse_subs.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 49e0142..9d8096e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
- fix use after free in sun parser parse_init().
- fix use after free in open_lookup().
- fix typo in autofs_sasl_bind().
+- fix memory leak in get_network_proximity().
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 6145828..8520d11 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -488,6 +488,7 @@ unsigned int get_network_proximity(const char *name)
proximity = prx;
this = this->ai_next;
}
+ freeaddrinfo(ni);
return proximity;
}

37
autofs-5.1.1-fix-memory-leak-in-ldap-do_init.patch
View File

@ -1,37 +0,0 @@
autofs-5.1.1 - fix memory leak in ldap do_init()
From: Ian Kent <raven@themaw.net>
Fix error return without free of temporory allocated storage in
do_init().
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index bb2ea30..0c467e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@
- fix unbind sasl external mech.
- fix sasl connection concurrancy problem.
- fix memory leak in nisplus lookup_reinit().
+- fix memory leak in ldap do_init().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 959890a..45100ab 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1752,6 +1752,7 @@ static int do_init(const char *mapfmt,
*/
if (!parse_server_string(LOGOPT_NONE, tmp, ctxt)) {
error(LOGOPT_ANY, MODPREFIX "cannot parse server string");
+ free(tmp);
return 1;
}
free(tmp);

40
autofs-5.1.1-fix-memory-leak-in-nisplus-lookup_reinit.patch
View File

@ -1,40 +0,0 @@
autofs-5.1.1 - fix memory leak in nisplus lookup_reinit()
From: Ian Kent <raven@themaw.net>
Don't forget to free context on reinit error.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_nisplus.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 663b867..bb2ea30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,7 @@
- remove unused function elapsed().
- fix unbind sasl external mech.
- fix sasl connection concurrancy problem.
+- fix memory leak in nisplus lookup_reinit().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 27f9856..7832611 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -116,8 +116,10 @@ int lookup_reinit(const char *mapfmt,
new->parse = ctxt->parse;
ret = do_init(mapfmt, argc, argv, new, 1);
- if (ret)
+ if (ret) {
+ free(new);
return 1;
+ }
*context = new;

38
autofs-5.1.1-fix-missing-source-sss-in-multi-map-lookup.patch
View File

@ -1,38 +0,0 @@
autofs-5.1.1 - fix missing source sss in multi map lookup
From: Ian Kent <raven@themaw.net>
The sss source isn't accounted for in the multi map lookup module.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_multi.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 52b166d..e22877e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
- fix error handling on ldap bind fail.
- fix direct mount stale instance flag reset.
- fix direct map expire not set for initail empty map.
+- fix missing source sss in multi map lookup.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 6ec8434..ffb236c 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -58,7 +58,8 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
!strncmp(argv[0], "nisplus", 7) ||
!strncmp(argv[0], "nis", 3) ||
!strncmp(argv[0], "ldaps", 5) ||
- !strncmp(argv[0], "ldap", 4)) {
+ !strncmp(argv[0], "ldap", 4) ||
+ !strncmp(argv[0], "sss", 3)) {
const char *fmt = strchr(argv[0], ',');
if (fmt)
fmt++;

48
autofs-5.1.1-fix-nsswitch-handling-when-opening-multi-map.patch
View File

@ -1,48 +0,0 @@
autofs-5.1.1 - fix nsswitch handling when opening multi map
From: Ian Kent <raven@themaw.net>
When initializing the lookup module for multi-map entries nsswitch
actions should be honoured to the extent they can be. In particular
the case of a map not found should use an nsswitch action (if present)
to work out whether to continue looking or return a failure.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_multi.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 55035e4..ba8d4f0 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -84,6 +84,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
list_for_each(p, head) {
struct nss_source *this;
int status;
+ int ret;
this = list_entry(p, struct nss_source, list);
@@ -127,6 +128,10 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
argv[0] = save_argv0;
free(path);
+
+ ret = check_nss_result(this, status);
+ if (ret >= 0)
+ break;
}
status = open_lookup(this->source, MODPREFIX,
@@ -135,6 +140,10 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
free_sources(&nsslist);
return mod;
}
+
+ ret = check_nss_result(this, status);
+ if (ret >= 0)
+ break;
}
free_sources(&nsslist);

69
autofs-5.1.1-fix-out-of-order-call-in-program-map-lookup.patch
View File

@ -1,69 +0,0 @@
autofs-5.1.1 - fix out of order call in program map lookup
From: Ian Kent <raven@themaw.net>
Commit 91e42e58b4 fixed a problem with program map environment variable
naming and commit 743deb0e4e added a configuration option to force use
of the old environment names for those who need it and are sure it is
safe to continue to use them.
But the call to get the configuration entry was placed after a fork()
so the state of the mutex used when querying the configuration is
undefined and can lead to a deadlock.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_program.c | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2c516e4..3dd28cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
- change lookup to use reinit instead of reopen.
- update map_hash_table_size description.
- add configuration option to use fqdn in mounts.
+- fix out of order call in program map lookup.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 3e9c448..a46ff0e 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -200,6 +200,16 @@ static char *lookup_one(struct autofs_point *ap,
}
/*
+ * By default use a prefix with standard environment
+ * variables to prevent system subversion by interpreted
+ * languages.
+ */
+ if (defaults_force_std_prog_map_env())
+ prefix = NULL;
+ else
+ prefix = "AUTOFS_";
+
+ /*
* We don't use popen because we don't want to run /bin/sh plus we
* want to send stderr to the syslog, and we don't use spawnl()
* because we need the pipe hooks
@@ -238,16 +248,6 @@ static char *lookup_one(struct autofs_point *ap,
ap->path, ctxt->mapname);
/*
- * By default use a prefix with standard environment
- * variables to prevent system subversion by interpreted
- * languages.
- */
- if (defaults_force_std_prog_map_env())
- prefix = NULL;
- else
- prefix = "AUTOFS_";
-
- /*
* MAPFMT_DEFAULT must be "sun" for ->parse_init() to have setup
* the macro table.
*/

98
autofs-5.1.1-fix-return-handling-in-sss-lookup-module.patch
View File

@ -1,98 +0,0 @@
autofs-5.1.1 - fix return handling in sss lookup module
From: Ian Kent <raven@themaw.net>
In the sss lookup module some of the calls don't distinguish between
no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_sss.c | 24 +++++++++++++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index bd7b981..ee078bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
- update libtirpc workaround for new soname.
- revert fix libtirpc name clash.
- fix left mount count return from umount_multi_triggers().
+- fix return handling in sss lookup module.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_sss.c b/modules/lookup_sss.c
index 528ab41..720b5e3 100644
--- a/modules/lookup_sss.c
+++ b/modules/lookup_sss.c
@@ -148,9 +148,8 @@ static int setautomntent(unsigned int logopt,
error(logopt, MODPREFIX "setautomntent: %s", estr);
if (*sss_ctxt)
free(*sss_ctxt);
- return 0;
}
- return 1;
+ return ret;
}
static int endautomntent(unsigned int logopt,
@@ -161,9 +160,8 @@ static int endautomntent(unsigned int logopt,
char buf[MAX_ERR_BUF];
char *estr = strerror_r(ret, buf, MAX_ERR_BUF);
error(logopt, MODPREFIX "endautomntent: %s", estr);
- return 0;
}
- return 1;
+ return ret;
}
int lookup_read_master(struct master *master, time_t age, void *context)
@@ -180,8 +178,12 @@ int lookup_read_master(struct master *master, time_t age, void *context)
char *value = NULL;
int count, ret;
- if (!setautomntent(logopt, ctxt, ctxt->mapname, &sss_ctxt))
+ ret = setautomntent(logopt, ctxt, ctxt->mapname, &sss_ctxt);
+ if (ret) {
+ if (ret == ENOENT)
+ return NSS_STATUS_NOTFOUND;
return NSS_STATUS_UNAVAIL;
+ }
count = 0;
while (1) {
@@ -280,8 +282,12 @@ int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
return NSS_STATUS_SUCCESS;
}
- if (!setautomntent(ap->logopt, ctxt, ctxt->mapname, &sss_ctxt))
+ ret = setautomntent(ap->logopt, ctxt, ctxt->mapname, &sss_ctxt);
+ if (ret) {
+ if (ret == ENOENT)
+ return NSS_STATUS_NOTFOUND;
return NSS_STATUS_UNAVAIL;
+ }
count = 0;
while (1) {
@@ -386,8 +392,12 @@ static int lookup_one(struct autofs_point *ap,
mc = source->mc;
- if (!setautomntent(ap->logopt, ctxt, ctxt->mapname, &sss_ctxt))
+ ret = setautomntent(ap->logopt, ctxt, ctxt->mapname, &sss_ctxt);
+ if (ret) {
+ if (ret == ENOENT)
+ return NSS_STATUS_NOTFOUND;
return NSS_STATUS_UNAVAIL;
+ }
ret = ctxt->getautomntbyname_r(qKey, &value, sss_ctxt);
if (ret && ret != ENOENT) {

208
autofs-5.1.1-fix-return-handling-of-do_reconnect-in-ldap-module.patch
View File

@ -1,208 +0,0 @@
autofs-5.1.1 - fix return handling of do_reconnect() in ldap module
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Finally make do_reconnect() return a status instead of an LDAP handle
and pass back the LDAP handle via a function parameter.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 78 ++++++++++++++++++++++++++++---------------------
2 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index bc79bc0..fa8231c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
- make connect_to_server() return a status.
- make find_dc_server() return a status.
- make find_server() return a status.
+- fix return handling of do_reconnect() in ldap module.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 783239d..7e23869 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -961,31 +961,33 @@ static int find_server(unsigned logopt,
return ret;
}
-static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
+static int do_reconnect(unsigned logopt,
+ LDAP **ldap, struct lookup_context *ctxt)
{
- LDAP *ldap = NULL;
- int ret;
+ int ret = NSS_STATUS_UNAVAIL;
+ int dcrv = NSS_STATUS_SUCCESS;
+ int rv = NSS_STATUS_SUCCESS;
if (ctxt->server || !ctxt->uris) {
- ret = do_connect(logopt, &ldap, ctxt->server, ctxt);
+ ret = do_connect(logopt, ldap, ctxt->server, ctxt);
#ifdef WITH_SASL
/* Dispose of the sasl authentication connection and try again. */
- if (ret != NSS_STATUS_SUCCESS &&
- ctxt->auth_required & LDAP_NEED_AUTH) {
+ if (ctxt->auth_required & LDAP_NEED_AUTH &&
+ ret != NSS_STATUS_SUCCESS && ret != NSS_STATUS_NOTFOUND) {
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();
- ret = connect_to_server(logopt, &ldap,
+ ret = connect_to_server(logopt, ldap,
ctxt->server, ctxt);
}
#endif
- return ldap;
+ return ret;
}
if (ctxt->dclist) {
- ret = find_dc_server(logopt, &ldap, ctxt->dclist->uri, ctxt);
- if (ret == NSS_STATUS_SUCCESS)
- return ldap;
+ dcrv = find_dc_server(logopt, ldap, ctxt->dclist->uri, ctxt);
+ if (dcrv == NSS_STATUS_SUCCESS)
+ return dcrv;
}
uris_mutex_lock(ctxt);
@@ -1004,22 +1006,22 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
if (!ctxt->uri)
goto find_server;
- ret = do_connect(logopt, &ldap, ctxt->uri->uri, ctxt);
+ rv = do_connect(logopt, ldap, ctxt->uri->uri, ctxt);
#ifdef WITH_SASL
/*
* Dispose of the sasl authentication connection and try the
* current server again before trying other servers in the list.
*/
- if (ret != NSS_STATUS_SUCCESS &&
- ctxt->auth_required & LDAP_NEED_AUTH) {
+ if (ctxt->auth_required & LDAP_NEED_AUTH &&
+ rv != NSS_STATUS_SUCCESS && rv != NSS_STATUS_NOTFOUND) {
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();
- ret = connect_to_server(logopt, &ldap, ctxt->uri->uri, ctxt);
+ rv = connect_to_server(logopt, ldap, ctxt->uri->uri, ctxt);
}
#endif
- if (ldap)
- return ldap;
+ if (rv == NSS_STATUS_SUCCESS)
+ return rv;
/* Failed to connect, try to find a new server */
@@ -1031,11 +1033,16 @@ find_server:
#endif
/* Current server failed, try the rest or dc connection */
- ret = find_server(logopt, &ldap, ctxt);
- if (ret != NSS_STATUS_SUCCESS)
+ ret = find_server(logopt, ldap, ctxt);
+ if (ret != NSS_STATUS_SUCCESS) {
+ if (ret == NSS_STATUS_NOTFOUND ||
+ dcrv == NSS_STATUS_NOTFOUND ||
+ rv == NSS_STATUS_NOTFOUND)
+ ret = NSS_STATUS_NOTFOUND;
error(logopt, MODPREFIX "failed to find available server");
+ }
- return ldap;
+ return ret;
}
int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **value)
@@ -1841,12 +1848,12 @@ int lookup_read_master(struct master *master, time_t age, void *context)
char **values = NULL;
char *attrs[3];
int scope = LDAP_SCOPE_SUBTREE;
- LDAP *ldap;
+ LDAP *ldap = NULL;
/* Initialize the LDAP context. */
- ldap = do_reconnect(logopt, ctxt);
- if (!ldap)
- return NSS_STATUS_UNAVAIL;
+ rv = do_reconnect(logopt, &ldap, ctxt);
+ if (rv)
+ return rv;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -2754,9 +2761,10 @@ static int read_one_map(struct autofs_point *ap,
sp.age = age;
/* Initialize the LDAP context. */
- sp.ldap = do_reconnect(ap->logopt, ctxt);
- if (!sp.ldap)
- return NSS_STATUS_UNAVAIL;
+ sp.ldap = NULL;
+ rv = do_reconnect(ap->logopt, &sp.ldap, ctxt);
+ if (rv)
+ return rv;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -2908,7 +2916,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
struct berval **bvValues;
char *attrs[3];
int scope = LDAP_SCOPE_SUBTREE;
- LDAP *ldap;
+ LDAP *ldap = NULL;
struct mapent *we;
unsigned int wild = 0;
int ret = CHE_MISSING;
@@ -2921,9 +2929,11 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
}
/* Initialize the LDAP context. */
- ldap = do_reconnect(ap->logopt, ctxt);
- if (!ldap)
+ rv = do_reconnect(ap->logopt, &ldap, ctxt);
+ if (rv == NSS_STATUS_UNAVAIL)
return CHE_UNAVAIL;
+ if (rv == NSS_STATUS_NOTFOUND)
+ return ret;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -3252,7 +3262,7 @@ static int lookup_one_amd(struct autofs_point *ap,
struct lookup_context *ctxt)
{
struct mapent_cache *mc = source->mc;
- LDAP *ldap;
+ LDAP *ldap = NULL;
LDAPMessage *result = NULL, *e;
char *query;
int scope = LDAP_SCOPE_SUBTREE;
@@ -3271,9 +3281,11 @@ static int lookup_one_amd(struct autofs_point *ap,
}
/* Initialize the LDAP context. */
- ldap = do_reconnect(ap->logopt, ctxt);
- if (!ldap)
+ rv = do_reconnect(ap->logopt, &ldap, ctxt);
+ if (rv == NSS_STATUS_UNAVAIL)
return CHE_UNAVAIL;
+ if (rv == NSS_STATUS_NOTFOUND)
+ return ret;
map = ctxt->schema->map_attr;
class = ctxt->schema->entry_class;

67
autofs-5.1.1-fix-rwlock-unlock-crash.patch
View File

@ -1,67 +0,0 @@
autofs-5.1.1 - fix rwlock unlock crash
From: Ian Kent <raven@themaw.net>
It should be the case that the only way that automount can exit
the kernel communication read loop is after reading a packet and
performing shutdown operations.
However there are reports of pthread_rwlock_unlock() being called
from the exit cleanup function when the lock it is trying to unlock
is not held.
But the call to the cleanup function is outside the communication
loop so call it from each of the loop break points instead so that
the expected locks must be held.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/automount.c | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index fa8231c..3bd7145 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
- make find_dc_server() return a status.
- make find_server() return a status.
- fix return handling of do_reconnect() in ldap module.
+- fix rwlock unlock crash.
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/automount.c b/daemon/automount.c
index c81b4af..6cba3db 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1757,6 +1757,7 @@ void *handle_mounts(void *arg)
*/
if (ap->type == LKP_DIRECT) {
umount_autofs(ap, NULL, 1);
+ handle_mounts_cleanup(ap);
break;
}
@@ -1767,8 +1768,10 @@ void *handle_mounts(void *arg)
* occurs while we're trying to umount.
*/
ret = umount_autofs(ap, NULL, 1);
- if (!ret)
+ if (!ret) {
+ handle_mounts_cleanup(ap);
break;
+ }
/* Failed shutdown returns to ready */
warn(ap->logopt,
@@ -1789,8 +1792,6 @@ void *handle_mounts(void *arg)
}
}
- handle_mounts_cleanup(ap);
-
return NULL;
}

836
autofs-5.1.1-fix-sasl-connection-concurrancy-problem.patch
View File

@ -1,836 +0,0 @@
autofs-5.1.1 - fix sasl connection concurrancy problem
From: Ian Kent <raven@themaw.net>
After using the contributed Cyrus SASL code in autofs for years I've
finally looked at the Cyrus SASL C API RFC only to find that the
library isn't thread safe unless a connection context per thread is
used, similar to the LDAP library.
To be fair this code originated prior to the threaded version of
autofs so it's my bad I didn't check.
But having seen this I have no choice but to make the sasl context
per thread not per autofs lookup context.
Also extend the mutual exclusion even further.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1
include/lookup_ldap.h | 16 +++-
modules/cyrus-sasl.c | 46 ++++++-----
modules/lookup_ldap.c | 198 +++++++++++++++++++++++++------------------------
4 files changed, 136 insertions(+), 125 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 83412a3..663b867 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@
- change time() to use monotonic_clock().
- remove unused function elapsed().
- fix unbind sasl external mech.
+- fix sasl connection concurrancy problem.
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
index be4bc1e..3a7aba7 100644
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -34,6 +34,13 @@ struct ldap_searchdn {
struct ldap_searchdn *next;
};
+struct ldap_conn {
+ LDAP *ldap;
+#ifdef WITH_SASL
+ sasl_conn_t *sasl_conn;
+#endif
+};
+
struct lookup_context {
char *mapname;
unsigned int format;
@@ -86,7 +93,6 @@ struct lookup_context {
/* Kerberos */
krb5_context krb5ctxt;
krb5_ccache krb5_ccache;
- sasl_conn_t *sasl_conn;
/* SASL external */
char *extern_cert;
char *extern_key;
@@ -113,16 +119,16 @@ struct lookup_context {
/* lookup_ldap.c */
LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt);
-int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
+int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt);
int authtype_requires_creds(const char *authtype);
#ifdef WITH_SASL
/* cyrus-sasl.c */
int autofs_sasl_client_init(unsigned logopt);
int autofs_sasl_init(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
-int autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
-void autofs_sasl_unbind(LDAP *ldap, struct lookup_context *ctxt);
-void autofs_sasl_dispose(LDAP *ldap, struct lookup_context *ctxt);
+int autofs_sasl_bind(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt);
+void autofs_sasl_unbind(struct ldap_conn *conn, struct lookup_context *ctxt);
+void autofs_sasl_dispose(struct ldap_conn *conn, struct lookup_context *ctxt);
void autofs_sasl_done(void);
/* cyrus-sasl-extern */
int do_sasl_extern(LDAP *ldap, struct lookup_context *ctxt);
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index c5e72f7..11a1178 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -885,16 +885,19 @@ sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
* Routine called when unbinding an ldap connection.
*/
void
-autofs_sasl_unbind(LDAP *ldap, struct lookup_context *ctxt)
+autofs_sasl_unbind(struct ldap_conn *conn, struct lookup_context *ctxt)
{
if (ctxt->sasl_mech && !strncmp(ctxt->sasl_mech, "EXTERNAL", 8)) {
- ldap_unbind_s(ldap);
+ if (conn->ldap) {
+ ldap_unbind_s(conn->ldap);
+ conn->ldap = NULL;
+ }
return;
}
- if (ctxt->sasl_conn) {
- sasl_dispose(&ctxt->sasl_conn);
- ctxt->sasl_conn = NULL;
+ if (conn->sasl_conn) {
+ sasl_dispose(&conn->sasl_conn);
+ conn->sasl_conn = NULL;
}
}
@@ -908,13 +911,10 @@ autofs_sasl_unbind(LDAP *ldap, struct lookup_context *ctxt)
* -1 - Failure
*/
int
-autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
+autofs_sasl_bind(unsigned logopt,
+ struct ldap_conn *conn, struct lookup_context *ctxt)
{
- sasl_conn_t *conn = NULL;
-
- /* If we already have a connection use it */
- if (ctxt->sasl_conn)
- return 0;
+ sasl_conn_t *sasl_conn = NULL;
if (ctxt->sasl_mech && !strncmp(ctxt->sasl_mech, "EXTERNAL", 8)) {
int result;
@@ -923,7 +923,7 @@ autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
"Attempting sasl bind with mechanism %s",
ctxt->sasl_mech);
- result = do_sasl_extern(ldap, ctxt);
+ result = do_sasl_extern(conn->ldap, ctxt);
if (result)
debug(logopt,
"Failed to authenticate with mech %s",
@@ -953,14 +953,16 @@ autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
* auth mechanism.
*/
if (ctxt->sasl_mech)
- conn = sasl_bind_mech(logopt, ldap, ctxt, ctxt->sasl_mech);
+ sasl_conn = sasl_bind_mech(logopt,
+ conn->ldap, ctxt, ctxt->sasl_mech);
else
- conn = sasl_choose_mech(logopt, ldap, ctxt);
+ sasl_conn = sasl_choose_mech(logopt, conn->ldap, ctxt);
if (!conn)
return -1;
- ctxt->sasl_conn = conn;
+ conn->sasl_conn = sasl_conn;
+
return 0;
}
@@ -968,19 +970,21 @@ autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
* Destructor routine. This should be called when finished with an ldap
* session.
*/
-void autofs_sasl_dispose(LDAP *ldap, struct lookup_context *ctxt)
+void autofs_sasl_dispose(struct ldap_conn *conn, struct lookup_context *ctxt)
{
int status, ret;
if (ctxt->sasl_mech && !strncmp(ctxt->sasl_mech, "EXTERNAL", 8)) {
- if (ldap)
- ldap_unbind_s(ldap);
+ if (conn && conn->ldap) {
+ ldap_unbind_s(conn->ldap);
+ conn->ldap = NULL;
+ }
return;
}
- if (ctxt->sasl_conn) {
- sasl_dispose(&ctxt->sasl_conn);
- ctxt->sasl_conn = NULL;
+ if (conn && conn->sasl_conn) {
+ sasl_dispose(&conn->sasl_conn);
+ conn->sasl_conn = NULL;
}
if (ctxt->kinit_successful) {
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 7f50c34..959890a 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -214,7 +214,9 @@ int bind_ldap_simple(unsigned logopt, LDAP *ldap, const char *uri, struct lookup
return 0;
}
-int __unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
+int __unbind_ldap_connection(unsigned logopt,
+ struct ldap_conn *conn,
+ struct lookup_context *ctxt)
{
int rv = LDAP_SUCCESS;
@@ -222,30 +224,35 @@ int __unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context
ctxt->use_tls = LDAP_TLS_INIT;
#ifdef WITH_SASL
if (ctxt->auth_required & LDAP_NEED_AUTH)
- autofs_sasl_unbind(ldap, ctxt);
- else
- rv = ldap_unbind_ext(ldap, NULL, NULL);
-#else
- rv = ldap_unbind_ext(ldap, NULL, NULL);
+ autofs_sasl_unbind(conn, ctxt);
+ /* No, sasl_dispose does not release the ldap connection
+ * unless it's using sasl EXTERNAL
+ */
#endif
+ if (conn->ldap) {
+ rv = ldap_unbind_ext(conn->ldap, NULL, NULL);
+ conn->ldap = NULL;
+ }
if (rv != LDAP_SUCCESS)
error(logopt, "unbind failed: %s", ldap_err2string(rv));
return rv;
}
-int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
+int unbind_ldap_connection(unsigned logopt,
+ struct ldap_conn *conn,
+ struct lookup_context *ctxt)
{
int rv;
ldapinit_mutex_lock();
- rv = __unbind_ldap_connection(logopt, ldap, ctxt);
+ rv = __unbind_ldap_connection(logopt, conn, ctxt);
ldapinit_mutex_unlock();
return rv;
}
-LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt)
+LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt)
{
LDAP *ldap = NULL;
struct timeval timeout = { ctxt->timeout, 0 };
@@ -313,7 +320,7 @@ LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_con
return NULL;
}
ctxt->use_tls = LDAP_TLS_DONT_USE;
- ldap = __init_ldap_connection(logopt, uri, ctxt);
+ ldap = init_ldap_connection(logopt, uri, ctxt);
if (ldap)
ctxt->use_tls = LDAP_TLS_INIT;
return ldap;
@@ -324,17 +331,6 @@ LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_con
return ldap;
}
-LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt)
-{
- LDAP *ldap;
-
- ldapinit_mutex_lock();
- ldap = __init_ldap_connection(logopt, uri, ctxt);
- ldapinit_mutex_unlock();
-
- return ldap;
-}
-
static int get_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
{
char buf[MAX_ERR_BUF];
@@ -574,33 +570,32 @@ static int find_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctx
return 0;
}
-static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_context *ctxt)
+static int do_bind(unsigned logopt, struct ldap_conn *conn,
+ const char *uri, struct lookup_context *ctxt)
{
char *host = NULL, *nhost;
int rv;
- ldapinit_mutex_lock();
#ifdef WITH_SASL
debug(logopt, MODPREFIX "auth_required: %d, sasl_mech %s",
ctxt->auth_required, ctxt->sasl_mech);
if (ctxt->auth_required & LDAP_NEED_AUTH) {
- rv = autofs_sasl_bind(logopt, ldap, ctxt);
+ rv = autofs_sasl_bind(logopt, conn, ctxt);
debug(logopt, MODPREFIX "autofs_sasl_bind returned %d", rv);
} else {
- rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
+ rv = bind_ldap_simple(logopt, conn->ldap, uri, ctxt);
debug(logopt, MODPREFIX "ldap simple bind returned %d", rv);
}
#else
- rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
+ rv = bind_ldap_simple(logopt, conn->ldap, uri, ctxt);
debug(logopt, MODPREFIX "ldap simple bind returned %d", rv);
#endif
- ldapinit_mutex_unlock();
if (rv != 0)
return 0;
- rv = ldap_get_option(ldap, LDAP_OPT_HOST_NAME, &host);
+ rv = ldap_get_option(conn->ldap, LDAP_OPT_HOST_NAME, &host);
if (rv != LDAP_SUCCESS || !host) {
debug(logopt, "failed to get hostname for connection");
return 0;
@@ -634,15 +629,12 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
return 1;
}
-static int do_connect(unsigned logopt, LDAP **ldap,
+static int do_connect(unsigned logopt, struct ldap_conn *conn,
const char *uri, struct lookup_context *ctxt)
{
char *cur_host = NULL;
- LDAP *handle;
int ret = NSS_STATUS_SUCCESS;
- *ldap = NULL;
-
#ifdef WITH_SASL
if (ctxt->extern_cert && ctxt->extern_key) {
set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
@@ -650,8 +642,8 @@ static int do_connect(unsigned logopt, LDAP **ldap,
}
#endif
- handle = init_ldap_connection(logopt, uri, ctxt);
- if (!handle) {
+ conn->ldap = init_ldap_connection(logopt, uri, ctxt);
+ if (!conn->ldap) {
ret = NSS_STATUS_UNAVAIL;
goto out;
}
@@ -661,8 +653,8 @@ static int do_connect(unsigned logopt, LDAP **ldap,
cur_host = ctxt->cur_host;
uris_mutex_unlock(ctxt);
- if (!do_bind(logopt, handle, uri, ctxt)) {
- unbind_ldap_connection(logopt, handle, ctxt);
+ if (!do_bind(logopt, conn, uri, ctxt)) {
+ __unbind_ldap_connection(logopt, conn, ctxt);
ret = NSS_STATUS_UNAVAIL;
goto out;
}
@@ -673,7 +665,6 @@ static int do_connect(unsigned logopt, LDAP **ldap,
uris_mutex_lock(ctxt);
if (ctxt->schema && ctxt->qdn && (cur_host == ctxt->cur_host)) {
uris_mutex_unlock(ctxt);
- *ldap = handle;
goto out;
}
uris_mutex_unlock(ctxt);
@@ -684,8 +675,8 @@ static int do_connect(unsigned logopt, LDAP **ldap,
* base dn for searches.
*/
if (!ctxt->schema) {
- if (!find_query_dn(logopt, handle, ctxt)) {
- unbind_ldap_connection(logopt, handle, ctxt);
+ if (!find_query_dn(logopt, conn->ldap, ctxt)) {
+ __unbind_ldap_connection(logopt, conn, ctxt);
ret = NSS_STATUS_NOTFOUND;
warn(logopt,
MODPREFIX "failed to find valid query dn");
@@ -694,21 +685,21 @@ static int do_connect(unsigned logopt, LDAP **ldap,
} else if (!(ctxt->format & MAP_FLAG_FORMAT_AMD)) {
const char *class = ctxt->schema->map_class;
const char *key = ctxt->schema->map_attr;
- if (!get_query_dn(logopt, handle, ctxt, class, key)) {
- unbind_ldap_connection(logopt, handle, ctxt);
+ if (!get_query_dn(logopt, conn->ldap, ctxt, class, key)) {
+ __unbind_ldap_connection(logopt, conn, ctxt);
ret = NSS_STATUS_NOTFOUND;
error(logopt, MODPREFIX "failed to get query dn");
goto out;
}
}
- *ldap = handle;
out:
return ret;
}
static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
{
+ struct ldap_conn conn;
LDAP *ldap;
LDAPMessage *result = NULL, *e;
char *query;
@@ -719,9 +710,11 @@ static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
unsigned long timestamp = 0;
int rv, l, ql;
- rv = do_connect(LOGOPT_ANY, &ldap, ctxt->server, ctxt);
+ memset(&conn, 0, sizeof(struct ldap_conn));
+ rv = do_connect(LOGOPT_ANY, &conn, ctxt->server, ctxt);
if (rv != NSS_STATUS_SUCCESS)
return 0;
+ ldap = conn.ldap;
map = amd_timestamp.map_attr;
class = amd_timestamp.entry_class;
@@ -758,7 +751,7 @@ static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
rv = ldap_search_s(ldap, ctxt->base, scope, query, attrs, 0, &result);
if ((rv != LDAP_SUCCESS) || !result) {
crit(LOGOPT_ANY, MODPREFIX "timestamp query failed %s", query);
- unbind_ldap_connection(LOGOPT_ANY, ldap, ctxt);
+ unbind_ldap_connection(LOGOPT_ANY, &conn, ctxt);
if (result)
ldap_msgfree(result);
free(query);
@@ -770,7 +763,7 @@ static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
debug(LOGOPT_ANY,
MODPREFIX "got answer, but no entry for timestamp");
ldap_msgfree(result);
- unbind_ldap_connection(LOGOPT_ANY, ldap, ctxt);
+ unbind_ldap_connection(LOGOPT_ANY, &conn, ctxt);
free(query);
return CHE_MISSING;
}
@@ -821,18 +814,18 @@ next:
}
ldap_msgfree(result);
- unbind_ldap_connection(LOGOPT_ANY, ldap, ctxt);
+ unbind_ldap_connection(LOGOPT_ANY, &conn, ctxt);
free(query);
return timestamp;
}
-static int connect_to_server(unsigned logopt, LDAP **ldap,
+static int connect_to_server(unsigned logopt, struct ldap_conn *conn,
const char *uri, struct lookup_context *ctxt)
{
int ret;
- ret = do_connect(logopt, ldap, uri, ctxt);
+ ret = do_connect(logopt, conn, uri, ctxt);
if (ret != NSS_STATUS_SUCCESS) {
warn(logopt,
MODPREFIX "couldn't connect to server %s",
@@ -842,7 +835,7 @@ static int connect_to_server(unsigned logopt, LDAP **ldap,
return ret;
}
-static int find_dc_server(unsigned logopt, LDAP **ldap,
+static int find_dc_server(unsigned logopt, struct ldap_conn *conn,
const char *uri, struct lookup_context *ctxt)
{
char *str, *tok, *ptr = NULL;
@@ -858,7 +851,7 @@ static int find_dc_server(unsigned logopt, LDAP **ldap,
int rv;
debug(logopt, "trying server uri %s", this);
- rv = connect_to_server(logopt, ldap, this, ctxt);
+ rv = connect_to_server(logopt, conn, this, ctxt);
if (rv == NSS_STATUS_SUCCESS) {
info(logopt, "connected to uri %s", this);
free(str);
@@ -875,7 +868,7 @@ static int find_dc_server(unsigned logopt, LDAP **ldap,
}
static int find_server(unsigned logopt,
- LDAP **ldap, struct lookup_context *ctxt)
+ struct ldap_conn *conn, struct lookup_context *ctxt)
{
struct ldap_uri *this = NULL;
struct list_head *p, *first;
@@ -906,7 +899,7 @@ static int find_server(unsigned logopt,
if (!strstr(this->uri, ":///")) {
uri = strdup(this->uri);
debug(logopt, "trying server uri %s", uri);
- rv = connect_to_server(logopt, ldap, uri, ctxt);
+ rv = connect_to_server(logopt, conn, uri, ctxt);
if (rv == NSS_STATUS_SUCCESS) {
ret = NSS_STATUS_SUCCESS;
info(logopt, "connected to uri %s", uri);
@@ -928,7 +921,7 @@ static int find_server(unsigned logopt,
dclist = tmp;
uri = strdup(dclist->uri);
}
- rv = find_dc_server(logopt, ldap, uri, ctxt);
+ rv = find_dc_server(logopt, conn, uri, ctxt);
if (rv == NSS_STATUS_SUCCESS) {
ret = NSS_STATUS_SUCCESS;
free(uri);
@@ -947,7 +940,7 @@ static int find_server(unsigned logopt,
}
uris_mutex_lock(ctxt);
- if (ldap)
+ if (conn->ldap)
ctxt->uri = this;
if (dclist) {
if (!ctxt->dclist)
@@ -965,37 +958,39 @@ static int find_server(unsigned logopt,
}
static int do_reconnect(unsigned logopt,
- LDAP **ldap, struct lookup_context *ctxt)
+ struct ldap_conn *conn, struct lookup_context *ctxt)
{
int ret = NSS_STATUS_UNAVAIL;
int dcrv = NSS_STATUS_SUCCESS;
int rv = NSS_STATUS_SUCCESS;
+ ldapinit_mutex_lock();
if (ctxt->server || !ctxt->uris) {
- ret = do_connect(logopt, ldap, ctxt->server, ctxt);
+ ret = do_connect(logopt, conn, ctxt->server, ctxt);
#ifdef WITH_SASL
/* Dispose of the sasl authentication connection and try again. */
if (ctxt->auth_required & LDAP_NEED_AUTH &&
ret != NSS_STATUS_SUCCESS && ret != NSS_STATUS_NOTFOUND) {
- ldapinit_mutex_lock();
- autofs_sasl_dispose(*ldap, ctxt);
- ldapinit_mutex_unlock();
- ret = connect_to_server(logopt, ldap,
+ autofs_sasl_dispose(conn, ctxt);
+ ret = connect_to_server(logopt, conn,
ctxt->server, ctxt);
}
#endif
+ ldapinit_mutex_unlock();
return ret;
}
if (ctxt->dclist) {
- dcrv = find_dc_server(logopt, ldap, ctxt->dclist->uri, ctxt);
- if (dcrv == NSS_STATUS_SUCCESS)
+ dcrv = find_dc_server(logopt, conn, ctxt->dclist->uri, ctxt);
+ if (dcrv == NSS_STATUS_SUCCESS) {
+ ldapinit_mutex_unlock();
return dcrv;
+ }
}
uris_mutex_lock(ctxt);
if (ctxt->dclist) {
- if (!ldap || ctxt->dclist->expire < monotonic_time(NULL)) {
+ if (!conn->ldap || ctxt->dclist->expire < monotonic_time(NULL)) {
free_dclist(ctxt->dclist);
ctxt->dclist = NULL;
}
@@ -1009,7 +1004,7 @@ static int do_reconnect(unsigned logopt,
if (!ctxt->uri)
goto find_server;
- rv = do_connect(logopt, ldap, ctxt->uri->uri, ctxt);
+ rv = do_connect(logopt, conn, ctxt->uri->uri, ctxt);
#ifdef WITH_SASL
/*
* Dispose of the sasl authentication connection and try the
@@ -1017,26 +1012,24 @@ static int do_reconnect(unsigned logopt,
*/
if (ctxt->auth_required & LDAP_NEED_AUTH &&
rv != NSS_STATUS_SUCCESS && rv != NSS_STATUS_NOTFOUND) {
- ldapinit_mutex_lock();
- autofs_sasl_dispose(*ldap, ctxt);
- ldapinit_mutex_unlock();
- rv = connect_to_server(logopt, ldap, ctxt->uri->uri, ctxt);
+ autofs_sasl_dispose(conn, ctxt);
+ rv = connect_to_server(logopt, conn, ctxt->uri->uri, ctxt);
}
#endif
- if (rv == NSS_STATUS_SUCCESS)
+ if (rv == NSS_STATUS_SUCCESS) {
+ ldapinit_mutex_unlock();
return rv;
+ }
/* Failed to connect, try to find a new server */
find_server:
#ifdef WITH_SASL
- ldapinit_mutex_lock();
- autofs_sasl_dispose(*ldap, ctxt);
- ldapinit_mutex_unlock();
+ autofs_sasl_dispose(conn, ctxt);
#endif
/* Current server failed, try the rest or dc connection */
- ret = find_server(logopt, ldap, ctxt);
+ ret = find_server(logopt, conn, ctxt);
if (ret != NSS_STATUS_SUCCESS) {
if (ret == NSS_STATUS_NOTFOUND ||
dcrv == NSS_STATUS_NOTFOUND ||
@@ -1044,6 +1037,7 @@ find_server:
ret = NSS_STATUS_NOTFOUND;
error(logopt, MODPREFIX "failed to find available server");
}
+ ldapinit_mutex_unlock();
return ret;
}
@@ -1877,11 +1871,6 @@ int lookup_reinit(const char *mapfmt,
*context = new;
-#ifdef WITH_SASL
- ldapinit_mutex_lock();
- autofs_sasl_dispose(NULL, ctxt);
- ldapinit_mutex_unlock();
-#endif
free_context(ctxt);
return 0;
@@ -1893,6 +1882,8 @@ int lookup_read_master(struct master *master, time_t age, void *context)
unsigned int timeout = master->default_timeout;
unsigned int logging = master->default_logging;
unsigned int logopt = master->logopt;
+ struct ldap_conn conn;
+ LDAP *ldap;
int rv, l, count;
char buf[MAX_ERR_BUF];
char parse_buf[PARSE_MAX_BUF];
@@ -1903,12 +1894,13 @@ int lookup_read_master(struct master *master, time_t age, void *context)
char **values = NULL;
char *attrs[3];
int scope = LDAP_SCOPE_SUBTREE;
- LDAP *ldap = NULL;
/* Initialize the LDAP context. */
- rv = do_reconnect(logopt, &ldap, ctxt);
+ memset(&conn, 0, sizeof(struct ldap_conn));
+ rv = do_reconnect(logopt, &conn, ctxt);
if (rv)
return rv;
+ ldap = conn.ldap;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -1942,7 +1934,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
if ((rv != LDAP_SUCCESS) || !result) {
error(logopt, MODPREFIX "query failed for %s: %s",
query, ldap_err2string(rv));
- unbind_ldap_connection(logging, ldap, ctxt);
+ unbind_ldap_connection(logging, &conn, ctxt);
if (result)
ldap_msgfree(result);
free(query);
@@ -1955,7 +1947,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
MODPREFIX "query succeeded, no matches for %s",
query);
ldap_msgfree(result);
- unbind_ldap_connection(logging, ldap, ctxt);
+ unbind_ldap_connection(logging, &conn, ctxt);
free(query);
return NSS_STATUS_NOTFOUND;
} else
@@ -2076,7 +2068,7 @@ next:
/* Clean up. */
ldap_msgfree(result);
- unbind_ldap_connection(logopt, ldap, ctxt);
+ unbind_ldap_connection(logopt, &conn, ctxt);
free(query);
return NSS_STATUS_SUCCESS;
@@ -2796,6 +2788,7 @@ static int read_one_map(struct autofs_point *ap,
struct lookup_context *ctxt,
time_t age, int *result_ldap)
{
+ struct ldap_conn conn;
struct ldap_search_params sp;
char buf[MAX_ERR_BUF];
char *class, *info, *entry;
@@ -2816,10 +2809,11 @@ static int read_one_map(struct autofs_point *ap,
sp.age = age;
/* Initialize the LDAP context. */
- sp.ldap = NULL;
- rv = do_reconnect(ap->logopt, &sp.ldap, ctxt);
+ memset(&conn, 0, sizeof(struct ldap_conn));
+ rv = do_reconnect(ap->logopt, &conn, ctxt);
if (rv)
return rv;
+ sp.ldap = conn.ldap;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -2878,7 +2872,7 @@ static int read_one_map(struct autofs_point *ap,
if (sp.pageSize < 5) {
debug(ap->logopt, MODPREFIX
"result size too small");
- unbind_ldap_connection(ap->logopt, sp.ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
*result_ldap = rv;
free(sp.query);
return NSS_STATUS_UNAVAIL;
@@ -2887,7 +2881,7 @@ static int read_one_map(struct autofs_point *ap,
}
if (rv != LDAP_SUCCESS || !sp.result) {
- unbind_ldap_connection(ap->logopt, sp.ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
*result_ldap = rv;
if (sp.result)
ldap_msgfree(sp.result);
@@ -2903,7 +2897,7 @@ static int read_one_map(struct autofs_point *ap,
rv = do_get_entries(&sp, source, ctxt);
if (rv != LDAP_SUCCESS) {
ldap_msgfree(sp.result);
- unbind_ldap_connection(ap->logopt, sp.ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
*result_ldap = rv;
if (sp.cookie)
ber_bvfree(sp.cookie);
@@ -2916,7 +2910,7 @@ static int read_one_map(struct autofs_point *ap,
debug(ap->logopt, MODPREFIX "done updating map");
- unbind_ldap_connection(ap->logopt, sp.ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
source->age = age;
if (sp.cookie)
@@ -2959,6 +2953,8 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
char *qKey, int qKey_len, struct lookup_context *ctxt)
{
struct mapent_cache *mc;
+ struct ldap_conn conn;
+ LDAP *ldap;
int rv, i, l, ql, count;
char buf[MAX_ERR_BUF];
time_t age = monotonic_time(NULL);
@@ -2971,7 +2967,6 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
struct berval **bvValues;
char *attrs[3];
int scope = LDAP_SCOPE_SUBTREE;
- LDAP *ldap = NULL;
struct mapent *we;
unsigned int wild = 0;
int ret = CHE_MISSING;
@@ -2984,11 +2979,13 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
}
/* Initialize the LDAP context. */
- rv = do_reconnect(ap->logopt, &ldap, ctxt);
+ memset(&conn, 0, sizeof(struct ldap_conn));
+ rv = do_reconnect(ap->logopt, &conn, ctxt);
if (rv == NSS_STATUS_UNAVAIL)
return CHE_UNAVAIL;
if (rv == NSS_STATUS_NOTFOUND)
return ret;
+ ldap = conn.ldap;
class = ctxt->schema->entry_class;
entry = ctxt->schema->entry_attr;
@@ -3076,7 +3073,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
if ((rv != LDAP_SUCCESS) || !result) {
crit(ap->logopt, MODPREFIX "query failed for %s", query);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
if (result)
ldap_msgfree(result);
free(query);
@@ -3091,7 +3088,7 @@ static int lookup_one(struct autofs_point *ap, struct map_source *source,
debug(ap->logopt,
MODPREFIX "got answer, but no entry for %s", query);
ldap_msgfree(result);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
free(query);
return CHE_MISSING;
}
@@ -3277,7 +3274,7 @@ next:
}
ldap_msgfree(result);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
/* Failed to find wild entry, update cache if needed */
cache_writelock(mc);
@@ -3317,7 +3314,8 @@ static int lookup_one_amd(struct autofs_point *ap,
struct lookup_context *ctxt)
{
struct mapent_cache *mc = source->mc;
- LDAP *ldap = NULL;
+ struct ldap_conn conn;
+ LDAP *ldap;
LDAPMessage *result = NULL, *e;
char *query;
int scope = LDAP_SCOPE_SUBTREE;
@@ -3336,11 +3334,13 @@ static int lookup_one_amd(struct autofs_point *ap,
}
/* Initialize the LDAP context. */
- rv = do_reconnect(ap->logopt, &ldap, ctxt);
+ memset(&conn, 0, sizeof(struct ldap_conn));
+ rv = do_reconnect(ap->logopt, &conn, ctxt);
if (rv == NSS_STATUS_UNAVAIL)
return CHE_UNAVAIL;
if (rv == NSS_STATUS_NOTFOUND)
return ret;
+ ldap = conn.ldap;
map = ctxt->schema->map_attr;
class = ctxt->schema->entry_class;
@@ -3382,7 +3382,7 @@ static int lookup_one_amd(struct autofs_point *ap,
rv = ldap_search_s(ldap, ctxt->base, scope, query, attrs, 0, &result);
if ((rv != LDAP_SUCCESS) || !result) {
crit(ap->logopt, MODPREFIX "query failed for %s", query);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
if (result)
ldap_msgfree(result);
free(query);
@@ -3397,7 +3397,7 @@ static int lookup_one_amd(struct autofs_point *ap,
debug(ap->logopt,
MODPREFIX "got answer, but no entry for %s", query);
ldap_msgfree(result);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
free(query);
return CHE_MISSING;
}
@@ -3459,7 +3459,7 @@ next:
}
ldap_msgfree(result);
- unbind_ldap_connection(ap->logopt, ldap, ctxt);
+ unbind_ldap_connection(ap->logopt, &conn, ctxt);
free(query);
return ret;

37
autofs-5.1.1-fix-typo-in-autofs_sasl_bind.patch
View File

@ -1,37 +0,0 @@
autofs-5.1.1 - fix typo in autofs_sasl_bind()
From: Ian Kent <raven@themaw.net>
Changes to autofs_sasl_bind() introduced an incorrect variable reference.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/cyrus-sasl.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2d026f1..49e0142 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@
- fix memory leak in ldap do_init().
- fix use after free in sun parser parse_init().
- fix use after free in open_lookup().
+- fix typo in autofs_sasl_bind().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 11a1178..cf596b8 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -958,7 +958,7 @@ autofs_sasl_bind(unsigned logopt,
else
sasl_conn = sasl_choose_mech(logopt, conn->ldap, ctxt);
- if (!conn)
+ if (!sasl_conn)
return -1;
conn->sasl_conn = sasl_conn;

140
autofs-5.1.1-fix-unbind-external-mech.patch
View File

@ -1,140 +0,0 @@
autofs-5.1.1 - fix unbind sasl external mech
From: Ian Kent <raven@themaw.net>
If the sasl EXTERNAL mechanism is being used autofs leaks ldap
connection resources.
In this case the current ldap connection needs to be unbound
when calling autofs_sasl_unbind() or autofs_sasl_dispose().
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
include/lookup_ldap.h | 4 ++--
modules/cyrus-sasl.c | 15 +++++++++++++--
modules/lookup_ldap.c | 12 ++++++------
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4acb332..83412a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@
- change remaining gettimeofday() to use clock_gettime().
- change time() to use monotonic_clock().
- remove unused function elapsed().
+- fix unbind sasl external mech.
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
index ba817aa..be4bc1e 100644
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -121,8 +121,8 @@ int authtype_requires_creds(const char *authtype);
int autofs_sasl_client_init(unsigned logopt);
int autofs_sasl_init(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
int autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
-void autofs_sasl_unbind(struct lookup_context *ctxt);
-void autofs_sasl_dispose(struct lookup_context *ctxt);
+void autofs_sasl_unbind(LDAP *ldap, struct lookup_context *ctxt);
+void autofs_sasl_dispose(LDAP *ldap, struct lookup_context *ctxt);
void autofs_sasl_done(void);
/* cyrus-sasl-extern */
int do_sasl_extern(LDAP *ldap, struct lookup_context *ctxt);
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 21bc00c..c5e72f7 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -885,8 +885,13 @@ sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
* Routine called when unbinding an ldap connection.
*/
void
-autofs_sasl_unbind(struct lookup_context *ctxt)
+autofs_sasl_unbind(LDAP *ldap, struct lookup_context *ctxt)
{
+ if (ctxt->sasl_mech && !strncmp(ctxt->sasl_mech, "EXTERNAL", 8)) {
+ ldap_unbind_s(ldap);
+ return;
+ }
+
if (ctxt->sasl_conn) {
sasl_dispose(&ctxt->sasl_conn);
ctxt->sasl_conn = NULL;
@@ -963,10 +968,16 @@ autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
* Destructor routine. This should be called when finished with an ldap
* session.
*/
-void autofs_sasl_dispose(struct lookup_context *ctxt)
+void autofs_sasl_dispose(LDAP *ldap, struct lookup_context *ctxt)
{
int status, ret;
+ if (ctxt->sasl_mech && !strncmp(ctxt->sasl_mech, "EXTERNAL", 8)) {
+ if (ldap)
+ ldap_unbind_s(ldap);
+ return;
+ }
+
if (ctxt->sasl_conn) {
sasl_dispose(&ctxt->sasl_conn);
ctxt->sasl_conn = NULL;
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index afc89c1..7f50c34 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -222,7 +222,7 @@ int __unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context
ctxt->use_tls = LDAP_TLS_INIT;
#ifdef WITH_SASL
if (ctxt->auth_required & LDAP_NEED_AUTH)
- autofs_sasl_unbind(ctxt);
+ autofs_sasl_unbind(ldap, ctxt);
else
rv = ldap_unbind_ext(ldap, NULL, NULL);
#else
@@ -978,7 +978,7 @@ static int do_reconnect(unsigned logopt,
if (ctxt->auth_required & LDAP_NEED_AUTH &&
ret != NSS_STATUS_SUCCESS && ret != NSS_STATUS_NOTFOUND) {
ldapinit_mutex_lock();
- autofs_sasl_dispose(ctxt);
+ autofs_sasl_dispose(*ldap, ctxt);
ldapinit_mutex_unlock();
ret = connect_to_server(logopt, ldap,
ctxt->server, ctxt);
@@ -1018,7 +1018,7 @@ static int do_reconnect(unsigned logopt,
if (ctxt->auth_required & LDAP_NEED_AUTH &&
rv != NSS_STATUS_SUCCESS && rv != NSS_STATUS_NOTFOUND) {
ldapinit_mutex_lock();
- autofs_sasl_dispose(ctxt);
+ autofs_sasl_dispose(*ldap, ctxt);
ldapinit_mutex_unlock();
rv = connect_to_server(logopt, ldap, ctxt->uri->uri, ctxt);
}
@@ -1031,7 +1031,7 @@ static int do_reconnect(unsigned logopt,
find_server:
#ifdef WITH_SASL
ldapinit_mutex_lock();
- autofs_sasl_dispose(ctxt);
+ autofs_sasl_dispose(*ldap, ctxt);
ldapinit_mutex_unlock();
#endif
@@ -1879,7 +1879,7 @@ int lookup_reinit(const char *mapfmt,
#ifdef WITH_SASL
ldapinit_mutex_lock();
- autofs_sasl_dispose(ctxt);
+ autofs_sasl_dispose(NULL, ctxt);
ldapinit_mutex_unlock();
#endif
free_context(ctxt);
@@ -3816,7 +3816,7 @@ int lookup_done(void *context)
int rv = close_parse(ctxt->parse);
#ifdef WITH_SASL
ldapinit_mutex_lock();
- autofs_sasl_dispose(ctxt);
+ autofs_sasl_dispose(NULL, ctxt);
autofs_sasl_done();
ldapinit_mutex_unlock();
#endif

59
autofs-5.1.1-fix-update_hosts_mounts-return.patch
View File

@ -1,59 +0,0 @@
autofs-5.1.1 - fix update_hosts_mounts() return
From: Ian Kent <raven@themaw.net>
The return of update_hosts_mounts() isn't used so set it to void type
and log a warning if the map entry fails the parse.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_hosts.c | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e22877e..77aad99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
- fix direct mount stale instance flag reset.
- fix direct map expire not set for initail empty map.
- fix missing source sss in multi map lookup.
+- fix update_hosts_mounts() return.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 0d48356..53aa9d6 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -162,9 +162,9 @@ static int do_parse_mount(struct autofs_point *ap, struct map_source *source,
return NSS_STATUS_SUCCESS;
}
-static int update_hosts_mounts(struct autofs_point *ap,
- struct map_source *source, time_t age,
- struct lookup_context *ctxt)
+static void update_hosts_mounts(struct autofs_point *ap,
+ struct map_source *source, time_t age,
+ struct lookup_context *ctxt)
{
struct mapent_cache *mc;
struct mapent *me;
@@ -212,13 +212,14 @@ next:
ap->flags |= MOUNT_FLAG_REMOUNT;
ret = ctxt->parse->parse_mount(ap, me->key, strlen(me->key),
me->mapent, ctxt->parse->context);
+ if (ret)
+ warn(ap->logopt, MODPREFIX
+ "failed to parse mount %s", me->mapent);
ap->flags &= ~MOUNT_FLAG_REMOUNT;
cont:
me = cache_lookup_next(mc, me);
}
pthread_cleanup_pop(1);
-
- return NSS_STATUS_SUCCESS;
}
int lookup_read_map(struct autofs_point *ap, time_t age, void *context)

46
autofs-5.1.1-fix-use-after-free-in-match_my_name.patch
View File

@ -1,46 +0,0 @@
autofs-5.1.1 - fix use after free in match_my_name()
From: Ian Kent <raven@themaw.net>
I can't remember now if this function is supposed to fail if any host
address has no reverse mapping. Presumably I put in the "goto next;"
for a reason so just remove the freeaddrinfo() call.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/parse_amd.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9d8096e..88ec577 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@
- fix use after free in open_lookup().
- fix typo in autofs_sasl_bind().
- fix memory leak in get_network_proximity().
+- fix use after free in match_my_name().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index b8e0078..38d76b8 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -285,7 +285,6 @@ static int match_my_name(unsigned int logopt, const char *name, struct substvar
error(logopt,
"host address info lookup failed: %s\n",
gai_strerror(ret));
- freeaddrinfo(cni);
goto next;
}
@@ -296,7 +295,6 @@ static int match_my_name(unsigned int logopt, const char *name, struct substvar
error(logopt,
"host address info lookup failed: %s\n",
gai_strerror(ret));
- freeaddrinfo(cni);
goto next;
}

36
autofs-5.1.1-fix-use-after-free-in-open_lookup.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.1 - fix use after free in open_lookup()
From: Ian Kent <raven@themaw.net>
If storage can't be allocated for module type error exit.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
daemon/module.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 76e0a27..2d026f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@
- fix memory leak in nisplus lookup_reinit().
- fix memory leak in ldap do_init().
- fix use after free in sun parser parse_init().
+- fix use after free in open_lookup().
21/04/2015 autofs-5.1.1
=======================
diff --git a/daemon/module.c b/daemon/module.c
index d9921f4..bed8f7a 100644
--- a/daemon/module.c
+++ b/daemon/module.c
@@ -83,6 +83,7 @@ int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr("%s%s", err_prefix, estr);
}
+ return NSS_STATUS_UNAVAIL;
}
size = snprintf(fnbuf, sizeof(fnbuf),

37
autofs-5.1.1-fix-use-after-free-in-sun-parser-parse_init.patch
View File

@ -1,37 +0,0 @@
autofs-5.1.1 - fix use after free in sun parser parse_init()
From: Ian Kent <raven@themaw.net>
Change to free context in function it was allocated (parse_init) on
error to avoid use after free.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/parse_sun.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0c467e0..76e0a27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@
- fix sasl connection concurrancy problem.
- fix memory leak in nisplus lookup_reinit().
- fix memory leak in ldap do_init().
+- fix use after free in sun parser parse_init().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index a164fba..a9689f0 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -345,7 +345,6 @@ static int do_init(int argc, const char *const *argv, struct parse_context *ctxt
}
if (!noptstr) {
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- kill_context(ctxt);
logerr(MODPREFIX "%s", estr);
return 1;
}

121
autofs-5.1.1-implement-reinit-in-dir-lookup-module.patch
View File

@ -1,121 +0,0 @@
autofs-5.1.1 - implement reinit in dir lookup module
From: Ian Kent <raven@themaw.net>
Refactor the dir lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_dir.c | 58 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 19 deletions(-)
diff --git a/modules/lookup_dir.c b/modules/lookup_dir.c
index 7a95e24..2880447 100644
--- a/modules/lookup_dir.c
+++ b/modules/lookup_dir.c
@@ -50,24 +50,13 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt)
{
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
struct stat st;
- *context = NULL;
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
-
if (argc < 1) {
- free(ctxt);
logerr(MODPREFIX "No map name");
return 1;
}
@@ -75,40 +64,71 @@ int lookup_init(const char *mapfmt,
ctxt->mapname = argv[0];
if (ctxt->mapname[0] != '/') {
- free(ctxt);
logmsg(MODPREFIX
"dir map %s is not an absolute pathname", argv[0]);
return 1;
}
if (access(ctxt->mapname, R_OK)) {
- free(ctxt);
warn(LOGOPT_NONE, MODPREFIX
"dir map %s missing or not readable", argv[0]);
return 1;
}
if (stat(ctxt->mapname, &st)) {
- free(ctxt);
warn(LOGOPT_NONE, MODPREFIX
"dir map %s, could not stat", argv[0]);
return 1;
}
- if ( (!S_ISDIR(st.st_mode)) && (!S_ISLNK(st.st_mode)) ) {
- free(ctxt);
+ if ((!S_ISDIR(st.st_mode)) && (!S_ISLNK(st.st_mode))) {
warn(LOGOPT_NONE, MODPREFIX
"dir map %s, is not a directory", argv[0]);
return 1;
}
+ return 0;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (do_init(mapfmt, argc, argv, ctxt)) {
+ free(ctxt);
+ return 1;
+ }
+
*context = ctxt;
+
return 0;
}
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context new;
+ int ret;
+
+ ret = do_init(mapfmt, argc, argv, &new);
+ if (ret)
+ return 1;
+
+ ctxt->mapname = new.mapname;
+
return 0;
}

147
autofs-5.1.1-implement-reinit-in-file-lookup-module.patch
View File

@ -1,147 +0,0 @@
autofs-5.1.1 - implement reinit in file lookup module
From: Ian Kent <raven@themaw.net>
Refactor the file lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_file.c | 85 +++++++++++++++++++++++++++++++++++++------------
1 file changed, 65 insertions(+), 20 deletions(-)
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index c32a4cd..aed3cba 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -50,23 +50,13 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
-
- *context = NULL;
-
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
+ int ret = 0;
if (argc < 1) {
- free(ctxt);
logerr(MODPREFIX "No map name");
return 1;
}
@@ -74,14 +64,12 @@ int lookup_init(const char *mapfmt,
ctxt->mapname = argv[0];
if (ctxt->mapname[0] != '/') {
- free(ctxt);
logmsg(MODPREFIX
"file map %s is not an absolute pathname", argv[0]);
return 1;
}
if (access(ctxt->mapname, R_OK)) {
- free(ctxt);
warn(LOGOPT_NONE, MODPREFIX
"file map %s missing or not readable", argv[0]);
return 1;
@@ -95,19 +83,51 @@ int lookup_init(const char *mapfmt,
ctxt->opts_argv = copy_argv(argc, (const char **) argv);
if (ctxt->opts_argv == NULL) {
- free(ctxt);
warn(LOGOPT_NONE, MODPREFIX "failed to duplicate options");
return 1;
}
ctxt->opts_argc = argc;
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc, argv);
- if (!ctxt->parse) {
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc, argv);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc, argv);
+ if (!ctxt->parse) {
+ logmsg(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+
+ if (ret)
free_argv(ctxt->opts_argc, ctxt->opts_argv);
+
+ return ret;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (do_init(mapfmt, argc, argv, ctxt, 0)) {
free(ctxt);
- logmsg(MODPREFIX "failed to open parse context");
return 1;
}
+
*context = ctxt;
return 0;
@@ -116,6 +136,31 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free(new);
+ return 1;
+ }
+
+ *context = new;
+
+ free_argv(ctxt->opts_argc, ctxt->opts_argv);
+ free(ctxt);
+
return 0;
}

154
autofs-5.1.1-implement-reinit-in-hesiod-lookup-module.patch
View File

@ -1,154 +0,0 @@
autofs-5.1.1 - implement reinit in hesiod lookup module
From: Ian Kent <raven@themaw.net>
Refactor the hesiod lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_hesiod.c | 96 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 74 insertions(+), 22 deletions(-)
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index de5ec08..c0f7f51 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -37,24 +37,12 @@ static pthread_mutex_t hesiod_mutex = PTHREAD_MUTEX_INITIALIZER;
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-/* This initializes a context (persistent non-global data) for queries to
- this module. */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
- struct lookup_context *ctxt = NULL;
char buf[MAX_ERR_BUF];
-
- *context = NULL;
-
- /* If we can't build a context, bail. */
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
- memset(ctxt, 0, sizeof(struct lookup_context));
+ int ret = 0;
/* Initialize the resolver. */
res_init();
@@ -63,7 +51,6 @@ int lookup_init(const char *mapfmt,
if (hesiod_init(&(ctxt->hesiod_context)) != 0) {
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr(MODPREFIX "hesiod_init(): %s", estr);
- free(ctxt);
return 1;
}
@@ -75,9 +62,9 @@ int lookup_init(const char *mapfmt,
/* amd formated hesiod maps have a map name */
const char *mapname = argv[0];
if (strncmp(mapname, AMD_MAP_PREFIX, AMD_MAP_PREFIX_LEN)) {
+ hesiod_end(ctxt->hesiod_context);
logerr(MODPREFIX
"incorrect prefix for hesiod map %s", mapname);
- free(ctxt);
return 1;
}
ctxt->mapname = mapname;
@@ -85,13 +72,52 @@ int lookup_init(const char *mapfmt,
argv++;
}
- /* Open the parser, if we can. */
- ctxt->parser = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parser) {
- logerr(MODPREFIX "failed to open parse context");
+ if (reinit) {
+ ret = reinit_parse(ctxt->parser, mapfmt,
+ MODPREFIX, argc - 1, argv - 1);
+ if (ret)
+ logerr(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parser = open_parse(mapfmt,
+ MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parser) {
+ logerr(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+
+ if (ret)
+ hesiod_end(ctxt->hesiod_context);
+
+ return ret;
+}
+
+/* This initializes a context (persistent non-global data) for queries to
+ this module. */
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ *context = NULL;
+
+ /* If we can't build a context, bail. */
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ ret = do_init(mapfmt, argc, argv, ctxt, 0);
+ if (ret) {
free(ctxt);
return 1;
}
+
*context = ctxt;
return 0;
@@ -100,6 +126,32 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ /* If we can't build a context, bail. */
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parser = ctxt->parser;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free(new);
+ return 1;
+ }
+
+ *context = new;
+
+ hesiod_end(ctxt->hesiod_context);
+ free(ctxt);
+
return 0;
}

40
autofs-5.1.1-implement-reinit-in-hosts-lookup-module.patch
View File

@ -1,40 +0,0 @@
autofs-5.1.1 - implement reinit in hosts lookup module
From: Ian Kent <raven@themaw.net>
Refactor the hosts lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_hosts.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 8ba0a4a..0a64655 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -69,6 +69,7 @@ int lookup_init(const char *mapfmt,
free(ctxt);
return 1;
}
+
*context = ctxt;
return 0;
@@ -77,6 +78,15 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ int ret;
+
+ mapfmt = MAPFMT_DEFAULT;
+
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc, argv);
+ if (ret)
+ return 1;
+
return 0;
}

216
autofs-5.1.1-implement-reinit-in-ldap-lookup-module.patch
View File

@ -1,216 +0,0 @@
autofs-5.1.1 - implement reinit in ldap lookup module
From: Ian Kent <raven@themaw.net>
Refactor the ldap lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_ldap.c | 109 +++++++++++++++++++++++++++++++++++--------------
1 file changed, 77 insertions(+), 32 deletions(-)
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 0f5bc48..578d6c6 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1683,39 +1683,23 @@ static void validate_uris(struct list_head *list)
return;
}
-/*
- * This initializes a context (persistent non-global data) for queries to
- * this module. Return zero if we succeed.
- */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
unsigned int is_amd_format;
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
int ret;
- *context = NULL;
-
- /* If we can't build a context, bail. */
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, sizeof(buf));
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
- memset(ctxt, 0, sizeof(struct lookup_context));
-
ret = pthread_mutex_init(&ctxt->uris_mutex, NULL);
if (ret) {
error(LOGOPT_ANY, MODPREFIX "failed to init uris mutex");
- free(ctxt);
return 1;
}
/* If a map type isn't explicitly given, parse it like sun entries. */
if (mapfmt == NULL)
mapfmt = MAPFMT_DEFAULT;
+
is_amd_format = 0;
if (!strcmp(mapfmt, "amd")) {
is_amd_format = 1;
@@ -1733,7 +1717,6 @@ int lookup_init(const char *mapfmt,
*/
if (!parse_server_string(LOGOPT_NONE, argv[0], ctxt)) {
error(LOGOPT_ANY, MODPREFIX "cannot parse server string");
- free_context(ctxt);
return 1;
}
@@ -1758,7 +1741,6 @@ int lookup_init(const char *mapfmt,
char *tmp = conf_amd_get_ldap_base();
if (!tmp) {
error(LOGOPT_ANY, MODPREFIX "failed to get base dn");
- free_context(ctxt);
return 1;
}
ctxt->base = tmp;
@@ -1767,7 +1749,6 @@ int lookup_init(const char *mapfmt,
if (!tmp) {
error(LOGOPT_ANY,
MODPREFIX "failed to get ldap_hostports");
- free_context(ctxt);
return 1;
}
@@ -1777,21 +1758,18 @@ int lookup_init(const char *mapfmt,
*/
if (!parse_server_string(LOGOPT_NONE, tmp, ctxt)) {
error(LOGOPT_ANY, MODPREFIX "cannot parse server string");
- free_context(ctxt);
return 1;
}
free(tmp);
if (!ctxt->server) {
error(LOGOPT_ANY, MODPREFIX "ldap_hostports not valid");
- free_context(ctxt);
return 1;
}
tmp = strdup(argv[0]);
if (!tmp) {
error(LOGOPT_ANY, MODPREFIX "failed to set mapname");
- free_context(ctxt);
return 1;
}
ctxt->mapname = tmp;
@@ -1805,7 +1783,7 @@ int lookup_init(const char *mapfmt,
*/
ret = parse_ldap_config(LOGOPT_NONE, ctxt);
if (ret) {
- free_context(ctxt);
+ error(LOGOPT_ANY, MODPREFIX "failed to parse ldap config");
return 1;
}
@@ -1815,7 +1793,6 @@ int lookup_init(const char *mapfmt,
if (!autofs_sasl_client_init(LOGOPT_NONE)) {
error(LOGOPT_ANY, "failed to init sasl client");
ldapinit_mutex_unlock();
- free_context(ctxt);
return 1;
}
ldapinit_mutex_unlock();
@@ -1824,13 +1801,51 @@ int lookup_init(const char *mapfmt,
if (is_amd_format)
ctxt->timestamp = get_amd_timestamp(ctxt);
- /* Open the parser, if we can. */
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parse) {
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse,
+ mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ /* Open the parser, if we can. */
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parse) {
+ logerr(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+
+ return ret;
+}
+
+/*
+ * This initializes a context (persistent non-global data) for queries to
+ * this module. Return zero if we succeed.
+ */
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ *context = NULL;
+
+ /* If we can't build a context, bail. */
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, sizeof(buf));
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ ret = do_init(mapfmt, argc, argv, ctxt, 0);
+ if (ret) {
free_context(ctxt);
- logerr(MODPREFIX "failed to open parse context");
return 1;
}
+
*context = ctxt;
return 0;
@@ -1839,6 +1854,36 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ /* If we can't build a context, bail. */
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, sizeof(buf));
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free_context(new);
+ return 1;
+ }
+
+ *context = new;
+
+#ifdef WITH_SASL
+ ldapinit_mutex_lock();
+ autofs_sasl_dispose(ctxt);
+ ldapinit_mutex_unlock();
+#endif
+ free_context(ctxt);
+
return 0;
}

265
autofs-5.1.1-implement-reinit-in-multi-lookup-module.patch
View File

@ -1,265 +0,0 @@
autofs-5.1.1 - implement reinit in multi lookup module
From: Ian Kent <raven@themaw.net>
Update the multi lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_multi.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 227 insertions(+), 1 deletion(-)
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index f8ebf94..fadd2ea 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -146,6 +146,31 @@ static int free_multi_context(struct lookup_context *ctxt)
return rv;
}
+static struct lookup_context *update_multi_context(struct lookup_context *ctxt,
+ struct lookup_context *new)
+{
+ int i;
+
+ for (i = 0; i < new->n && i < ctxt->n; i++) {
+ if (new->m[i].mod)
+ continue;
+
+ if (!ctxt->m[i].mod)
+ continue;
+
+ /* reinit or open failed, use old one, questionable but
+ * we need to do something.
+ */
+ new->m[i].mod = ctxt->m[i].mod;
+ ctxt->m[i].mod = NULL;
+ new->m[i].argc = ctxt->m[i].argc;
+ new->m[i].argv = ctxt->m[i].argv;
+ ctxt->m[i].argv = NULL;
+ }
+
+ return new;
+}
+
static struct lookup_mod *nss_open_lookup(const char *format, int argc, const char **argv)
{
struct list_head nsslist;
@@ -268,6 +293,8 @@ int lookup_init(const char *my_mapfmt,
struct lookup_context *ctxt;
int i;
+ *context = NULL;
+
ctxt = alloc_context(my_mapfmt, argc, argv);
if (!ctxt)
return 1;
@@ -291,7 +318,206 @@ int lookup_init(const char *my_mapfmt,
int lookup_reinit(const char *my_mapfmt,
int argc, const char *const *argv, void **context)
{
- return 0;
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct list_head nsslist;
+ struct list_head *head, *p;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF], *estr;
+ int i, ret = 0;
+ int status;
+
+ new = alloc_context(my_mapfmt, argc, argv);
+ if (!new)
+ return 1;
+
+ for (i = 0; i < new->n; i++) {
+ if (i >= ctxt->n) {
+ new->m[i].mod = nss_open_lookup(my_mapfmt,
+ new->m[i].argc,
+ new->m[i].argv);
+ if (!new->m[i].mod) {
+ logerr(MODPREFIX "error opening module");
+ /* TODO: check */
+ ret = 1;
+ goto out;
+ }
+ continue;
+ }
+
+ if (*new->m[i].argv[0] == '/') {
+ if (strcmp(new->m[i].argv[0], ctxt->m[i].argv[0]))
+ open_lookup("file", MODPREFIX,
+ my_mapfmt,
+ new->m[i].argc,
+ new->m[i].argv,
+ &new->m[i].mod);
+ else {
+ new->m[i].mod = ctxt->m[i].mod;
+ if (reinit_lookup(new->m[i].mod, "file",
+ MODPREFIX, my_mapfmt,
+ new->m[i].argc, new->m[i].argv))
+ new->m[i].mod = NULL;
+ else
+ ctxt->m[i].mod = NULL;
+ }
+ continue;
+ }
+
+ if (!strncmp(new->m[i].argv[0], "file", 4) ||
+ !strncmp(new->m[i].argv[0], "yp", 2) ||
+ !strncmp(new->m[i].argv[0], "nisplus", 7) ||
+ !strncmp(new->m[i].argv[0], "nis", 3) ||
+ !strncmp(new->m[i].argv[0], "ldaps", 5) ||
+ !strncmp(new->m[i].argv[0], "ldap", 4) ||
+ !strncmp(new->m[i].argv[0], "sss", 3)) {
+ char type[MAX_MAP_TYPE_STRING];
+ char *fmt;
+
+ strcpy(type, new->m[i].argv[0]);
+ fmt = strchr(type, ',');
+ if (!fmt)
+ fmt = (char *) my_mapfmt;
+ else {
+ *fmt = '\0';
+ fmt++;
+ }
+
+ if (!strcmp(new->m[i].argv[0], ctxt->m[i].argv[0]) &&
+ !strcmp(new->m[i].argv[1], ctxt->m[i].argv[1])) {
+ new->m[i].mod = ctxt->m[i].mod;
+ if (reinit_lookup(new->m[i].mod, new->m[i].argv[0],
+ MODPREFIX, fmt,
+ new->m[i].argc - 1, new->m[i].argv + 1))
+ new->m[i].mod = NULL;
+ else
+ ctxt->m[i].mod = NULL;
+ } else {
+ open_lookup(type, MODPREFIX, fmt,
+ new->m[i].argc - 1,
+ new->m[i].argv + 1,
+ &new->m[i].mod);
+ }
+ continue;
+ }
+
+ INIT_LIST_HEAD(&nsslist);
+
+ if (nsswitch_parse(&nsslist)) {
+ if (!list_empty(&nsslist))
+ free_sources(&nsslist);
+ logerr("can't to read name service switch config.");
+ /* TODO: check */
+ ret = 1;
+ goto out;
+ }
+
+ head = &nsslist;
+ list_for_each(p, head) {
+ struct nss_source *this;
+
+ this = list_entry(p, struct nss_source, list);
+
+ if (!strcmp(this->source, ctxt->m[i].mod->type)) {
+ new->m[i].mod = ctxt->m[i].mod;
+ if (reinit_lookup(new->m[i].mod, this->source,
+ MODPREFIX, my_mapfmt,
+ new->m[i].argc, new->m[i].argv))
+ new->m[i].mod = NULL;
+ else
+ ctxt->m[i].mod = NULL;
+ continue;
+ }
+
+ if (!strcmp(this->source, "files")) {
+ char src_file[] = "file";
+ char src_prog[] = "program";
+ struct stat st;
+ char *type, *path, *save_argv0;
+
+ path = malloc(strlen(AUTOFS_MAP_DIR) +
+ strlen(new->m[i].argv[0]) + 2);
+ if (!path) {
+ estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "error: %s", estr);
+ free_sources(&nsslist);
+ ret = 1;
+ goto out;
+ }
+ strcpy(path, AUTOFS_MAP_DIR);
+ strcat(path, "/");
+ strcat(path, new->m[i].argv[0]);
+
+ if (stat(path, &st) == -1 || !S_ISREG(st.st_mode)) {
+ free(path);
+ continue;
+ }
+
+ if (st.st_mode & __S_IEXEC)
+ type = src_prog;
+ else
+ type = src_file;
+
+ save_argv0 = (char *) new->m[i].argv[0];
+ new->m[i].argv[0] = path;
+
+ if (strcmp(type, ctxt->m[i].mod->type)) {
+ status = open_lookup(type,
+ MODPREFIX,
+ my_mapfmt,
+ new->m[i].argc,
+ new->m[i].argv,
+ &new->m[i].mod);
+ if (status == NSS_STATUS_SUCCESS) {
+ free(save_argv0);
+ break;
+ }
+ } else {
+ new->m[i].mod = ctxt->m[i].mod;
+ if (reinit_lookup(new->m[i].mod, type,
+ MODPREFIX, my_mapfmt,
+ new->m[i].argc, new->m[i].argv))
+ new->m[i].mod = NULL;
+ else {
+ ctxt->m[i].mod = NULL;
+ free(save_argv0);
+ break;
+ }
+ }
+
+ new->m[i].argv[0] = save_argv0;
+ free(path);
+ continue;
+ }
+
+ if (strcmp(this->source, ctxt->m[i].mod->type)) {
+ status = open_lookup(this->source, MODPREFIX,
+ my_mapfmt,
+ new->m[i].argc,
+ new->m[i].argv,
+ &new->m[i].mod);
+ if (status == NSS_STATUS_SUCCESS)
+ break;
+ } else {
+ new->m[i].mod = ctxt->m[i].mod;
+ if (reinit_lookup(new->m[i].mod, this->source,
+ MODPREFIX, my_mapfmt,
+ new->m[i].argc, new->m[i].argv))
+ new->m[i].mod = NULL;
+ else {
+ ctxt->m[i].mod = NULL;
+ break;
+ }
+ }
+ }
+ free_sources(&nsslist);
+ }
+out:
+ /* Update new context with any needed old context */
+ *context = update_multi_context(ctxt, new);
+ free_multi_context(ctxt);
+ free(ctxt);
+
+ return ret;
}
int lookup_read_master(struct master *master, time_t age, void *context)

133
autofs-5.1.1-implement-reinit-in-nisplus-lookup-module.patch
View File

@ -1,133 +0,0 @@
autofs-5.1.1 - implement reinit in nisplus lookup module
From: Ian Kent <raven@themaw.net>
Refactor the nisplus lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_nisplus.c | 83 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 63 insertions(+), 20 deletions(-)
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 0c66152..5fd1d89 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -30,25 +30,16 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
-
- *context = NULL;
-
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "%s", estr);
- return 1;
- }
+ int ret = 0;
if (argc < 1) {
- free(ctxt);
logmsg(MODPREFIX "No map name");
- return 1;
+ ret = 1;
+ goto out;
}
ctxt->mapname = argv[0];
@@ -58,20 +49,50 @@ int lookup_init(const char *mapfmt,
*/
ctxt->domainname = nis_local_directory();
if (!ctxt->domainname) {
- free(ctxt);
logmsg(MODPREFIX "NIS+ domain not set");
- return 1;
+ ret = 1;
+ goto out;
}
if (!mapfmt)
mapfmt = MAPFMT_DEFAULT;
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parse) {
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc, argv);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parse) {
+ logerr(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+out:
+ return ret;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "%s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (do_init(mapfmt, argc, argv, ctxt, 0)) {
free(ctxt);
- logerr(MODPREFIX "failed to open parse context");
return 1;
}
+
*context = ctxt;
return 0;
@@ -80,6 +101,28 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "%s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret)
+ return 1;
+
+ *context = new;
+
+ free(ctxt);
+
return 0;
}

146
autofs-5.1.1-implement-reinit-in-parse-modules.patch
View File

@ -1,146 +0,0 @@
autofs-5.1.1 - implement reinit in parse modules
From: Ian Kent <raven@themaw.net>
Refactor the parse modules to add an implementation for the newly added
reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/parse_hesiod.c | 1 +
modules/parse_sun.c | 70 ++++++++++++++++++++++++++++++++++++------------
2 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/modules/parse_hesiod.c b/modules/parse_hesiod.c
index 0b2b57f..a02da82 100644
--- a/modules/parse_hesiod.c
+++ b/modules/parse_hesiod.c
@@ -258,6 +258,7 @@ static int parse_generic(struct autofs_point *ap,
int parse_init(int argc, const char *const *argv, void **context)
{
+ *context = NULL;
return 0;
}
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 35d6da5..a164fba 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -232,27 +232,15 @@ int expandsunent(const char *src, char *dst, const char *key,
return len;
}
-int parse_init(int argc, const char *const *argv, void **context)
+static int do_init(int argc, const char *const *argv, struct parse_context *ctxt)
{
- struct parse_context *ctxt;
- char buf[MAX_ERR_BUF];
char *noptstr, *def, *val, *macros, *gbl_options;
- const char *xopt;
+ char buf[MAX_ERR_BUF];
int optlen, len, offset;
+ const char *xopt;
int i, bval;
unsigned int append_options;
- /* Set up context and escape chain */
-
- if (!(ctxt = (struct parse_context *) malloc(sizeof(struct parse_context)))) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- *context = NULL;
- return 1;
- }
- *context = (void *) ctxt;
-
- *ctxt = default_context;
optlen = 0;
/* Look for options and capture, and create new defines if we need to */
@@ -359,7 +347,6 @@ int parse_init(int argc, const char *const *argv, void **context)
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
kill_context(ctxt);
logerr(MODPREFIX "%s", estr);
- *context = NULL;
return 1;
}
ctxt->optstr = noptstr;
@@ -391,9 +378,36 @@ int parse_init(int argc, const char *const *argv, void **context)
}
}
options_done:
+
debug(LOGOPT_NONE,
MODPREFIX "init gathered global options: %s", ctxt->optstr);
+ return 0;
+}
+
+int parse_init(int argc, const char *const *argv, void **context)
+{
+ struct parse_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ /* Set up context and escape chain */
+
+ ctxt = (struct parse_context *) malloc(sizeof(struct parse_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+
+ *ctxt = default_context;
+
+ if (do_init(argc, argv, ctxt)) {
+ free(ctxt);
+ return 1;
+ }
+
/* We only need this once. NFS mounts are so common that we cache
this module. */
instance_mutex_lock();
@@ -404,17 +418,39 @@ options_done:
init_ctr++;
} else {
kill_context(ctxt);
- *context = NULL;
instance_mutex_unlock();
return 1;
}
}
instance_mutex_unlock();
+
+ *context = (void *) ctxt;
+
return 0;
}
int parse_reinit(int argc, const char *const *argv, void **context)
{
+ struct parse_context *ctxt = (struct parse_context *) *context;
+ struct parse_context *new;
+ char buf[MAX_ERR_BUF];
+
+ new = (struct parse_context *) malloc(sizeof(struct parse_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+
+ *new = default_context;
+
+ if (do_init(argc, argv, new))
+ return 1;
+
+ kill_context(ctxt);
+
+ *context = (void *) new;
+
return 0;
}

153
autofs-5.1.1-implement-reinit-in-program-lookup-module.patch
View File

@ -1,153 +0,0 @@
autofs-5.1.1 - implement reinit in program lookup module
From: Ian Kent <raven@themaw.net>
Refactor the program lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_program.c | 98 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 76 insertions(+), 22 deletions(-)
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index fa4f54d..3e9c448 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -49,53 +49,82 @@ struct parse_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
-
- *context = NULL;
-
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
+ int ret = 0;
if (argc < 1) {
logmsg(MODPREFIX "No map name");
- free(ctxt);
- return 1;
+ ret = 1;
+ goto out;
}
ctxt->mapname = argv[0];
if (ctxt->mapname[0] != '/') {
logmsg(MODPREFIX "program map %s is not an absolute pathname",
ctxt->mapname);
- free(ctxt);
- return 1;
+ ret = 1;
+ goto out;
}
if (access(ctxt->mapname, X_OK)) {
logmsg(MODPREFIX "program map %s missing or not executable",
ctxt->mapname);
- free(ctxt);
- return 1;
+ ret = 1;
+ goto out;
}
if (!mapfmt)
mapfmt = MAPFMT_DEFAULT;
ctxt->mapfmt = strdup(mapfmt);
+ if (!ctxt->mapfmt) {
+ logmsg(MODPREFIX "failed to allocate storage for map format");
+ ret = 1;
+ goto out;
+ }
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parse) {
- logmsg(MODPREFIX "failed to open parse context");
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parse) {
+ logmsg(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+out:
+ if (ret && ctxt->mapfmt)
+ free(ctxt->mapfmt);
+
+ return ret;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (do_init(mapfmt, argc, argv, ctxt, 0)) {
free(ctxt);
return 1;
}
+
*context = ctxt;
return 0;
@@ -104,6 +133,31 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free(new);
+ return 1;
+ }
+
+ *context = new;
+
+ free(ctxt->mapfmt);
+ free(ctxt);
+
return 0;
}

189
autofs-5.1.1-implement-reinit-in-sss-lookup-module.patch
View File

@ -1,189 +0,0 @@
autofs-5.1.1 - implement reinit in sss lookup module
From: Ian Kent <raven@themaw.net>
Refactor the sss lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_sss.c | 130 +++++++++++++++++++++++++++++++++++++-------------
1 file changed, 95 insertions(+), 35 deletions(-)
diff --git a/modules/lookup_sss.c b/modules/lookup_sss.c
index c58a272..2f32e94 100644
--- a/modules/lookup_sss.c
+++ b/modules/lookup_sss.c
@@ -56,39 +56,16 @@ struct lookup_context {
int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int open_sss_lib(struct lookup_context *ctxt)
{
- struct lookup_context *ctxt;
- char buf[MAX_ERR_BUF];
char dlbuf[PATH_MAX];
char *estr;
void *dh;
size_t size;
- *context = NULL;
-
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
-
- if (argc < 1) {
- free(ctxt);
- logerr(MODPREFIX "No map name");
- return 1;
- }
- ctxt->mapname = argv[0];
-
- if (!mapfmt)
- mapfmt = MAPFMT_DEFAULT;
-
size = snprintf(dlbuf, sizeof(dlbuf),
"%s/%s.so", SSS_LIB_DIR, SSS_SO_NAME);
if (size >= sizeof(dlbuf)) {
- free(ctxt);
logmsg(MODPREFIX "sss library path too long");
return 1;
}
@@ -96,7 +73,6 @@ int lookup_init(const char *mapfmt,
dh = dlopen(dlbuf, RTLD_LAZY);
if (!dh) {
logerr(MODPREFIX "failed to open %s: %s", dlbuf, dlerror());
- free(ctxt);
return 1;
}
ctxt->dlhandle = dh;
@@ -117,15 +93,6 @@ int lookup_init(const char *mapfmt,
if (!ctxt->setautomntent)
goto lib_names_fail;
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parse) {
- logmsg(MODPREFIX "failed to open parse context");
- dlclose(dh);
- free(ctxt);
- return 1;
- }
- *context = ctxt;
-
return 0;
lib_names_fail:
@@ -134,13 +101,106 @@ lib_names_fail:
else
logerr(MODPREFIX "dlsym: %s", estr);
dlclose(dh);
- free(ctxt);
+
return 1;
}
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
+{
+ int ret = 0;
+
+ if (argc < 1) {
+ logerr(MODPREFIX "No map name");
+ ret = 1;
+ goto out;
+ }
+ ctxt->mapname = argv[0];
+
+ if (!mapfmt)
+ mapfmt = MAPFMT_DEFAULT;
+
+ if (!reinit) {
+ ret = open_sss_lib(ctxt);
+ if (ret)
+ goto out;
+ }
+
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parse) {
+ logmsg(MODPREFIX "failed to open parse context");
+ dlclose(ctxt->dlhandle);
+ ret = 1;
+ }
+ }
+out:
+ return ret;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+ char *estr;
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+
+ if (do_init(mapfmt, argc, argv, ctxt, 0)) {
+ free(ctxt);
+ return 1;
+ }
+
+ *context = ctxt;
+
+ return 0;
+}
+
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free(new);
+ return 1;
+ }
+
+ new->dlhandle = ctxt->dlhandle;
+ new->setautomntent = ctxt->setautomntent;
+ new->getautomntent_r = ctxt->getautomntent_r;
+ new->getautomntbyname_r = ctxt->getautomntbyname_r;
+ new->endautomntent = ctxt->endautomntent;
+
+ *context = new;
+
+ free(ctxt);
+
return 0;
}

151
autofs-5.1.1-implement-reinit-in-yp-lookup-module.patch
View File

@ -1,151 +0,0 @@
autofs-5.1.1 - implement reinit in yp lookup module
From: Ian Kent <raven@themaw.net>
Refactor the yp lookup module to add an implementation for the newly
added reinit entry point.
Signed-off-by: Ian Kent <raven@themaw.net>
---
modules/lookup_yp.c | 93 +++++++++++++++++++++++++++++++++++++++------------
1 file changed, 71 insertions(+), 22 deletions(-)
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 1e5a7ed..e31c2cf 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -103,27 +103,18 @@ static unsigned int get_map_order(const char *domain, const char *map)
return (unsigned int) last_changed;
}
-int lookup_init(const char *mapfmt,
- int argc, const char *const *argv, void **context)
+static int do_init(const char *mapfmt,
+ int argc, const char *const *argv,
+ struct lookup_context *ctxt, unsigned int reinit)
{
- struct lookup_context *ctxt;
char buf[MAX_ERR_BUF];
int err;
-
- *context = NULL;
-
- ctxt = malloc(sizeof(struct lookup_context));
- if (!ctxt) {
- char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
- logerr(MODPREFIX "malloc: %s", estr);
- return 1;
- }
- memset(ctxt, 0, sizeof(struct lookup_context));
+ int ret = 0;
if (argc < 1) {
- free(ctxt);
logerr(MODPREFIX "no map name");
- return 1;
+ ret = 1;
+ goto out;
}
ctxt->mapname = argv[0];
ctxt->check_defaults = 1;
@@ -138,15 +129,15 @@ int lookup_init(const char *mapfmt,
if (err) {
logerr(MODPREFIX
"map %s: %s", ctxt->mapname, yperr_string(err));
- free(ctxt);
- return 1;
+ ret = 1;
+ goto out;
}
ctxt->domainname = strdup(domainname);
if (!ctxt->domainname) {
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr(MODPREFIX "strdup: %s", estr);
- free(ctxt);
- return 1;
+ ret = 1;
+ goto out;
}
}
@@ -155,12 +146,45 @@ int lookup_init(const char *mapfmt,
if (!mapfmt)
mapfmt = MAPFMT_DEFAULT;
- ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
- if (!ctxt->parse) {
+ if (reinit) {
+ ret = reinit_parse(ctxt->parse, mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (ret)
+ logmsg(MODPREFIX "failed to reinit parse context");
+ } else {
+ ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+ if (!ctxt->parse) {
+ logmsg(MODPREFIX "failed to open parse context");
+ ret = 1;
+ }
+ }
+out:
+ if (ret && ctxt->domainname)
+ free(ctxt->domainname);
+
+ return ret;
+}
+
+int lookup_init(const char *mapfmt,
+ int argc, const char *const *argv, void **context)
+{
+ struct lookup_context *ctxt;
+ char buf[MAX_ERR_BUF];
+
+ *context = NULL;
+
+ ctxt = malloc(sizeof(struct lookup_context));
+ if (!ctxt) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(ctxt, 0, sizeof(struct lookup_context));
+
+ if (do_init(mapfmt, argc, argv, ctxt, 0)) {
free(ctxt);
- logmsg(MODPREFIX "failed to open parse context");
return 1;
}
+
*context = ctxt;
return 0;
@@ -169,6 +193,31 @@ int lookup_init(const char *mapfmt,
int lookup_reinit(const char *mapfmt,
int argc, const char *const *argv, void **context)
{
+ struct lookup_context *ctxt = (struct lookup_context *) *context;
+ struct lookup_context *new;
+ char buf[MAX_ERR_BUF];
+ int ret;
+
+ new = malloc(sizeof(struct lookup_context));
+ if (!new) {
+ char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+ logerr(MODPREFIX "malloc: %s", estr);
+ return 1;
+ }
+ memset(new, 0, sizeof(struct lookup_context));
+
+ new->parse = ctxt->parse;
+ ret = do_init(mapfmt, argc, argv, new, 1);
+ if (ret) {
+ free(new);
+ return 1;
+ }
+
+ *context = new;
+
+ free(ctxt->domainname);
+ free(ctxt);
+
return 0;
}

115
autofs-5.1.1-make-connect_to_server-return-a-status.patch
View File

@ -1,115 +0,0 @@
autofs-5.1.1 - make connect_to_server() return a status
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Next step in the update of do_reconnect() is to make connect_to_server()
return a status instead of an LDAP handle and pass back the LDAP handle
via a function parameter.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 25 ++++++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2f1e380..6d57581 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
- fix return handling in sss lookup module.
- move query dn calculation from do_bind() to do_connect().
- make do_connect() return a status.
+- make connect_to_server() return a status.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 268c812..776c174 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -824,20 +824,19 @@ next:
return timestamp;
}
-static LDAP *connect_to_server(unsigned logopt, const char *uri, struct lookup_context *ctxt)
+static int connect_to_server(unsigned logopt, LDAP **ldap,
+ const char *uri, struct lookup_context *ctxt)
{
- LDAP *ldap;
int ret;
- ret = do_connect(logopt, &ldap, uri, ctxt);
+ ret = do_connect(logopt, ldap, uri, ctxt);
if (ret != NSS_STATUS_SUCCESS) {
warn(logopt,
MODPREFIX "couldn't connect to server %s",
uri ? uri : "default");
- return NULL;
}
- return ldap;
+ return ret;
}
static LDAP *find_dc_server(unsigned logopt, const char *uri, struct lookup_context *ctxt)
@@ -852,9 +851,11 @@ static LDAP *find_dc_server(unsigned logopt, const char *uri, struct lookup_cont
tok = strtok_r(str, " ", &ptr);
while (tok) {
const char *this = (const char *) tok;
+ int ret;
+
debug(logopt, "trying server uri %s", this);
- ldap = connect_to_server(logopt, this, ctxt);
- if (ldap) {
+ ret = connect_to_server(logopt, &ldap, this, ctxt);
+ if (ret == NSS_STATUS_SUCCESS) {
info(logopt, "connected to uri %s", this);
free(str);
return ldap;
@@ -874,6 +875,7 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
struct list_head *p, *first;
struct dclist *dclist;
char *uri = NULL;
+ int ret;
uris_mutex_lock(ctxt);
dclist = ctxt->dclist;
@@ -896,8 +898,8 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
if (!strstr(this->uri, ":///")) {
uri = strdup(this->uri);
debug(logopt, "trying server uri %s", uri);
- ldap = connect_to_server(logopt, uri, ctxt);
- if (ldap) {
+ ret = connect_to_server(logopt, &ldap, uri, ctxt);
+ if (ret == NSS_STATUS_SUCCESS) {
info(logopt, "connected to uri %s", uri);
free(uri);
break;
@@ -962,7 +964,8 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();
- ldap = connect_to_server(logopt, ctxt->server, ctxt);
+ ret = connect_to_server(logopt, &ldap,
+ ctxt->server, ctxt);
}
#endif
return ldap;
@@ -1001,7 +1004,7 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();
- ldap = connect_to_server(logopt, ctxt->uri->uri, ctxt);
+ ret = connect_to_server(logopt, &ldap, ctxt->uri->uri, ctxt);
}
#endif
if (ldap)

184
autofs-5.1.1-make-do_connect-return-a-status.patch
View File

@ -1,184 +0,0 @@
autofs-5.1.1 - make do_connect() return a status
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
The next step in the update of do_reconnect() is to make do_connect()
return a status instead of an LDAP handle and pass back the LDAP handle
via a function parameter.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 60 ++++++++++++++++++++++++++++++-------------------
2 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0be1bf2..2f1e380 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
- fix left mount count return from umount_multi_triggers().
- fix return handling in sss lookup module.
- move query dn calculation from do_bind() to do_connect().
+- make do_connect() return a status.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index ea63736..268c812 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -631,10 +631,14 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
return 1;
}
-static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context *ctxt)
+static int do_connect(unsigned logopt, LDAP **ldap,
+ const char *uri, struct lookup_context *ctxt)
{
char *cur_host = NULL;
- LDAP *ldap;
+ LDAP *handle;
+ int ret = NSS_STATUS_SUCCESS;
+
+ *ldap = NULL;
#ifdef WITH_SASL
if (ctxt->extern_cert && ctxt->extern_key) {
@@ -643,18 +647,20 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
}
#endif
- ldap = init_ldap_connection(logopt, uri, ctxt);
- if (!ldap)
+ handle = init_ldap_connection(logopt, uri, ctxt);
+ if (!handle) {
+ ret = NSS_STATUS_UNAVAIL;
goto out;
+ }
uris_mutex_lock(ctxt);
if (ctxt->cur_host)
cur_host = ctxt->cur_host;
uris_mutex_unlock(ctxt);
- if (!do_bind(logopt, ldap, uri, ctxt)) {
- unbind_ldap_connection(logopt, ldap, ctxt);
- ldap = NULL;
+ if (!do_bind(logopt, handle, uri, ctxt)) {
+ unbind_ldap_connection(logopt, handle, ctxt);
+ ret = NSS_STATUS_UNAVAIL;
goto out;
}
@@ -664,7 +670,8 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
uris_mutex_lock(ctxt);
if (ctxt->schema && ctxt->qdn && (cur_host == ctxt->cur_host)) {
uris_mutex_unlock(ctxt);
- return ldap;
+ *ldap = handle;
+ goto out;
}
uris_mutex_unlock(ctxt);
@@ -674,9 +681,9 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
* base dn for searches.
*/
if (!ctxt->schema) {
- if (!find_query_dn(logopt, ldap, ctxt)) {
- unbind_ldap_connection(logopt, ldap, ctxt);
- ldap = NULL;
+ if (!find_query_dn(logopt, handle, ctxt)) {
+ unbind_ldap_connection(logopt, handle, ctxt);
+ ret = NSS_STATUS_NOTFOUND;
warn(logopt,
MODPREFIX "failed to find valid query dn");
goto out;
@@ -684,14 +691,17 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
} else if (!(ctxt->format & MAP_FLAG_FORMAT_AMD)) {
const char *class = ctxt->schema->map_class;
const char *key = ctxt->schema->map_attr;
- if (!get_query_dn(logopt, ldap, ctxt, class, key)) {
- unbind_ldap_connection(logopt, ldap, ctxt);
- ldap = NULL;
+ if (!get_query_dn(logopt, handle, ctxt, class, key)) {
+ unbind_ldap_connection(logopt, handle, ctxt);
+ ret = NSS_STATUS_NOTFOUND;
error(logopt, MODPREFIX "failed to get query dn");
+ goto out;
}
}
+
+ *ldap = handle;
out:
- return ldap;
+ return ret;
}
static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
@@ -706,8 +716,8 @@ static unsigned long get_amd_timestamp(struct lookup_context *ctxt)
unsigned long timestamp = 0;
int rv, l, ql;
- ldap = do_connect(LOGOPT_ANY, ctxt->server, ctxt);
- if (!ldap)
+ rv = do_connect(LOGOPT_ANY, &ldap, ctxt->server, ctxt);
+ if (rv != NSS_STATUS_SUCCESS)
return 0;
map = amd_timestamp.map_attr;
@@ -817,9 +827,10 @@ next:
static LDAP *connect_to_server(unsigned logopt, const char *uri, struct lookup_context *ctxt)
{
LDAP *ldap;
+ int ret;
- ldap = do_connect(logopt, uri, ctxt);
- if (!ldap) {
+ ret = do_connect(logopt, &ldap, uri, ctxt);
+ if (ret != NSS_STATUS_SUCCESS) {
warn(logopt,
MODPREFIX "couldn't connect to server %s",
uri ? uri : "default");
@@ -940,12 +951,14 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
{
LDAP *ldap = NULL;
+ int ret;
if (ctxt->server || !ctxt->uris) {
- ldap = do_connect(logopt, ctxt->server, ctxt);
+ ret = do_connect(logopt, &ldap, ctxt->server, ctxt);
#ifdef WITH_SASL
/* Dispose of the sasl authentication connection and try again. */
- if (!ldap && ctxt->auth_required & LDAP_NEED_AUTH) {
+ if (ret != NSS_STATUS_SUCCESS &&
+ ctxt->auth_required & LDAP_NEED_AUTH) {
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();
@@ -977,13 +990,14 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
if (!ctxt->uri)
goto find_server;
- ldap = do_connect(logopt, ctxt->uri->uri, ctxt);
+ ret = do_connect(logopt, &ldap, ctxt->uri->uri, ctxt);
#ifdef WITH_SASL
/*
* Dispose of the sasl authentication connection and try the
* current server again before trying other servers in the list.
*/
- if (!ldap && ctxt->auth_required & LDAP_NEED_AUTH) {
+ if (ret != NSS_STATUS_SUCCESS &&
+ ctxt->auth_required & LDAP_NEED_AUTH) {
ldapinit_mutex_lock();
autofs_sasl_dispose(ctxt);
ldapinit_mutex_unlock();

105
autofs-5.1.1-make-find_dc_server-return-a-status.patch
View File

@ -1,105 +0,0 @@
autofs-5.1.1 - make find_dc_server() return a status
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Next step in the update of do_reconnect() is to make find_dc_server()
return a status instead of an LDAP handle and pass back the LDAP handle
via a function parameter.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 27 +++++++++++++++------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6d57581..99f465a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
- move query dn calculation from do_bind() to do_connect().
- make do_connect() return a status.
- make connect_to_server() return a status.
+- make find_dc_server() return a status.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 776c174..02d9ca9 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -839,33 +839,36 @@ static int connect_to_server(unsigned logopt, LDAP **ldap,
return ret;
}
-static LDAP *find_dc_server(unsigned logopt, const char *uri, struct lookup_context *ctxt)
+static int find_dc_server(unsigned logopt, LDAP **ldap,
+ const char *uri, struct lookup_context *ctxt)
{
char *str, *tok, *ptr = NULL;
- LDAP *ldap = NULL;
+ int ret = NSS_STATUS_UNAVAIL;
str = strdup(uri);
if (!str)
- return NULL;
+ return ret;
tok = strtok_r(str, " ", &ptr);
while (tok) {
const char *this = (const char *) tok;
- int ret;
+ int rv;
debug(logopt, "trying server uri %s", this);
- ret = connect_to_server(logopt, &ldap, this, ctxt);
- if (ret == NSS_STATUS_SUCCESS) {
+ rv = connect_to_server(logopt, ldap, this, ctxt);
+ if (rv == NSS_STATUS_SUCCESS) {
info(logopt, "connected to uri %s", this);
free(str);
- return ldap;
+ return rv;
}
+ if (rv == NSS_STATUS_NOTFOUND)
+ ret = NSS_STATUS_NOTFOUND;
tok = strtok_r(NULL, " ", &ptr);
}
free(str);
- return NULL;
+ return ret;
}
static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
@@ -917,8 +920,8 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
dclist = tmp;
uri = strdup(dclist->uri);
}
- ldap = find_dc_server(logopt, uri, ctxt);
- if (ldap) {
+ ret = find_dc_server(logopt, &ldap, uri, ctxt);
+ if (ret == NSS_STATUS_SUCCESS) {
free(uri);
break;
}
@@ -972,8 +975,8 @@ static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
}
if (ctxt->dclist) {
- ldap = find_dc_server(logopt, ctxt->dclist->uri, ctxt);
- if (ldap)
+ ret = find_dc_server(logopt, &ldap, ctxt->dclist->uri, ctxt);
+ if (ret == NSS_STATUS_SUCCESS)
return ldap;
}

121
autofs-5.1.1-make-find_server-return-a-status.patch
View File

@ -1,121 +0,0 @@
autofs-5.1.1 - make find_server() return a status
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Next step in the update of do_reconnect() is to make find_server()
return a status instead of an LDAP handle and pass back the LDAP handle
via a function parameter.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 30 +++++++++++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 99f465a..bc79bc0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
- make do_connect() return a status.
- make connect_to_server() return a status.
- make find_dc_server() return a status.
+- make find_server() return a status.
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 02d9ca9..783239d 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -871,14 +871,14 @@ static int find_dc_server(unsigned logopt, LDAP **ldap,
return ret;
}
-static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
+static int find_server(unsigned logopt,
+ LDAP **ldap, struct lookup_context *ctxt)
{
- LDAP *ldap = NULL;
- struct ldap_uri *this;
+ struct ldap_uri *this = NULL;
struct list_head *p, *first;
struct dclist *dclist;
char *uri = NULL;
- int ret;
+ int ret = NSS_STATUS_UNAVAIL;
uris_mutex_lock(ctxt);
dclist = ctxt->dclist;
@@ -892,6 +892,8 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
/* Try each uri, save point in server list upon success */
p = first->next;
while(p != first) {
+ int rv;
+
/* Skip list head */
if (p == ctxt->uris) {
p = p->next;
@@ -901,12 +903,15 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
if (!strstr(this->uri, ":///")) {
uri = strdup(this->uri);
debug(logopt, "trying server uri %s", uri);
- ret = connect_to_server(logopt, &ldap, uri, ctxt);
- if (ret == NSS_STATUS_SUCCESS) {
+ rv = connect_to_server(logopt, ldap, uri, ctxt);
+ if (rv == NSS_STATUS_SUCCESS) {
+ ret = NSS_STATUS_SUCCESS;
info(logopt, "connected to uri %s", uri);
free(uri);
break;
}
+ if (rv == NSS_STATUS_NOTFOUND)
+ ret = NSS_STATUS_NOTFOUND;
} else {
if (dclist)
uri = strdup(dclist->uri);
@@ -920,11 +925,14 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
dclist = tmp;
uri = strdup(dclist->uri);
}
- ret = find_dc_server(logopt, &ldap, uri, ctxt);
- if (ret == NSS_STATUS_SUCCESS) {
+ rv = find_dc_server(logopt, ldap, uri, ctxt);
+ if (rv == NSS_STATUS_SUCCESS) {
+ ret = NSS_STATUS_SUCCESS;
free(uri);
break;
}
+ if (rv == NSS_STATUS_NOTFOUND)
+ ret = NSS_STATUS_NOTFOUND;
}
free(uri);
uri = NULL;
@@ -950,7 +958,7 @@ static LDAP *find_server(unsigned logopt, struct lookup_context *ctxt)
}
uris_mutex_unlock(ctxt);
- return ldap;
+ return ret;
}
static LDAP *do_reconnect(unsigned logopt, struct lookup_context *ctxt)
@@ -1023,8 +1031,8 @@ find_server:
#endif
/* Current server failed, try the rest or dc connection */
- ldap = find_server(logopt, ctxt);
- if (!ldap)
+ ret = find_server(logopt, &ldap, ctxt);
+ if (ret != NSS_STATUS_SUCCESS)
error(logopt, MODPREFIX "failed to find available server");
return ldap;

260
autofs-5.1.1-make-open_lookup-return-nss-status.patch
View File

@ -1,260 +0,0 @@
autofs-5.1.1 - make open_lookup() return nss status
From: Ian Kent <raven@themaw.net>
In order to distinguish between source unavailable and map not found
when opening nsswitch sources that have non-default actions open_lookup()
needs to return distinct results for these two cases.
Signed-off-by: Ian Kent <raven@themaw.net>
---
daemon/lookup.c | 21 +++++++++++----------
daemon/module.c | 22 +++++++++++++---------
include/automount.h | 4 ++--
modules/lookup_multi.c | 20 +++++++++++++-------
modules/parse_amd.c | 6 ++++--
5 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 53455a1..0579f98 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -44,9 +44,9 @@ static int do_read_master(struct master *master, char *type, time_t age)
argv[0] = master->name;
argv[1] = NULL;
- lookup = open_lookup(type, "", NULL, argc, argv);
- if (!lookup)
- return NSS_STATUS_UNAVAIL;
+ status = open_lookup(type, "", NULL, argc, argv, &lookup);
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
status = lookup->lookup_read_master(master, age, lookup->context);
@@ -300,10 +300,11 @@ static int do_read_map(struct autofs_point *ap, struct map_source *map, time_t a
struct lookup_mod *lookup;
int status;
- lookup = open_lookup(map->type, "", map->format, map->argc, map->argv);
- if (!lookup) {
+ status = open_lookup(map->type, "", map->format,
+ map->argc, map->argv, &lookup);
+ if (status != NSS_STATUS_SUCCESS) {
debug(ap->logopt, "lookup module %s failed", map->type);
- return NSS_STATUS_UNAVAIL;
+ return status;
}
master_source_writelock(ap->entry);
@@ -737,12 +738,12 @@ int do_lookup_mount(struct autofs_point *ap, struct map_source *map, const char
int status;
if (!map->lookup) {
- lookup = open_lookup(map->type, "",
- map->format, map->argc, map->argv);
- if (!lookup) {
+ status = open_lookup(map->type, "",
+ map->format, map->argc, map->argv, &lookup);
+ if (status != NSS_STATUS_SUCCESS) {
debug(ap->logopt,
"lookup module %s failed", map->type);
- return NSS_STATUS_UNAVAIL;
+ return status;
}
map->lookup = lookup;
}
diff --git a/daemon/module.c b/daemon/module.c
index 466d8d7..9028aaa 100644
--- a/daemon/module.c
+++ b/daemon/module.c
@@ -17,6 +17,7 @@
#include <string.h>
#include <stdlib.h>
#include "automount.h"
+#include "nsswitch.h"
int load_autofs4_module(void)
{
@@ -53,8 +54,8 @@ int load_autofs4_module(void)
return 1;
}
-struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
- const char *mapfmt, int argc, const char *const *argv)
+int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
+ int argc, const char *const *argv, struct lookup_mod **lookup)
{
struct lookup_mod *mod;
char buf[MAX_ERR_BUF];
@@ -63,6 +64,7 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
void *dh;
int *ver;
+ *lookup = NULL;
mod = malloc(sizeof(struct lookup_mod));
if (!mod) {
@@ -70,7 +72,7 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr("%s%s", err_prefix, estr);
}
- return NULL;
+ return NSS_STATUS_UNAVAIL;
}
size = snprintf(fnbuf, sizeof(fnbuf),
@@ -81,7 +83,7 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
logerr("%s%s", err_prefix, estr);
}
- return NULL;
+ return NSS_STATUS_UNAVAIL;
}
if (!(dh = dlopen(fnbuf, RTLD_NOW))) {
@@ -89,7 +91,7 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
logerr("%scannot open lookup module %s (%s)",
err_prefix, name, dlerror());
free(mod);
- return NULL;
+ return NSS_STATUS_UNAVAIL;
}
if (!(ver = (int *) dlsym(dh, "lookup_version"))
@@ -99,7 +101,7 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
err_prefix, name);
dlclose(dh);
free(mod);
- return NULL;
+ return NSS_STATUS_UNAVAIL;
}
if (!(mod->lookup_init = (lookup_init_t) dlsym(dh, "lookup_init")) ||
@@ -111,16 +113,18 @@ struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
logerr("%slookup module %s corrupt", err_prefix, name);
dlclose(dh);
free(mod);
- return NULL;
+ return NSS_STATUS_UNAVAIL;
}
if (mod->lookup_init(mapfmt, argc, argv, &mod->context)) {
dlclose(dh);
free(mod);
- return NULL;
+ return NSS_STATUS_NOTFOUND;
}
mod->dlhandle = dh;
- return mod;
+ *lookup = mod;
+
+ return NSS_STATUS_SUCCESS;
}
int close_lookup(struct lookup_mod *mod)
diff --git a/include/automount.h b/include/automount.h
index 447aba1..d614c10 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -302,8 +302,8 @@ struct lookup_mod {
void *context;
};
-struct lookup_mod *open_lookup(const char *name, const char *err_prefix,
- const char *mapfmt, int argc, const char *const *argv);
+int open_lookup(const char *name, const char *err_prefix, const char *mapfmt,
+ int argc, const char *const *argv, struct lookup_mod **lookup);
int close_lookup(struct lookup_mod *);
/* parse module */
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index ffb236c..55035e4 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -50,8 +50,10 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
if (!argv || !argv[0])
return NULL;
- if (*argv[0] == '/')
- return open_lookup("file", MODPREFIX, format, argc, argv);
+ if (*argv[0] == '/') {
+ open_lookup("file", MODPREFIX, format, argc, argv, &mod);
+ return mod;
+ }
if (!strncmp(argv[0], "file", 4) ||
!strncmp(argv[0], "yp", 2) ||
@@ -65,7 +67,8 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
fmt++;
else
fmt = format;
- return open_lookup(argv[0], MODPREFIX, fmt, argc -1, argv + 1);
+ open_lookup(argv[0], MODPREFIX, fmt, argc - 1, argv + 1, &mod);
+ return mod;
}
INIT_LIST_HEAD(&nsslist);
@@ -80,6 +83,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
head = &nsslist;
list_for_each(p, head) {
struct nss_source *this;
+ int status;
this = list_entry(p, struct nss_source, list);
@@ -113,8 +117,9 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
save_argv0 = (char *) argv[0];
argv[0] = path;
- mod = open_lookup(type, MODPREFIX, format, argc, argv);
- if (mod) {
+ status = open_lookup(type, MODPREFIX,
+ format, argc, argv, &mod);
+ if (status == NSS_STATUS_SUCCESS) {
free_sources(&nsslist);
free(save_argv0);
return mod;
@@ -124,8 +129,9 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
free(path);
}
- mod = open_lookup(this->source, MODPREFIX, format, argc, argv);
- if (mod) {
+ status = open_lookup(this->source, MODPREFIX,
+ format, argc, argv, &mod);
+ if (status == NSS_STATUS_SUCCESS) {
free_sources(&nsslist);
return mod;
}
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
index 899be40..2e3d21f 100644
--- a/modules/parse_amd.c
+++ b/modules/parse_amd.c
@@ -31,6 +31,7 @@
#define MODULE_PARSE
#include "automount.h"
+#include "nsswitch.h"
#define MODPREFIX "parse(amd): "
@@ -1129,6 +1130,7 @@ static int do_host_mount(struct autofs_point *ap, const char *name,
struct mapent *me;
const char *argv[2];
const char **pargv = NULL;
+ int status;
int argc = 0;
int ret = 1;
@@ -1170,8 +1172,8 @@ static int do_host_mount(struct autofs_point *ap, const char *name,
}
instance_mutex_lock();
- lookup = open_lookup("hosts", MODPREFIX, NULL, argc, pargv);
- if (!lookup) {
+ status = open_lookup("hosts", MODPREFIX, NULL, argc, pargv, &lookup);
+ if (status != NSS_STATUS_SUCCESS) {
debug(ap->logopt, "open lookup module hosts failed");
instance_mutex_unlock();
goto out;

138
autofs-5.1.1-move-check_nss_result-to-nsswitch_c.patch
View File

@ -1,138 +0,0 @@
autofs-5.1.1 - move check_nss_result() to nsswitchr.c
From: Ian Kent <raven@themaw.net>
The check_nss_result() function will be needed by the multi-map lookup
module so move it to the nss library module.
Signed-off-by: Ian Kent <raven@themaw.net>
---
daemon/lookup.c | 45 ---------------------------------------------
include/nsswitch.h | 1 +
lib/nsswitch.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 62071df..53455a1 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -25,51 +25,6 @@
#include "automount.h"
#include "nsswitch.h"
-static int check_nss_result(struct nss_source *this, enum nsswitch_status result)
-{
- enum nsswitch_status status;
- struct nss_action a;
-
- /* Check if we have negated actions */
- for (status = 0; status < NSS_STATUS_MAX; status++) {
- a = this->action[status];
- if (a.action == NSS_ACTION_UNKNOWN)
- continue;
-
- if (a.negated && result != status) {
- if (a.action == NSS_ACTION_RETURN) {
- if (result == NSS_STATUS_SUCCESS)
- return 1;
- else
- return 0;
- }
- }
- }
-
- a = this->action[result];
-
- /* Check if we have other actions for this status */
- switch (result) {
- case NSS_STATUS_SUCCESS:
- if (a.action == NSS_ACTION_CONTINUE)
- break;
- return 1;
-
- case NSS_STATUS_NOTFOUND:
- case NSS_STATUS_UNAVAIL:
- case NSS_STATUS_TRYAGAIN:
- if (a.action == NSS_ACTION_RETURN) {
- return 0;
- }
- break;
-
- default:
- break;
- }
-
- return -1;
-}
-
static void nsslist_cleanup(void *arg)
{
struct list_head *nsslist = (struct list_head *) arg;
diff --git a/include/nsswitch.h b/include/nsswitch.h
index 2b445a9..d3e4027 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -56,6 +56,7 @@ struct nss_source {
};
int set_action(struct nss_action *a, char *status, char *action, int negated);
+int check_nss_result(struct nss_source *this, enum nsswitch_status result);
struct nss_source *add_source(struct list_head *head, char *source);
int free_sources(struct list_head *list);
diff --git a/lib/nsswitch.c b/lib/nsswitch.c
index c6163a7..74c7525 100644
--- a/lib/nsswitch.c
+++ b/lib/nsswitch.c
@@ -55,6 +55,51 @@ int set_action(struct nss_action *act, char *status, char *action, int negated)
return 1;
}
+int check_nss_result(struct nss_source *this, enum nsswitch_status result)
+{
+ enum nsswitch_status status;
+ struct nss_action a;
+
+ /* Check if we have negated actions */
+ for (status = 0; status < NSS_STATUS_MAX; status++) {
+ a = this->action[status];
+ if (a.action == NSS_ACTION_UNKNOWN)
+ continue;
+
+ if (a.negated && result != status) {
+ if (a.action == NSS_ACTION_RETURN) {
+ if (result == NSS_STATUS_SUCCESS)
+ return 1;
+ else
+ return 0;
+ }
+ }
+ }
+
+ a = this->action[result];
+
+ /* Check if we have other actions for this status */
+ switch (result) {
+ case NSS_STATUS_SUCCESS:
+ if (a.action == NSS_ACTION_CONTINUE)
+ break;
+ return 1;
+
+ case NSS_STATUS_NOTFOUND:
+ case NSS_STATUS_UNAVAIL:
+ case NSS_STATUS_TRYAGAIN:
+ if (a.action == NSS_ACTION_RETURN) {
+ return 0;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return -1;
+}
+
struct nss_source *add_source(struct list_head *head, char *source)
{
struct nss_source *s;

160
autofs-5.1.1-move-query-dn-calculation-from-do_bind-to-do_connect.patch
View File

@ -1,160 +0,0 @@
autofs-5.1.1 - move query dn calculation from do_bind() to do_connect()
From: Ian Kent <raven@themaw.net>
In the ldap lookup module the do_reconnect() call doesn't distinguish
between no entry found and service unavailable.
If service unavailable gets returned from a master map read it results
in autofs not updating the mounts. A notfound return doesn't because it
indicates the map doesn't exist so updating the mounts isn't a problem
as it can be when the source is unavailable.
Start the update of do_reconnect() by moving the query dn calculation
from do_bind() to do_connect().
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 81 ++++++++++++++++++++++++++++++-------------------
2 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ee078bb..0be1bf2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- revert fix libtirpc name clash.
- fix left mount count return from umount_multi_triggers().
- fix return handling in sss lookup module.
+- move query dn calculation from do_bind() to do_connect().
21/04/2015 autofs-5.1.1
=======================
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 5da613e..ea63736 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -574,7 +574,7 @@ static int find_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctx
static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_context *ctxt)
{
char *host = NULL, *nhost;
- int rv, need_base = 1;
+ int rv;
#ifdef WITH_SASL
debug(logopt, MODPREFIX "auth_required: %d, sasl_mech %s",
@@ -610,6 +610,7 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
}
ldap_memfree(host);
+ uris_mutex_lock(ctxt);
if (!ctxt->cur_host) {
ctxt->cur_host = nhost;
if (!(ctxt->format & MAP_FLAG_FORMAT_AMD)) {
@@ -618,43 +619,21 @@ static int do_bind(unsigned logopt, LDAP *ldap, const char *uri, struct lookup_c
}
} else {
/* If connection host has changed update */
- if (strcmp(ctxt->cur_host, nhost)) {
+ if (!strcmp(ctxt->cur_host, nhost))
+ free(nhost);
+ else {
free(ctxt->cur_host);
ctxt->cur_host = nhost;
- } else {
- free(nhost);
- need_base = 0;
- }
- }
-
- if (ctxt->schema && ctxt->qdn && !need_base)
- return 1;
-
- /*
- * If the schema isn't defined in the configuration then check for
- * presence of a map dn with a the common schema. Then calculate the
- * base dn for searches.
- */
- if (!ctxt->schema) {
- if (!find_query_dn(logopt, ldap, ctxt)) {
- warn(logopt,
- MODPREFIX "failed to find valid query dn");
- return 0;
- }
- } else if (!(ctxt->format & MAP_FLAG_FORMAT_AMD)) {
- const char *class = ctxt->schema->map_class;
- const char *key = ctxt->schema->map_attr;
- if (!get_query_dn(logopt, ldap, ctxt, class, key)) {
- error(logopt, MODPREFIX "failed to get query dn");
- return 0;
}
}
+ uris_mutex_unlock(ctxt);
return 1;
}
static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context *ctxt)
{
+ char *cur_host = NULL;
LDAP *ldap;
#ifdef WITH_SASL
@@ -665,13 +644,53 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
#endif
ldap = init_ldap_connection(logopt, uri, ctxt);
- if (ldap) {
- if (!do_bind(logopt, ldap, uri, ctxt)) {
+ if (!ldap)
+ goto out;
+
+ uris_mutex_lock(ctxt);
+ if (ctxt->cur_host)
+ cur_host = ctxt->cur_host;
+ uris_mutex_unlock(ctxt);
+
+ if (!do_bind(logopt, ldap, uri, ctxt)) {
+ unbind_ldap_connection(logopt, ldap, ctxt);
+ ldap = NULL;
+ goto out;
+ }
+
+ /* If the lookup schema and the query dn are set and the
+ * ldap host hasn't changed return.
+ */
+ uris_mutex_lock(ctxt);
+ if (ctxt->schema && ctxt->qdn && (cur_host == ctxt->cur_host)) {
+ uris_mutex_unlock(ctxt);
+ return ldap;
+ }
+ uris_mutex_unlock(ctxt);
+
+ /*
+ * If the schema isn't defined in the configuration then check for
+ * presence of a map dn with a the common schema. Then calculate the
+ * base dn for searches.
+ */
+ if (!ctxt->schema) {
+ if (!find_query_dn(logopt, ldap, ctxt)) {
+ unbind_ldap_connection(logopt, ldap, ctxt);
+ ldap = NULL;
+ warn(logopt,
+ MODPREFIX "failed to find valid query dn");
+ goto out;
+ }
+ } else if (!(ctxt->format & MAP_FLAG_FORMAT_AMD)) {
+ const char *class = ctxt->schema->map_class;
+ const char *key = ctxt->schema->map_attr;
+ if (!get_query_dn(logopt, ldap, ctxt, class, key)) {
unbind_ldap_connection(logopt, ldap, ctxt);
ldap = NULL;
+ error(logopt, MODPREFIX "failed to get query dn");
}
}
-
+out:
return ldap;
}

57
autofs-5.1.1-remove-unused-function-elapsed.patch
View File

@ -1,57 +0,0 @@
autofs-5.1.1 - remove unused function elapsed()
From: Ian Kent <raven@themaw.net>
Now that the monotonic clock source is used the elapsed() function
is no longer used, remove it.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
include/rpc_subs.h | 1 -
lib/rpc_subs.c | 8 --------
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4f589db..4acb332 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@
- use monotonic clock for indirect mount condition.
- change remaining gettimeofday() to use clock_gettime().
- change time() to use monotonic_clock().
+- remove unused function elapsed().
21/04/2015 autofs-5.1.1
=======================
diff --git a/include/rpc_subs.h b/include/rpc_subs.h
index e329224..e744e89 100644
--- a/include/rpc_subs.h
+++ b/include/rpc_subs.h
@@ -70,7 +70,6 @@ int rpc_portmap_getclient(struct conn_info *, const char *, struct sockaddr *, s
int rpc_portmap_getport(struct conn_info *, struct pmap *, unsigned short *);
int rpc_ping_proto(struct conn_info *);
int rpc_ping(const char *, long, long, unsigned int);
-double elapsed(struct timeval, struct timeval);
double monotonic_elapsed(struct timespec, struct timespec);
int rpc_time(const char *, unsigned int, unsigned int, long, long, unsigned int, double *);
const char *get_addr_string(struct sockaddr *, char *, socklen_t);
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 4a84c16..8995996 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -1067,14 +1067,6 @@ int rpc_ping(const char *host, long seconds, long micros, unsigned int option)
return status;
}
-double elapsed(struct timeval start, struct timeval end)
-{
- double t1, t2;
- t1 = (double)start.tv_sec + (double)start.tv_usec/(1000*1000);
- t2 = (double)end.tv_sec + (double)end.tv_usec/(1000*1000);
- return t2-t1;
-}
-
double monotonic_elapsed(struct timespec start, struct timespec end)
{
double t1, t2;

52
autofs-5.1.1-revert-fix-libtirpc-name-clash.patch
View File

@ -1,52 +0,0 @@
autofs-5.1.1 - revert fix libtirpc name clash
From: Ian Kent <ikent@redhat.com>
Commit 09d4edb2 introduced a substitution maro for the tirpc macro
auth_destroy() because it contained an unconditional call to a function
log_debug() which clashed with an autofs function of the same name.
AFAICS that was never in a actual libtirpc release, the call in a release
was auth_log_debug() which doesn't clash with any autofs functions.
So revert this change.
Signed-off-by: Ian Kent <ikent@redhat.com>
---
CHANGELOG | 1 +
lib/rpc_subs.c | 10 ----------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 688d485..3a9266d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
??/??/2015 autofs-5.1.2
=======================
- update libtirpc workaround for new soname.
+- revert fix libtirpc name clash.
21/04/2015 autofs-5.1.1
=======================
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 84fae9e..68d68f4 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -34,16 +34,6 @@
#include <poll.h>
#ifdef WITH_LIBTIRPC
-#undef auth_destroy
-#define auth_destroy(auth) \
- do { \
- int refs; \
- if ((refs = auth_put((auth))) == 0) \
- ((*((auth)->ah_ops->ah_destroy))(auth));\
- } while (0)
-#endif
-
-#ifdef WITH_LIBTIRPC
const rpcprog_t rpcb_prog = RPCBPROG;
const rpcvers_t rpcb_version = RPCBVERS;
#else

36
autofs-5.1.1-update-libtirpc-workaround-for-new-soname.patch
View File

@ -1,36 +0,0 @@
autofs-5.1.1 - update libtirpc workaround for new soname
From: Ian Kent <ikent@redhat.com>
When pre-opening the libtirpc shared library also check for revision
3 of the library.
---
CHANGELOG | 4 ++++
daemon/automount.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index dbfbe48..688d485 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+??/??/2015 autofs-5.1.2
+=======================
+- update libtirpc workaround for new soname.
+
21/04/2015 autofs-5.1.1
=======================
- fix compile error in defaults.c.
diff --git a/daemon/automount.c b/daemon/automount.c
index 229cb1a..c81b4af 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -2393,6 +2393,8 @@ int main(int argc, char *argv[])
void *dh_tirpc = dlopen("libtirpc.so", RTLD_NOW);
if (!dh_tirpc)
dh_tirpc = dlopen("libtirpc.so.1", RTLD_NOW);
+ if (!dh_tirpc)
+ dh_tirpc = dlopen("libtirpc.so.3", RTLD_NOW);
#endif
if (!master_read_master(master_list, age, 0)) {

108
autofs-5.1.1-update-map_hash_table_size-description.patch
View File

@ -1,108 +0,0 @@
autofs-5.1.1 - update map_hash_table_size description
From: Ian Kent <raven@themaw.net>
The configuration parameter map_hash_table_size has been ommitted
from the autofs.conf(5) man page and it's description in the
configuration file comments is poor.
Add a description of the parameter to autofs.conf(5) and update
the configuration file comments to direct people to the map page
for more information.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
man/autofs.conf.5.in | 31 +++++++++++++++++++++++++++++++
redhat/autofs.conf.default.in | 6 ++++--
samples/autofs.conf.default.in | 6 ++++--
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 16e5344..2b8d224 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
- fix missing source sss in multi map lookup.
- fix update_hosts_mounts() return.
- change lookup to use reinit instead of reopen.
+- update map_hash_table_size description.
21/04/2015 autofs-5.1.1
=======================
diff --git a/man/autofs.conf.5.in b/man/autofs.conf.5.in
index 7d66878..4434eb8 100644
--- a/man/autofs.conf.5.in
+++ b/man/autofs.conf.5.in
@@ -80,6 +80,37 @@ user setting these standard environment variables opens automount(8) to
potential user privilege escalation when the program map is written in a
language that can load components from, for example, a user home directory
(program default "no").
+.TP
+.B map_hash_table_size
+.br
+This configuration option may be used to change the number of hash
+table slots (default 1024).
+
+This configuration option affects the overhead of searching the map
+entry cache for map entries when there are a large number of entries.
+It affects the number of entries that must be looked at to locate a
+map entry in the map entry cache. For example, the default of 1024
+and a direct map with 8000 entries would result in each slot
+containing an average of 8 entries, which should be acceptable.
+
+However, if excessive CPU usage is observed during automount lookups
+increasing this option can reduce the CPU overhead considerably becuase
+it reduces the length of the search chains.
+
+Note that the number of entries in a map doesn't necessarily relate
+to the number of entries used in the map entry cache.
+
+There are three distinct cases, direct maps and indirect maps that
+use the "browse" option must be read in their entirity at program
+start so, in these two cases the map size does retate directly to
+the map entry cache size.
+
+For indirect maps that do not use the "browse" option entries are
+added to the map entry cache at lookup so the number of active cache
+entries, in this case, is usually much less than the number of entries
+in the map. In this last case it would be unusual for the map entry
+cache to grow large enough to warrant increasing the default before
+an event that cleans stale entries, a map re-read for example.
.SS LDAP Configuration
.P
Configuration settings available are:
diff --git a/redhat/autofs.conf.default.in b/redhat/autofs.conf.default.in
index 13bbb7e..da0882f 100644
--- a/redhat/autofs.conf.default.in
+++ b/redhat/autofs.conf.default.in
@@ -135,8 +135,10 @@ mount_nfs_default_protocol = 4
#auth_conf_file = @@autofsmapdir@@/autofs_ldap_auth.conf
#
# map_hash_table_size - set the map cache hash table size.
-# Should be a power of 2 with a ratio roughly
-# between 1:10 and 1:20 for each map.
+# Should be a power of 2 with a ratio of
+# close to 1:8 for acceptable performance
+# with maps up to around 8000 entries.
+# See autofs.conf(5) for more details.
#
#map_hash_table_size = 1024
#
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 441b68e..80abb43 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -134,8 +134,10 @@ browse_mode = no
#auth_conf_file = @@autofsmapdir@@/autofs_ldap_auth.conf
#
# map_hash_table_size - set the map cache hash table size.
-# Should be a power of 2 with a ratio roughly
-# between 1:10 and 1:20 for each map.
+# Should be a power of 2 with a ratio of
+# close to 1:8 for acceptable performance
+# with maps up to around 8000 entries.
+# See autofs.conf(5) for more details.
#
#map_hash_table_size = 1024
#

Some files were not shown because too many files have changed in this diff Show More