Merge branch 'sunweaver-pr/travis-ci'HEADmaster

Attributes GH PR #2: https://github.com/ArcticaProject/libpam-freerdp2/pull/2

3 files changed, 54 insertions, 34 deletions

diff --git a/tests/mock_guest.c b/tests/mock_guest.c
index 7673995..4d10bfb 100644
--- a/tests/mock_guest.c
+++ b/tests/mock_guest.c
@@ -22,39 +22,44 @@ static struct passwd guest = { "guest",
 							   "/tmp",
 							   "/bin/true" };
 struct passwd *
-getpwnam (const char *username)
+getpwnam (const char __attribute__((unused)) *username)
 { return &guest; }
 
 int
-setgroups(size_t size, const gid_t *list)
+setgroups(size_t __attribute__((unused)) size,
+          const gid_t __attribute__((unused)) *list)
 {
 	errno = EPERM;
 	return -1;
 }
 
 int
-setgid(gid_t gid)
+setgid(gid_t __attribute__((unused)) gid)
 { return 0; }
 
 int
-setuid(uid_t uid)
+setuid(uid_t __attribute__((unused)) uid)
 { return 0; }
 
 int
-setegid(gid_t gid)
+setegid(gid_t __attribute__((unused)) gid)
 { return 0; }
 
 int
-seteuid(uid_t uid)
+seteuid(uid_t __attribute__((unused)) uid)
 { return 0; }
 
-int chmod(const char *path, mode_t mode)
+int chmod(const char __attribute__((unused)) *path,
+          mode_t __attribute__((unused)) mode)
 { return 0; }
 
-int chown(const char *path, uid_t owner, gid_t group)
+int chown(const char __attribute__((unused)) *path,
+          uid_t __attribute__((unused)) owner,
+          gid_t __attribute__((unused)) group)
 { return 0; }
 
-int execvp(const char *file, char *const argv[])
+int execvp(const char __attribute__((unused)) *file,
+           char __attribute__((unused)) *const argv[])
 {
 	return 0;
 }
@@ -84,7 +89,7 @@ socket_sucker ()
 
 	serv_addr.sun_family = AF_UNIX;
 
-	int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp2-socket");
+	unsigned long int printsize = (unsigned long int)snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp2-socket");
 	if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
 		return -1;
 	}
diff --git a/tests/mock_pam.c b/tests/mock_pam.c
index ce57973..f32d95f 100644
--- a/tests/mock_pam.c
+++ b/tests/mock_pam.c
@@ -19,37 +19,44 @@ struct pam_handle {
 	/* note: the other fields have been omitted */
 };
 
-int fake_conv (int num_msg, const struct pam_message **msg,
-				struct pam_response **resp, void *appdata_ptr)
+int fake_conv (int __attribute__((unused)) num_msg,
+               const struct pam_message **msg,
+               struct pam_response **resp,
+               void __attribute__((unused)) *appdata_ptr)
 {
 	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_FREERDP2_PROMPT_GUESTLOGIN) == 0)
+	if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_GUESTLOGIN) == 0) {
 		response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0) {
 		response->resp = strdup ("ruser");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0) {
 		response->resp = strdup ("protocol://rhost/dummy");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0) {
 		response->resp = strdup ("password");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0) {
 		response->resp = strdup ("domain");
-	else
+	} else {
+		free(response);
 		return PAM_SYMBOL_ERR; /* leaks... */
+	}
 
 	*resp = response;
 
 	return PAM_SUCCESS;
 }
 
-int fake_conv_empty_password (int num_msg, const struct pam_message **msg,
-				struct pam_response **resp, void *appdata_ptr)
+int fake_conv_empty_password (int __attribute__((unused)) num_msg,
+                              const struct pam_message **msg,
+                              struct pam_response **resp,
+                              void __attribute__((unused)) *appdata_ptr)
 {
 	struct pam_response *response = NULL;
 	response = malloc (sizeof (struct pam_response));
@@ -59,18 +66,20 @@ int fake_conv_empty_password (int num_msg, const struct pam_message **msg,
 
 	response->resp_retcode = 0;
 
-	if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_GUESTLOGIN) == 0)
+	if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_GUESTLOGIN) == 0) {
 		response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0) {
 		response->resp = strdup ("ruser");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0) {
 		response->resp = strdup ("protocol://rhost/dummy");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0) {
 		response->resp = strdup ("");
-	else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0)
+	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0) {
 		response->resp = strdup ("domain");
-	else
+	} else {
+		free(response);
 		return PAM_SYMBOL_ERR; /* leaks... */
+	}
 
 	*resp = response;
 
@@ -109,20 +118,22 @@ int PAM_NONNULL((1)) pam_get_item (const pam_handle_t *pamh, int type, const voi
 	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;
@@ -130,10 +141,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);
@@ -141,8 +154,9 @@ int PAM_NONNULL((1)) pam_set_item (pam_handle_t *pamh, int type, const void *val
 	}
 
 	if (value != NULL) {
-		if ((tmp = malloc(nsize)) == NULL)
+		if ((tmp = malloc(nsize)) == NULL) {
 			return PAM_BUF_ERR;
+		}
 		memcpy(tmp, value, nsize);
 	} else {
 		tmp = NULL;
diff --git a/tests/mock_pam.h b/tests/mock_pam.h
index 7fe0467..df837df 100644
--- a/tests/mock_pam.h
+++ b/tests/mock_pam.h
@@ -11,6 +11,7 @@
 #define __MOCK_PAM_H__
 
 #define LIBPAM_COMPILE
+#include <security/_pam_types.h>
 #include <security/pam_modules.h>
 #include <security/pam_modutil.h>
 #include <security/pam_appl.h>