From e5221d288e41d29d89d52f8deab657d2285a852c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 26 Jun 2016 18:50:27 +0200 Subject: nfs: allow hostnames with dashes in exports/netgroups files Hostnames with dashes (like "vagrant-testVM") are not correctly parsed when reading the exports/netgroups files. This bacomes obvious when running ./run-tests-in-vagrant.sh because it causes tests/basic/mount-nfs-auth.t and tests/basic/netgroup_parsing.t to fail. The regex for hostname (in exports) and the entry and hostname (netgroups) parsing does not include the "-" sign, and hence the hostnames are splitted at it. BUG: 1350237 Change-Id: I38146a283561e1fa386cc841c43fd3b1e30a87ad Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/14809 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- xlators/nfs/server/src/mount3.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'xlators/nfs/server/src/mount3.c') diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 580f92af4b7..2647e384a94 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -1993,6 +1993,10 @@ _mnt3_authenticate_req (struct mount3_state *ms, rpcsvc_request_t *req, /* Check if the IP is authorized */ auth_status_code = mnt3_auth_host (ms->auth_params, host_addr_ip, fh, pathdup, is_write_op, &expitem); + + gf_msg_debug (GF_MNT, 0, "access from IP %s is %s", host_addr_ip, + auth_status_code ? "denied" : "allowed"); + if (auth_status_code != 0) { /* If not, check if the FQDN is authorized */ host_addr_fqdn = gf_rev_dns_lookup (host_addr_ip); @@ -2000,6 +2004,11 @@ _mnt3_authenticate_req (struct mount3_state *ms, rpcsvc_request_t *req, host_addr_fqdn, fh, pathdup, is_write_op, &expitem); + + gf_msg_debug (GF_MNT, 0, "access from FQDN %s is %s", + host_addr_fqdn, auth_status_code ? "denied" : + "allowed"); + if (auth_status_code == 0) auth_host = host_addr_fqdn; } else -- cgit