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