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