aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 15:34:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 15:34:27 +0200
commita5f1e6f66a82a3630919353a396e77845586121b (patch)
tree41743b4bbc532fc03b5db7c64c9db50ee0591c88
parentc859cfb399dc00dee24e02dd3acd40d40954c290 (diff)
downloadlibpam-x2go-a5f1e6f66a82a3630919353a396e77845586121b.tar.gz
libpam-x2go-a5f1e6f66a82a3630919353a396e77845586121b.tar.bz2
libpam-x2go-a5f1e6f66a82a3630919353a396e77845586121b.zip
tests/mock_pam.c: Use curly braces for all if-clauses.
-rw-r--r--tests/mock_pam.c35
1 files changed, 20 insertions, 15 deletions
diff --git a/tests/mock_pam.c b/tests/mock_pam.c
index 88dc8d6..21fdde3 100644
--- a/tests/mock_pam.c
+++ b/tests/mock_pam.c
@@ -29,23 +29,23 @@ int fake_conv (int __attribute__((unused)) num_msg,
struct pam_response *response = NULL;
response = malloc (sizeof (struct pam_response));
- if (response == NULL)
+ if (response == NULL) {
return PAM_BUF_ERR;
+ }
response->resp_retcode = 0;
- if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_GUESTLOGIN) == 0)
+ if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_GUESTLOGIN) == 0) {
response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
- else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_USER) == 0)
+ } else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_USER) == 0) {
response->resp = strdup ("ruser");
- else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_HOST) == 0)
+ } else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_HOST) == 0) {
response->resp = strdup ("protocol://rhost/dummy");
- else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_PASSWORD) == 0)
+ } else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_PASSWORD) == 0) {
response->resp = strdup ("password");
- else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_COMMAND) == 0)
+ } else if (strcmp((*msg)->msg, PAM_X2GO_PROMPT_COMMAND) == 0) {
response->resp = strdup ("rcommand");
- else
- {
+ } else {
free(response);
return PAM_SYMBOL_ERR; /* leaks... */
}
@@ -71,23 +71,26 @@ pam_handle_t *pam_handle_new (void)
int PAM_NONNULL((1)) pam_get_item (const pam_handle_t *pamh, int type, const void **value)
{
- if (pamh == NULL)
+ if (pamh == NULL) {
return PAM_SYSTEM_ERR;
+ }
- if (type == PAM_CONV)
+ if (type == PAM_CONV) {
*value = pamh->conv;
- else if (pamh->item[type] != NULL)
+ } else if (pamh->item[type] != NULL) {
*value = pamh->item[type];
- else
+ } else {
*value = NULL; /* will result in a prompt conversation */
+ }
return PAM_SUCCESS;
}
int PAM_NONNULL((1)) pam_set_item (pam_handle_t *pamh, int type, const void *value)
{
- if (pamh == NULL)
+ if (pamh == NULL) {
return PAM_SYSTEM_ERR;
+ }
void **slot, *tmp;
size_t nsize, osize;
@@ -95,10 +98,12 @@ int PAM_NONNULL((1)) pam_set_item (pam_handle_t *pamh, int type, const void *val
slot = &pamh->item[type];
osize = nsize = 0;
- if (*slot != NULL)
+ if (*slot != NULL) {
osize = strlen((const char *)*slot) + 1;
- if (value != NULL)
+ }
+ if (value != NULL) {
nsize = strlen((const char *)value) + 1;
+ }
if (*slot != NULL) {
memset(*slot, 0xd0, osize);