|
 |
304803 |
autofs-5.1.0-beta1 - fix ldap_uri config update
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
Fix some errors in ldap get uris and get search dns.
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
lib/defaults.c | 11 +++++------
|
|
|
304803 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
304803 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
304803 |
@@ -118,6 +118,7 @@
|
|
|
304803 |
- fix xfn sets incorrect lexer state.
|
|
|
304803 |
- fix old style key lookup.
|
|
|
304803 |
- fix expire when server not responding.
|
|
|
304803 |
+- fix ldap_uri config update.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
--- autofs-5.0.7.orig/lib/defaults.c
|
|
|
304803 |
+++ autofs-5.0.7/lib/defaults.c
|
|
|
304803 |
@@ -1100,19 +1100,18 @@ struct list_head *defaults_get_uris(void
|
|
|
304803 |
struct list_head *list;
|
|
|
304803 |
|
|
|
304803 |
list = malloc(sizeof(struct list_head));
|
|
|
304803 |
- if (!list) {
|
|
|
304803 |
+ if (!list)
|
|
|
304803 |
return NULL;
|
|
|
304803 |
- }
|
|
|
304803 |
INIT_LIST_HEAD(list);
|
|
|
304803 |
|
|
|
304803 |
- if (defaults_read_config(0)) {
|
|
|
304803 |
+ if (!defaults_read_config(0)) {
|
|
|
304803 |
free(list);
|
|
|
304803 |
return NULL;
|
|
|
304803 |
}
|
|
|
304803 |
|
|
|
304803 |
pthread_mutex_lock(&conf_mutex);
|
|
|
304803 |
co = conf_lookup(autofs_gbl_sec, NAME_LDAP_URI);
|
|
|
304803 |
- if (!co || !co->value) {
|
|
|
304803 |
+ if (!co) {
|
|
|
304803 |
pthread_mutex_unlock(&conf_mutex);
|
|
|
304803 |
free(list);
|
|
|
304803 |
return NULL;
|
|
|
304803 |
@@ -1233,12 +1232,12 @@ struct ldap_searchdn *defaults_get_searc
|
|
|
304803 |
struct conf_option *co;
|
|
|
304803 |
struct ldap_searchdn *sdn, *last;
|
|
|
304803 |
|
|
|
304803 |
- if (defaults_read_config(0))
|
|
|
304803 |
+ if (!defaults_read_config(0))
|
|
|
304803 |
return NULL;
|
|
|
304803 |
|
|
|
304803 |
pthread_mutex_lock(&conf_mutex);
|
|
|
304803 |
co = conf_lookup(autofs_gbl_sec, NAME_SEARCH_BASE);
|
|
|
304803 |
- if (!co || !co->value) {
|
|
|
304803 |
+ if (!co) {
|
|
|
304803 |
pthread_mutex_unlock(&conf_mutex);
|
|
|
304803 |
return NULL;
|
|
|
304803 |
}
|