|
 |
304803 |
autofs-5.1.3 - be silent about nis domain not set
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
When initializing the lookup module for NIS or NISPLUS if the domain
|
|
|
304803 |
is found to be not set then the service is not configured.
|
|
|
304803 |
|
|
|
304803 |
So be silent about the failure.
|
|
|
304803 |
|
|
|
304803 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
modules/lookup_nisplus.c | 1 -
|
|
|
304803 |
modules/lookup_yp.c | 2 --
|
|
|
304803 |
3 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
304803 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
304803 |
@@ -261,6 +261,7 @@
|
|
|
304803 |
- fix nisplus lookup init not configured check.
|
|
|
304803 |
- make open_lookup() error handling more consistent.
|
|
|
304803 |
- be silent about sss library not found.
|
|
|
304803 |
+- be silent about nis domain not set.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
--- autofs-5.0.7.orig/modules/lookup_nisplus.c
|
|
|
304803 |
+++ autofs-5.0.7/modules/lookup_nisplus.c
|
|
|
304803 |
@@ -49,7 +49,6 @@ static int do_init(const char *mapfmt,
|
|
|
304803 |
*/
|
|
|
304803 |
ctxt->domainname = nis_local_directory();
|
|
|
304803 |
if (!ctxt->domainname || !strcmp(ctxt->domainname, "(none).")) {
|
|
|
304803 |
- logmsg(MODPREFIX "NIS+ domain not set");
|
|
|
304803 |
ret = 1;
|
|
|
304803 |
goto out;
|
|
|
304803 |
}
|
|
|
304803 |
--- autofs-5.0.7.orig/modules/lookup_yp.c
|
|
|
304803 |
+++ autofs-5.0.7/modules/lookup_yp.c
|
|
|
304803 |
@@ -127,8 +127,6 @@ static int do_init(const char *mapfmt,
|
|
|
304803 |
/* This should, but doesn't, take a const char ** */
|
|
|
304803 |
err = yp_get_default_domain(&domainname);
|
|
|
304803 |
if (err) {
|
|
|
304803 |
- logerr(MODPREFIX
|
|
|
304803 |
- "map %s: %s", ctxt->mapname, yperr_string(err));
|
|
|
304803 |
ret = 1;
|
|
|
304803 |
goto out;
|
|
|
304803 |
}
|