From 4521520e2640f52ceb74cda8001c0e894d9b155c Mon Sep 17 00:00:00 2001

From: Amar Tumballi <amarts@redhat.com>

Date: Wed, 27 Sep 2017 12:37:59 +0530

Subject: [PATCH 621/622] glusterfsd: allow subdir mount

Changes:

1. Take subdir mount option in client (mount.gluster / glusterfsd)

2. Pass the subdir mount to server-handshake (from client-handshake)

3. Handle subdir-mount dir's lookup in server-first-lookup and handle

   all fops resolution accordingly with proper gfid of subdir

4. Change the auth/addr module to handle the multiple subdir entries

   in option, and valid parsing.

How to use the feature:

`# mount -t glusterfs $hostname:/$volname/$subdir /$mount_point`

Or

`# mount -t glusterfs $hostname:/$volname -osubdir_mount=$subdir /$mount_point`

Option can be set like:

`# gluster volume set <volname> auth.allow "/subdir1(192.168.1.*),/(192.168.10.*),/subdir2(192.168.8.*)"`

> Upstream:

> Reviewed-on: https://review.gluster.org/17141

> Updates #175

> Also includes fixes from: https://review.gluster.org/18184

> Also includes fixes from: https://review.gluster.org/18322

BUG: 1017362

Signed-Off-By: Amar Tumballi <amarts@redhat.com>

Change-Id: Ia722e9190064061bb46da45e467be2253b19c81b

Reviewed-on: https://code.engineering.redhat.com/gerrit/119138

Tested-by: RHGS Build Bot <nigelb@redhat.com>

Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

---

 doc/glusterfs.8                                |   3 +

 doc/mount.glusterfs.8                          |   7 +-

 glusterfsd/src/glusterfsd.c                    |  10 ++

 glusterfsd/src/glusterfsd.h                    |   1 +

 libglusterfs/src/client_t.c                    |  15 +-

 libglusterfs/src/client_t.h                    |   8 +-

 libglusterfs/src/glusterfs.h                   |   3 +

 libglusterfs/src/options.c                     |  62 +++++++-

 tests/features/subdir-mount.t                  |  99 ++++++++++++

 xlators/mount/fuse/utils/mount.glusterfs.in    |  17 ++-

 xlators/protocol/auth/addr/src/addr.c          | 202 ++++++++++++++++++-------

 xlators/protocol/client/src/client-handshake.c |  21 ++-

 xlators/protocol/server/src/server-common.c    |  68 +++++++--

 xlators/protocol/server/src/server-common.h    |   6 +-

 xlators/protocol/server/src/server-handshake.c | 180 +++++++++++++++-------

 xlators/protocol/server/src/server-helpers.c   |  10 +-

 xlators/protocol/server/src/server-rpc-fops.c  | 107 ++++++++-----

 xlators/protocol/server/src/server.c           |   1 +

 xlators/protocol/server/src/server.h           |   3 +

 19 files changed, 650 insertions(+), 173 deletions(-)

 create mode 100644 tests/features/subdir-mount.t

diff --git a/doc/glusterfs.8 b/doc/glusterfs.8

index fc28ef6..6f180b1 100644

--- a/doc/glusterfs.8

+++ b/doc/glusterfs.8

@@ -98,6 +98,9 @@ Mount the filesystem in 'worm' mode.

 .TP

 \fB\-\-xlator\-option=VOLUME\-NAME.OPTION=VALUE\fR

 Add/Override a translator option for a volume with the specified value.

+.TP

+\fB\-\-subdir\-mount=SUBDIR\-MOUNT\-PATH\fR

+Mount subdirectory instead of the '/' of volume.

 .SS "Fuse options"

 .PP

diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8

index 4e82c2f..e16bbec 100644

--- a/doc/mount.glusterfs.8

+++ b/doc/mount.glusterfs.8

@@ -12,11 +12,11 @@

 .SH NAME

 .B mount.glusterfs - script to mount native GlusterFS volume

 .SH SYNOPSIS

