When a uid or gid does not map into the a domain and the
new 'NumericIDs' variable is enabled in idmapd.conf, the server
will send out numeric representations, strings without the
@domain part, of the given id.
Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
---
utils/idmapd/idmapd.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index d6799c9..7f1291d 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -794,15 +794,22 @@ nfsopen(struct idmap_client *ic)
static void
idtonameres(struct idmap_msg *im)
{
- char domain[NFS4_MAX_DOMAIN_LEN];
+ char domain[NFS4_MAX_DOMAIN_LEN], *numids;
int ret = 0;
ret = nfs4_get_default_domain(NULL, domain, sizeof(domain));
+ numids = conf_get_str("Mapping", "NumericIDs");
+
switch (im->im_type) {
case IDMAP_TYPE_USER:
ret = nfs4_uid_to_name(im->im_id, domain, im->im_name,
sizeof(im->im_name));
if (ret) {
+ if (numids && strcasecmp(numids, "yes") == 0) {
+ sprintf(im->im_name, "%d", im->im_id);
+ ret=0;
+ break;
+ }
if (strlen(nobodyuser) < sizeof(im->im_name))
strcpy(im->im_name, nobodyuser);
else
@@ -813,6 +820,11 @@ idtonameres(struct idmap_msg *im)
ret = nfs4_gid_to_name(im->im_id, domain, im->im_name,
sizeof(im->im_name));
if (ret) {
+ if (numids && strcasecmp(numids, "yes") == 0) {
+ sprintf(im->im_name, "%d", im->im_id);
+ ret=0;
+ break;
+ }
if (strlen(nobodygroup) < sizeof(im->im_name))
strcpy(im->im_name, nobodygroup);
else
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
