From 0344a8a12e7675bee24c770d71eff52db6b2d128 Mon Sep 17 00:00:00 2001 From: Rajesh Amaravathi Date: Tue, 21 Feb 2012 13:39:29 +0530 Subject: glusterd/auth: 3.2.x compatibility volumes created with GlusterFS 3.2.x will be compatible with GlusterFS 3.3 w.r.t auth.allow enhancements Change-Id: I615e46d648e1270a7b856cd71fab24cfe791ddb8 BUG: 795634 Signed-off-by: Rajesh Amaravathi Reviewed-on: http://review.gluster.com/2779 Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-store.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 900c12a82..56b75ec90 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -566,6 +566,8 @@ void _storeopts (dict_t *this, char *key, data_t *value, void *data) int32_t glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) { + char *str = NULL; + GF_ASSERT (fd > 0); GF_ASSERT (volinfo); @@ -631,15 +633,23 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) if (ret) goto out; - ret = glusterd_store_save_value (fd, GLUSTERD_STORE_KEY_USERNAME, - glusterd_auth_get_username (volinfo)); - if (ret) + str = glusterd_auth_get_username (volinfo); + if (str) { + ret = glusterd_store_save_value (fd, + GLUSTERD_STORE_KEY_USERNAME, + str); + if (ret) goto out; + } - ret = glusterd_store_save_value (fd, GLUSTERD_STORE_KEY_PASSWORD, - glusterd_auth_get_password (volinfo)); - if (ret) - goto out; + str = glusterd_auth_get_password (volinfo); + if (str) { + ret = glusterd_store_save_value (fd, + GLUSTERD_STORE_KEY_PASSWORD, + str); + if (ret) + goto out; + } out: if (ret) -- cgit