-.B mount -t glusterfs [-o <options>] <volumeserver>:/<volume>

+.B mount -t glusterfs [-o <options>] <volumeserver>:/<volume>[/<subdir>]

 .B         <mountpoint>

 .TP

 .B mount -t glusterfs [-o <options>] <server1>,<server2>,

-.B        <server3>,..<serverN>:/<volname> <mount_point>

+.B        <server3>,..<serverN>:/<volname>[/<subdir>] <mount_point>

 .TP

 .TP

 .B mount -t glusterfs [-o <options>] <path/to/volumefile> <mountpoint>

@@ -95,6 +95,9 @@ Disable direct I/O mode in fuse kernel module

 \fBcongestion\-threshold=\fRN

 Set fuse module's congestion threshold to N [default: 48]

 .TP

+\fsubdir\-mount=\fRN

+Set the subdirectory mount option [default: NULL, ie, no subdirectory mount]

+.TP

 .TP

 \fBbackup\-volfile\-servers=\fRSERVERLIST

 Provide list of backup volfile servers in the following format [default: None]

diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c

index 110cbb3..8782ba2 100644

--- a/glusterfsd/src/glusterfsd.c

+++ b/glusterfsd/src/glusterfsd.c

@@ -154,6 +154,8 @@ static struct argp_option gf_options[] = {

          "Enable SELinux label (extended attributes) support on inodes"},

         {"capability", ARGP_CAPABILITY_KEY, 0, 0,

          "Enable Capability (extended attributes) support on inodes"},

+        {"subdir-mount", ARGP_SUBDIR_MOUNT_KEY, "SUBDIR-PATH", 0,

+         "Mount subdirectory given [default: NULL]"},

         {"print-netgroups", ARGP_PRINT_NETGROUPS, "NETGROUP-FILE", 0,

          "Validate the netgroups file and print it out"},

@@ -1235,6 +1237,14 @@ parse_opts (int key, char *arg, struct argp_state *state)

                 argp_failure (state, -1, 0,

                               "unknown secure-mgmt setting \"%s\"", arg);

                 break;

+        case ARGP_SUBDIR_MOUNT_KEY:

+                if (arg[0] != '/') {

+                        argp_failure (state, -1, 0,

+                                      "expect '/%s', provided just \"%s\"", arg, arg);

+                        break;

+                }

+                cmd_args->subdir_mount = gf_strdup (arg);

+                break;

 	}

         return 0;

diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h

index 4d697f3..938d422 100644

--- a/glusterfsd/src/glusterfsd.h

+++ b/glusterfsd/src/glusterfsd.h

@@ -98,6 +98,7 @@ enum argp_option_keys {

         ARGP_OOM_SCORE_ADJ_KEY            = 176,

 #endif

 #endif

+        ARGP_SUBDIR_MOUNT_KEY             = 177,

 };

 struct _gfd_vol_top_priv_t {

diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c

index 97cf9f9..f4fdb52 100644

--- a/libglusterfs/src/client_t.c

+++ b/libglusterfs/src/client_t.c

@@ -159,7 +159,8 @@ gf_client_clienttable_destroy (clienttable_t *clienttable)

  * as long as ref.bind is > 0 client should be alive.

  */

 client_t *

-gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid)

+gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid,

+               char *subdir_mount)

 {

         client_t      *client      = NULL;

         cliententry_t *cliententry = NULL;

@@ -204,6 +205,8 @@ gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid)

                 }

                 client->this = this;

+                if (subdir_mount != NULL)

+                        client->subdir_mount = gf_strdup (subdir_mount);

                 LOCK_INIT (&client->scratch_ctx.lock);

@@ -373,6 +376,10 @@ client_destroy (client_t *client)

         list_for_each_entry (gtrav, &client->this->ctx->graphs, list) {

                 gf_client_destroy_recursive (gtrav->top, client);

         }

