summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendrabhat@gluster.com>2011-08-05 17:50:51 +0530
committerVijay Bellur <vijay@gluster.com>2011-08-05 05:30:23 -0700
commit0c01d96a065deb992a8c3a0b24c74a70ab99ea86 (patch)
treea4b1392fc0640dda3ebdbafb16d7a3bebc19582a
parentdfc317a77faa57f1bb6933b35c362035f467bf94 (diff)
glusterd: check for both the auth allow and auth reject before returning in volgenv3.1.6qa5
Change-Id: I5c0fbf3252abcae16d5c4e6ea500c9a9ce3a4090 BUG: 3343 Reviewed-on: http://review.gluster.com/181 Reviewed-by: Vijay Bellur <vijay@gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 50111ae..6f27c69 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1066,7 +1066,7 @@ server_auth_option_handler (glusterfs_graph_t *graph,
int ret = 0;
char *key = NULL;
- if ( (strcmp (vme->option, "!auth.addr.*.allow") != 0) ||
+ if ( (strcmp (vme->option, "!auth.addr.*.allow") != 0) &&
(strcmp (vme->option, "!auth.addr.*.reject") != 0))
return 0;