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.
108 lines
3.4 KiB
108 lines
3.4 KiB
commit f139de79d91e7773b5b98fe5aca5570f77c7aee9 |
|
Author: Christian Seiler <christian@iwakd.de> |
|
Date: Wed Aug 13 12:42:14 2014 -0400 |
|
|
|
libnfsidmap: respect Nobody-User/Nobody-Group |
|
|
|
Previous behavior of libnfsidmap was to do a name lookup of |
|
nobody@DEFAULTDOMAIN (for both user and group), which does not match |
|
the behavior of rpc.idmapd. |
|
|
|
This patch makes libnfsidmap respect Nobody-User/Nobody-Group for |
|
lookups, thus making the nfsidmap utility properly handle the case if |
|
nobody@DEFAULTDOMAIN does not directly map to any user/group on the |
|
system. |
|
|
|
Signed-off-by: Christian Seiler <christian@iwakd.de> |
|
Signed-off-by: Steve Dickson <steved@redhat.com> |
|
|
|
diff --git a/libnfsidmap.c b/libnfsidmap.c |
|
index 92bc493..ec5c141 100644 |
|
--- a/libnfsidmap.c |
|
+++ b/libnfsidmap.c |
|
@@ -62,6 +62,8 @@ static struct conf_list *local_realms; |
|
int idmap_verbosity = 0; |
|
static struct mapping_plugin **nfs4_plugins = NULL; |
|
static struct mapping_plugin **gss_plugins = NULL; |
|
+uid_t nobody_uid = (uid_t)-1; |
|
+gid_t nobody_gid = (gid_t)-1; |
|
|
|
#ifndef PATH_PLUGINS |
|
#define PATH_PLUGINS "/usr/lib/libnfsidmap" |
|
@@ -228,6 +230,7 @@ int nfs4_init_name_mapping(char *conffile) |
|
int ret = -ENOENT; |
|
int dflt = 0; |
|
struct conf_list *nfs4_methods, *gss_methods; |
|
+ char *nobody_user, *nobody_group; |
|
|
|
/* XXX: need to be able to reload configurations... */ |
|
if (nfs4_plugins) /* already succesfully initialized */ |
|
@@ -324,6 +327,49 @@ int nfs4_init_name_mapping(char *conffile) |
|
if (load_plugins(gss_methods, &gss_plugins) == -1) |
|
goto out; |
|
} |
|
+ |
|
+ nobody_user = conf_get_str("Mapping", "Nobody-User"); |
|
+ if (nobody_user) { |
|
+ size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); |
|
+ struct passwd *buf; |
|
+ struct passwd *pw = NULL; |
|
+ int err; |
|
+ |
|
+ buf = malloc(sizeof(*buf) + buflen); |
|
+ if (buf) { |
|
+ err = getpwnam_r(nobody_user, buf, ((char *)buf) + sizeof(*buf), buflen, &pw); |
|
+ if (err == 0 && pw != NULL) |
|
+ nobody_uid = pw->pw_uid; |
|
+ else |
|
+ IDMAP_LOG(1, ("libnfsidmap: Nobody-User (%s) not found: %s\n", |
|
+ nobody_user, strerror(errno))); |
|
+ free(buf); |
|
+ } else |
|
+ IDMAP_LOG(0,("libnfsidmap: Nobody-User: no memory : %s\n", |
|
+ nobody_user, strerror(errno))); |
|
+ } |
|
+ |
|
+ nobody_group = conf_get_str("Mapping", "Nobody-Group"); |
|
+ if (nobody_group) { |
|
+ size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); |
|
+ struct group *buf; |
|
+ struct group *gr = NULL; |
|
+ int err; |
|
+ |
|
+ buf = malloc(sizeof(*buf) + buflen); |
|
+ if (buf) { |
|
+ err = getgrnam_r(nobody_group, buf, ((char *)buf) + sizeof(*buf), buflen, &gr); |
|
+ if (err == 0 && gr != NULL) |
|
+ nobody_gid = gr->gr_gid; |
|
+ else |
|
+ IDMAP_LOG(1, ("libnfsidmap: Nobody-Group (%s) not found: %s\n", |
|
+ nobody_group, strerror(errno))); |
|
+ free(buf); |
|
+ } else |
|
+ IDMAP_LOG(0,("libnfsidmap: Nobody-Group: no memory : %s\n", |
|
+ nobody_group, strerror(errno))); |
|
+ } |
|
+ |
|
ret = 0; |
|
out: |
|
if (ret) { |
|
@@ -453,6 +499,18 @@ static int set_id_to_nobody(int *id, int is_uid) |
|
int rc = 0; |
|
const char name[] = "nobody@"; |
|
char nobody[strlen(name) + strlen(get_default_domain()) + 1]; |
|
+ |
|
+ /* First try to see whether a Nobody-User/Nobody-Group was |
|
+ * configured, before we try to do a full lookup for the |
|
+ * NFS nobody user. */ |
|
+ if (is_uid && nobody_uid != (uid_t)-1) { |
|
+ *id = (int)nobody_uid; |
|
+ return 0; |
|
+ } else if (!is_uid && nobody_gid != (gid_t)-1) { |
|
+ *id = (int)nobody_gid; |
|
+ return 0; |
|
+ } |
|
+ |
|
strcpy(nobody, name); |
|
strcat(nobody, get_default_domain()); |
|
|
|
|