+        if (client->subdir_inode)

+                inode_unref (client->subdir_inode);

+

+        GF_FREE (client->subdir_mount);

         GF_FREE (client->auth.data);

         GF_FREE (client->scratch_ctx.ctx);

         GF_FREE (client->client_uid);

@@ -776,6 +783,12 @@ gf_client_dump_fdtables (xlator_t *this)

                                                     client->client_uid);

                         }

+                        if (client->subdir_mount) {

+                                gf_proc_dump_build_key (key, "conn",

+                                                        "%d.subdir", count);

+                                gf_proc_dump_write (key, "%s",

+                                                    client->subdir_mount);

+                        }

                         gf_proc_dump_build_key (key, "conn", "%d.ref",

                                                         count);

                         gf_proc_dump_write (key, GF_PRI_ATOMIC,

diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/client_t.h

index 31f1bd0..cd9afa2 100644

--- a/libglusterfs/src/client_t.h

+++ b/libglusterfs/src/client_t.h

@@ -40,6 +40,11 @@ typedef struct _client_t {

                 char                *username;

                 char                *passwd;

         }            auth;

+

+        /* subdir_mount */

+        char    *subdir_mount;

+        inode_t *subdir_inode;

+        uuid_t   subdir_gfid;

 } client_t;

 #define GF_CLIENTCTX_INITIAL_SIZE 8

@@ -72,7 +77,8 @@ typedef struct clienttable clienttable_t;

 struct rpcsvc_auth_data;

 client_t *

-gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid);

+gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred,

+               char *client_uid, char *subdir_mount);

 void

 gf_client_put (client_t *client, gf_boolean_t *detached);

diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h

index c58cae1..d13e5bd 100644

--- a/libglusterfs/src/glusterfs.h

+++ b/libglusterfs/src/glusterfs.h

@@ -400,6 +400,9 @@ struct _cmd_args {

         /* Should management connections use SSL? */

         int             secure_mgmt;

+

+        /* For the subdir mount */

+        char           *subdir_mount;

 };

 typedef struct _cmd_args cmd_args_t;

diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c

index 02928a9..0ad4e53 100644

--- a/libglusterfs/src/options.c

+++ b/libglusterfs/src/options.c

@@ -599,21 +599,70 @@ xlator_option_validate_addr_list (xlator_t *xl, const char *key,

         char         *dup_val = NULL;

         char         *addr_tok = NULL;

         char         *save_ptr = NULL;

+        char         *entry = NULL;

+        char         *entry_ptr = NULL;

+        char         *dir_and_addr = NULL;

+        char         *addr_ptr = NULL;

+        char         *addr_list = NULL;

+        char         *addr = NULL;

+        char         *dir = NULL;

         char         errstr[4096] = {0,};

         dup_val = gf_strdup (value);

         if (!dup_val)

                 goto out;

-        addr_tok = strtok_r (dup_val, ",", &save_ptr);

-        if (addr_tok == NULL)

+        if (dup_val[0] != '/' && !strchr (dup_val, '(')) {

+                /* Possible old format, handle it for back-ward compatibility */

+                addr_tok = strtok_r (dup_val, ",", &save_ptr);

+                while (addr_tok) {

+                        if (!valid_internet_address (addr_tok, _gf_true))

+                                goto out;

+

+                        addr_tok = strtok_r (NULL, ",", &save_ptr);

+                }

+                ret = 0;

                 goto out;

-        while (addr_tok) {

-                if (!valid_internet_address (addr_tok, _gf_true))

+        }

+

+        /* Lets handle the value with new format */

+        entry = strtok_r (dup_val, ",", &entry_ptr);

+        while (entry) {

+                dir_and_addr = gf_strdup (entry);

+                if (!dir_and_addr)

                         goto out;

-                addr_tok = strtok_r (NULL, ",", &save_ptr);

+                dir = strtok_r (dir_and_addr, "(", &addr_ptr);

+                if (dir[0] != '/') {

+                        /* Valid format should be starting from '/' */

+                        goto out;

+                }

+                /* dir = strtok_r (NULL, " =", &addr_tmp); */

+                addr = strtok_r (NULL, ")", &addr_ptr);

+                if (!addr)

+                        goto out;

+

+                addr_list = gf_strdup (addr);

+                if (!addr_list)

+                        goto out;

+

+                /* This format be separated by '|' */

+                addr_tok = strtok_r (addr_list, "|", &save_ptr);

+                if (addr_tok == NULL)

+                        goto out;

+                while (addr_tok) {

+                        if (!valid_internet_address (addr_tok, _gf_true))

+                                goto out;

+

+                        addr_tok = strtok_r (NULL, "|", &save_ptr);

+                }

+                entry = strtok_r (NULL, ",", &entry_ptr);

+                GF_FREE (dir_and_addr);

+                GF_FREE (addr_list);

+                addr_list = NULL;

+                dir_and_addr = NULL;

         }

+

         ret = 0;

 out:

@@ -626,7 +675,8 @@ out:

                         *op_errstr = gf_strdup (errstr);

         }

         GF_FREE (dup_val);

-

+        GF_FREE (dir_and_addr);

+        GF_FREE (addr_list);

         return ret;

 }

