summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 117e5e8f3a8..f122acbf6ce 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -584,7 +584,6 @@ char *
glusterd_auth_get_username (glusterd_volinfo_t *volinfo) {
GF_ASSERT (volinfo);
- GF_ASSERT (volinfo->auth.username);
return volinfo->auth.username;
}
@@ -593,7 +592,6 @@ char *
glusterd_auth_get_password (glusterd_volinfo_t *volinfo) {
GF_ASSERT (volinfo);
- GF_ASSERT (volinfo->auth.password);
return volinfo->auth.password;
}
@@ -2118,28 +2116,20 @@ glusterd_import_volinfo (dict_t *vols, int count,
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.username", count);
ret = dict_get_str (vols, key, &str);
- if (ret) {
- snprintf (msg, sizeof (msg),
- "%s missing in payload for %s",
- key, volname);
- goto out;
+ if (!ret) {
+ ret = glusterd_auth_set_username (new_volinfo, str);
+ if (ret)
+ goto out;
}
- ret = glusterd_auth_set_username (new_volinfo, str);
- if (ret)
- goto out;
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.password", count);
ret = dict_get_str (vols, key, &str);
- if (ret) {
- snprintf (msg, sizeof (msg),
- "%s missing in payload for %s",
- key, volname);
- goto out;
+ if (!ret) {
+ ret = glusterd_auth_set_password (new_volinfo, str);
+ if (ret)
+ goto out;
}
- ret = glusterd_auth_set_password (new_volinfo, str);
- if (ret)
- goto out;
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "volume%d.transport_type", count);