summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/options.h4
-rw-r--r--xlators/protocol/server/src/server.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h
index af6a651..da36152 100644
--- a/libglusterfs/src/options.h
+++ b/libglusterfs/src/options.h
@@ -116,6 +116,10 @@ typedef struct volume_options {
* TODO: See todo above for option_validation_fn
*/
/* option_validation_fn validate_fn; */
+ /* This is actual key that should be set in the options dict. Can
+ * contain varstrings
+ */
+ char *setkey;
} volume_option_t;
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index a7fe3b2..f4da6a5 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1716,14 +1716,17 @@ struct volume_options options[] = {
/* The following two options are defined in addr.c, redifined here *
* for the sake of validation during volume set from cli */
- { .key = {"auth.addr.*.allow"},
+ { .key = {"auth.addr.*.allow", "auth.allow"},
+ .setkey = "auth.addr.{{ brick.path }}.allow",
+ .default_value = "*",
.type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST,
.description = "Allow a comma separated list of addresses and/or "
"hostnames to connect to the server. Option "
"auth.reject overrides this option. By default, all "
"connections are allowed."
},
- { .key = {"auth.addr.*.reject"},
+ { .key = {"auth.addr.*.reject", "auth.reject"},
+ .setkey = "auth.addr.{{ brick.path }}.reject",
.type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST,
.description = "Reject a comma separated list of addresses and/or "
"hostnames to connect to the server. This option "