diff --git a/tests/features/subdir-mount.t b/tests/features/subdir-mount.t

new file mode 100644

index 0000000..2fb0be4

--- /dev/null

+++ b/tests/features/subdir-mount.t

@@ -0,0 +1,99 @@

+#!/bin/bash

+

+. $(dirname $0)/../include.rc

+. $(dirname $0)/../nfs.rc

+

+cleanup;

+

+## Start and create a volume

+TEST glusterd

+TEST pidof glusterd

+TEST $CLI volume info;

+

+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4};

+

+## Start volume and verify

+TEST $CLI volume start $V0;

+

+## Mount FUSE with caching disabled (read-write)

+TEST $GFS -s $H0 --volfile-id $V0 --volume-name ${V0}-dht $M0;

+

+TEST ! stat $M0/subdir1;

+TEST mkdir $M0/subdir1;

+TEST ! stat $M0/subdir2;

+TEST mkdir $M0/subdir2;

+TEST ! stat $M0/subdir1/subdir1.1;

+TEST mkdir $M0/subdir1/subdir1.1;

+TEST ! stat $M0/subdir1/subdir1.1/subdir1.2;

+TEST mkdir $M0/subdir1/subdir1.1/subdir1.2;

+

+# mount volume/subdir1

+TEST $GFS --subdir-mount /subdir1 -s $H0 --volfile-id $V0 --volume-name ${V0}-dht $M1;

+

+TEST touch $M0/topfile;

+TEST ! stat $M1/topfile;

+

+TEST touch $M1/subdir1_file;

+TEST ! stat $M0/subdir1_file;

+TEST stat $M0/subdir1/subdir1_file;

+

+# mount volume/subdir2

+TEST $GFS --subdir-mount /subdir2 -s $H0 --volfile-id $V0 $M2;

+

+TEST ! stat $M2/topfile;

+

+TEST touch $M2/subdir2_file;

+TEST ! stat $M0/subdir2_file;

+TEST ! stat $M1/subdir2_file;

+TEST stat $M0/subdir2/subdir2_file;

+

+# umount $M1 / $M2

+TEST umount $M1

+TEST umount $M2

+

+# mount non-existing subdir ; this works with mount.glusterfs,

+# but with glusterfs, the script doesn't returns error.

+#TEST ! $GFS --subdir-mount subdir_not_there -s $H0 --volfile-id $V0 $M1;

+

+# mount subdir with depth

+TEST $GFS --subdir-mount /subdir1/subdir1.1/subdir1.2 -s $H0 --volfile-id $V0 $M2;

+TEST ! stat $M2/topfile;

+TEST touch $M2/subdir1.2_file;

