You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
3.5 KiB
111 lines
3.5 KiB
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(-) |
|
|
|
--- autofs-5.0.7.orig/CHANGELOG |
|
+++ autofs-5.0.7/CHANGELOG |
|
@@ -174,6 +174,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. |
|
|
|
25/07/2012 autofs-5.0.7 |
|
======================= |
|
--- autofs-5.0.7.orig/modules/lookup_ldap.c |
|
+++ autofs-5.0.7/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 log |
|
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 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 |
|
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 logop |
|
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 logop |
|
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)
|
|
|