andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build warnings in 'auth' module

Browse Source 
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 130 (build warnings)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=130
This commit is contained in:
Amar Tumballi 2009-07-17 22:42:33 +00:00 committed by Anand V. Avati
parent ca859dfe78
commit d62362acd6
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
auth/addr/src/addr.c
View File

@ -39,6 +39,7 @@
auth_result_t
gf_auth (dict_t *input_params, dict_t *config_params)
{
int ret = 0;
char *name = NULL;
char *searchstr = NULL;
char peer_addr[UNIX_PATH_MAX];
@ -55,19 +56,34 @@ gf_auth (dict_t *input_params, dict_t *config_params)
return AUTH_DONT_CARE;
}
asprintf (&searchstr, "auth.addr.%s.allow", name);
ret = asprintf (&searchstr, "auth.addr.%s.allow", name);
if (-1 == ret) {
gf_log ("auth/addr", GF_LOG_ERROR,
"asprintf failed while setting search string");
return AUTH_DONT_CARE;
}
allow_addr = dict_get (config_params,
searchstr);
free (searchstr);
asprintf (&searchstr, "auth.addr.%s.reject", name);
ret = asprintf (&searchstr, "auth.addr.%s.reject", name);
if (-1 == ret) {
gf_log ("auth/addr", GF_LOG_ERROR,
"asprintf failed while setting search string");
return AUTH_DONT_CARE;
}
reject_addr = dict_get (config_params,
searchstr);
free (searchstr);
if (!allow_addr) {
/* TODO: backword compatibility */
asprintf (&searchstr, "auth.ip.%s.allow", name);
ret = asprintf (&searchstr, "auth.ip.%s.allow", name);
if (-1 == ret) {
gf_log ("auth/addr", GF_LOG_ERROR,
"asprintf failed while setting search string");
return AUTH_DONT_CARE;
}
allow_addr = dict_get (config_params, searchstr);
free (searchstr);
}

16
auth/login/src/login.c
View File

@ -27,6 +27,7 @@
auth_result_t gf_auth (dict_t *input_params, dict_t *config_params)
{
int ret = 0;
char *username = NULL, *password = NULL;
data_t *allow_user = NULL, *username_data = NULL, *password_data = NULL;
int32_t result = AUTH_DONT_CARE;
@ -52,7 +53,13 @@ auth_result_t gf_auth (dict_t *input_params, dict_t *config_params)
return AUTH_REJECT;
}
asprintf (&searchstr, "auth.login.%s.allow", brick_name);
ret = asprintf (&searchstr, "auth.login.%s.allow", brick_name);
if (-1 == ret) {
gf_log ("auth/login", GF_LOG_ERROR,
"asprintf failed while setting search string");
return AUTH_DONT_CARE;
}
allow_user = dict_get (config_params,
searchstr);
free (searchstr);
@ -69,7 +76,12 @@ auth_result_t gf_auth (dict_t *input_params, dict_t *config_params)
if (!fnmatch (username_str,
username,
0)) {
asprintf (&searchstr, "auth.login.%s.password", username);
ret = asprintf (&searchstr, "auth.login.%s.password", username);
if (-1 == ret) {
gf_log ("auth/login", GF_LOG_ERROR,
"asprintf failed while setting search string");
return AUTH_DONT_CARE;
}
passwd_data = dict_get (config_params, searchstr);
FREE (searchstr);