+TEST ! stat $M0/subdir1.2_file;

+TEST stat $M0/subdir1/subdir1.1/subdir1.2/subdir1.2_file;

+

+TEST umount $M2

+

+# Lets validate the options # Not having '*' in here as there was some

+# problem with option validation with this

+TEST $CLI volume set $V0 auth.allow 192.168.1.1

+

+TEST $CLI volume set $V0 auth.allow "192.168.1.1,10.10.\*.\*,::1"

+

+TEST $CLI volume set $V0 auth.allow "/subdir1\(1.2.3.4\),/\(192.168.10.2\|192.168.11.1\),/subdir2\(1.2.3.4\)"

+

+# directories should be absolute

+TEST ! $CLI volume set $V0 auth.allow "subdir2\(1.2.3.4\)"

+

+# support subdir inside subdir

+TEST $CLI volume set $V0 auth.allow '/subdir1/subdir1.1/subdir1.2/\(1.2.3.4\|::1\),/\(192.168.10.1\|192.168.11.1\),/subdir2\(1.2.3.4\)'

+

+# /subdir2 has not allowed IP

+TEST $GFS --subdir-mount /subdir2 -s $H0 --volfile-id $V0 $M1

+TEST stat $M1

+

+TEST $GFS --subdir-mount /subdir1/subdir1.1/subdir1.2 -s $H0 --volfile-id $V0 $M2

+TEST stat $M2

+

+# umount $M1 / $M2

+TEST umount $M0

+TEST umount $M1

+TEST umount $M2

+

+

+TEST $CLI volume stop $V0;

+TEST $CLI volume delete $V0;

+TEST ! $CLI volume info $V0;

+

+## This should clean the mountpoints

+cleanup;

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in

index 2c5e466..e294c5a 100755

--- a/xlators/mount/fuse/utils/mount.glusterfs.in

+++ b/xlators/mount/fuse/utils/mount.glusterfs.in

@@ -297,6 +297,10 @@ start_glusterfs ()

         cmd_line=$(echo "$cmd_line --fuse-mountopts=$fuse_mountopts");

     fi

+    if [ -n "$subdir_mount" ]; then

+        cmd_line=$(echo "$cmd_line --subdir-mount=/$subdir_mount");

+    fi

+

     cmd_line=$(echo "$cmd_line $mount_point");

     $cmd_line;

     if [ $? -ne 0 ]; then

@@ -415,6 +419,9 @@ with_options()

         "volume-id")

             volume_id=$value

             ;;

+        "subdir-mount")

+            subdir_mount=$value

+            ;;

         "volfile-check")

             volfile_check=$value

             ;;

@@ -631,7 +638,15 @@ main ()

         server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:%.\-]*\):.*/\1/p');

         volume_str=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');

         [ -n "$volume_str" ] && {

-            volume_id="$volume_str";

+            volume_id=$volume_str

+            volume_str_temp=$volume_str

+            first_char=$(echo "$volume_str" | cut -c 1);

+            [ ${first_char} = '/' ] && {

+                volume_str_temp=$(echo "$volume_str" | cut -c 2-);

+            [ $(echo $volume_str_temp | grep -c "/") -eq 1 ] && {

+                volume_id=$(echo "$volume_str_temp" | cut -f1 -d '/');

+                subdir_mount=$(echo "$volume_str_temp" | cut -f2- -d '/');

+            }

         }

         volfile_loc="";

         [ -z "$volume_id" -o -z "$server_ip" ] && {

diff --git a/xlators/protocol/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c

index 7ccbb57..eb933f8 100644

--- a/xlators/protocol/auth/addr/src/addr.c

+++ b/xlators/protocol/auth/addr/src/addr.c

@@ -16,13 +16,151 @@

 #include "dict.h"

 #include "rpc-transport.h"

-#define ADDR_DELIMITER " ,"

+#define ENTRY_DELIMITER     ","

+#define ADDR_DELIMITER      "|"

 #define PRIVILEGED_PORT_CEILING 1024

 #ifndef AF_INET_SDP

 #define AF_INET_SDP 27

 #endif

+/* An option for subdir validation be like below */

+

+/* 1. '*'

+   2. '192.168.*'

+   3. '

+   4. '!10.10.1*' (Today as per the code, if negate is set on one entry, its never reset)

+   5. '192.168.1.*, 10.1.10.*';168.168.2.* =/dir;* =/another-dir'

+

+*/

+

+int

+compare_addr_and_update (char *option_str, char *peer_addr, char *subvol,

+                         char *delimiter,

+                         auth_result_t *result, auth_result_t status)

+{

+        char          *addr_str       = NULL;

+        char          *tmp            = NULL;

+        char           negate         = 0;

+        char           match          = 0;

+        int            length         = 0;

+        int            ret            = 0;

+

+        addr_str = strtok_r (option_str, delimiter, &tmp);

+

+        while (addr_str) {

+                gf_log (subvol,  GF_LOG_INFO,

+                        "%s = \"%s\", received addr = \"%s\"",

+                        (status == AUTH_ACCEPT) ? "allowed" : "rejected",

+                        addr_str, peer_addr);

+                if (addr_str[0] == '!') {

+                        negate = 1;

+                        addr_str++;

+                }

+

+                length = strlen(addr_str);

+                if ((addr_str[0] != '*') &&

+                    valid_host_name (addr_str, length)) {

+                        match = gf_is_same_address(addr_str, peer_addr);

+                        if (match) {

+                                *result = status;

+                                goto out;

+                        }

+                } else {

+                        match = fnmatch (addr_str, peer_addr, 0);

+                        if (negate ? match : !match) {

+                                *result = status;

+                                goto out;

+                        }

+                }

+

+                addr_str = strtok_r (NULL, delimiter, &tmp);

+        }

+

+        ret = -1;

+out:

+        return ret;

+}

+

+

+void

+parse_entries_and_compare (char *option_str, char *peer_addr, char *subvol,

+                           char *subdir, auth_result_t *result, auth_result_t status)

+{

+        char *entry = NULL;

+        char *entry_cpy = NULL;

+        char *directory = NULL;

+        char *entries = NULL;

+        char *addr_str = NULL;

+        char *addr = NULL;

+        char *tmp = NULL;

+        char *tmpdir = NULL;

+        int   ret = 0;

+

+        if (!subdir) {

+                gf_log (subvol, GF_LOG_WARNING,

+                        "subdir entry not present, not performing any operation.");

+                goto out;

+        }

+

+        entries = gf_strdup (option_str);

+        if (!entries)

+                goto out;

+

+        if (entries[0] != '/' && !strchr (entries, '(')) {

+                /* Backward compatible option */

+                ret = compare_addr_and_update (entries, peer_addr, subvol,

+                                               ",", result, status);

+                goto out;

+        }

+

+        entry = strtok_r (entries, ENTRY_DELIMITER, &tmp);

+        while (entry) {

+                entry_cpy = gf_strdup (entry);

+                if (!entry_cpy) {

+                        goto out;

+                }

+

+                directory = strtok_r (entry_cpy, "(", &tmpdir);

+                if (directory[0] != '/')

+                        goto out;

+

+                /* send second portion, after ' =' if directory matches */

+                if (strcmp (subdir, directory))

+                        goto next_entry;

+

+                addr_str = strtok_r (NULL, ")", &tmpdir);

+                if (!addr_str)

+                        goto out;

+

+                addr = gf_strdup (addr_str);

+                if (!addr)

+                        goto out;

+

+                gf_log (subvol, GF_LOG_INFO, "Found an entry for dir %s (%s),"

+                        " performing validation", subdir, addr);

+

+                ret = compare_addr_and_update (addr, peer_addr, subvol,

+                                               ADDR_DELIMITER, result, status);

+                if (ret == 0) {

+                        break;

+                }

+

+                GF_FREE (addr);

+                addr = NULL;

+

+        next_entry:

+                entry = strtok_r (NULL, ENTRY_DELIMITER, &tmp);

+                GF_FREE (entry_cpy);

+                entry_cpy = NULL;

+        }

+

+out:

+        GF_FREE (entries);

+        GF_FREE (entry_cpy);

+        GF_FREE (addr);

+}

+

 auth_result_t

 gf_auth (dict_t *input_params, dict_t *config_params)

 {

@@ -35,15 +173,12 @@ gf_auth (dict_t *input_params, dict_t *config_params)

         data_t        *allow_addr     = NULL;

         data_t        *reject_addr    = NULL;

         char          *addr_str       = NULL;

-        char          *tmp            = NULL;

-        char          *addr_cpy       = NULL;

         char          *service        = NULL;

         uint16_t       peer_port      = 0;

-        char           negate         = 0;

-        char           match          = 0;

         char           peer_addr[UNIX_PATH_MAX] = {0,};

         char          *type           = NULL;

         gf_boolean_t   allow_insecure = _gf_false;

+        char          *subdir         = NULL;

         name = data_to_str (dict_get (input_params, "remote-subvolume"));

         if (!name) {

@@ -98,6 +233,12 @@ gf_auth (dict_t *input_params, dict_t *config_params)

                 goto out;

         }

+

+        ret = dict_get_str (input_params, "subdir-mount", &subdir);

+        if (ret) {

+                subdir = "/";

+        }

+

         peer_info = data_to_ptr (peer_info_data);

         switch (((struct sockaddr *) &peer_info->sockaddr)->sa_family) {

@@ -143,60 +284,19 @@ gf_auth (dict_t *input_params, dict_t *config_params)

         }

         if (reject_addr) {

-                addr_cpy = gf_strdup (reject_addr->data);

-                if (!addr_cpy)

+                parse_entries_and_compare (reject_addr->data, peer_addr, name,

+                                           subdir, &result, AUTH_REJECT);

+                if (result == AUTH_REJECT)

                         goto out;

-                addr_str = strtok_r (addr_cpy, ADDR_DELIMITER, &tmp);

-

-                while (addr_str) {

-                        gf_log (name,  GF_LOG_DEBUG,

-                                "rejected = \"%s\", received addr = \"%s\"",

-                                addr_str, peer_addr);

-                        if (addr_str[0] == '!') {

-                                negate = 1;

-                                addr_str++;

-                        }

-

-                        match = fnmatch (addr_str, peer_addr, 0);

-                        if (negate ? match : !match) {

-                                result = AUTH_REJECT;

-                                goto out;

-                        }

-                        addr_str = strtok_r (NULL, ADDR_DELIMITER, &tmp);

-                }

-                GF_FREE (addr_cpy);

-                addr_cpy = NULL;

         }

         if (allow_addr) {

-                addr_cpy = gf_strdup (allow_addr->data);

-                if (!addr_cpy)

-                        goto out;

-

-                addr_str = strtok_r (addr_cpy, ADDR_DELIMITER, &tmp);

-

-                while (addr_str) {

-                        gf_log (name,  GF_LOG_INFO,

-                                "allowed = \"%s\", received addr = \"%s\"",

-                                addr_str, peer_addr);

-                        if (addr_str[0] == '!') {

-                                negate = 1;

-                                addr_str++;

-                        }

-

-                        match = fnmatch (addr_str, peer_addr, 0);

-                        if (negate ? match : !match) {

-                                result = AUTH_ACCEPT;

-                                goto out;

-                        }

-                        addr_str = strtok_r (NULL, ADDR_DELIMITER, &tmp);

-                }

+                parse_entries_and_compare (allow_addr->data, peer_addr, name,

+                                           subdir, &result, AUTH_ACCEPT);

         }

 out:

-        GF_FREE (addr_cpy);

-

         return result;