X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fauth.c;h=f80aab524988ccb98ee63b5dc1cc876dc6fd93c2;hb=b6f23be393ebbb1d6e5bcb6598526019309aaa86;hp=74fa9ebc321b6814ac3bab1bed45e6095b41d6a2;hpb=f16c4399e39f5ce93ac8a6f029185277699085ce;p=citadel.git

diff --git a/citadel/auth.c b/citadel/auth.c
index 74fa9ebc3..f80aab524 100644
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -3,7 +3,7 @@
  * by Nathan Bryant, March 1999
  * updated by Trey van Riper, June 2005
  *
- * Copyright (c) 1999-2009 by the citadel.org team
+ * Copyright (c) 1999-2016 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#if defined(__linux) || defined(__sun) /* needed for crypt(): */
+#if defined(__linux) || defined(__sun)	/* needed for crypt(): */
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED 1
 #endif
@@ -38,11 +38,9 @@
 /*
  * struct appdata: passed to the conversation function
  */
-
-struct appdata
-{
-  const char *name;
-  const char *pw;
+struct appdata {
+	const char *name;
+	const char *pw;
 };
 
 /*
@@ -52,45 +50,45 @@ struct appdata
  * code, but we can't really support them with the existing client protocol
  * anyway. the failure mode should be to deny access, in any case.
  */
-
 static int conv(int num_msg, const struct pam_message **msg,
 		struct pam_response **resp, void *appdata_ptr)
 {
-  struct pam_response *temp_resp;
-  struct appdata *data = appdata_ptr;
-
-  if ((temp_resp = malloc(sizeof(struct pam_response[num_msg]))) == NULL)
-    return PAM_CONV_ERR;
-
-  while (num_msg--)
-    {
-      switch ((*msg)[num_msg].msg_style)
-	{
-	case PAM_PROMPT_ECHO_ON:
-	  temp_resp[num_msg].resp = strdup(data->name);
-	  break;
-	case PAM_PROMPT_ECHO_OFF:
-	  temp_resp[num_msg].resp = strdup(data->pw);
-	  break;
-	default:
-	  temp_resp[num_msg].resp = NULL;
+	struct pam_response *temp_resp;
+	struct appdata *data = appdata_ptr;
+
+	if ((temp_resp =
+	     malloc(sizeof(struct pam_response[num_msg]))) == NULL)
+		return PAM_CONV_ERR;
+
+	while (num_msg--) {
+		switch ((*msg)[num_msg].msg_style) {
+		case PAM_PROMPT_ECHO_ON:
+			temp_resp[num_msg].resp = strdup(data->name);
+			break;
+		case PAM_PROMPT_ECHO_OFF:
+			temp_resp[num_msg].resp = strdup(data->pw);
+			break;
+		default:
+			temp_resp[num_msg].resp = NULL;
+		}
+		temp_resp[num_msg].resp_retcode = 0;
 	}
-      temp_resp[num_msg].resp_retcode = 0;
-    }
 
-  *resp = temp_resp;
-  return PAM_SUCCESS;
+	*resp = temp_resp;
+	return PAM_SUCCESS;
 }
-#endif /* HAVE_PAM_START */
+#endif				/* HAVE_PAM_START */
 
 
 /*
  * check that `pass' is the correct password for `uid'
  * returns zero if no, nonzero if yes
  */
-
 int validate_password(uid_t uid, const char *pass)
 {
+	if (pass == NULL) {
+		return (0);
+	}
 #ifdef HAVE_PAM_START
 	struct pam_conv pc;
 	struct appdata data;
@@ -105,40 +103,48 @@ int validate_password(uid_t uid, const char *pass)
 	struct passwd *pw;
 	int retval = 0;
 
-	if ((pw = getpwuid(uid)) == NULL) {
+	pw = getpwuid(uid);
+	if (pw == NULL) {
 		return retval;
 	}
-
 #ifdef HAVE_PAM_START
 
 #ifdef PAM_DATA_SILENT
 	int flags = PAM_DATA_SILENT;
 #else
 	int flags = 0;
-#endif /* PAM_DATA_SILENT */
+#endif
 
 	pc.conv = conv;
 	pc.appdata_ptr = &data;
 	data.name = pw->pw_name;
 	data.pw = pass;
 	if (pam_start("citadel", pw->pw_name, &pc, &ph) != PAM_SUCCESS)
-		return retval;
+		return (0);
 
-	if ((i = pam_authenticate(ph, flags)) == PAM_SUCCESS)
-		if ((i = pam_acct_mgmt(ph, flags)) == PAM_SUCCESS)
+	if ((i = pam_authenticate(ph, flags)) == PAM_SUCCESS) {
+		if ((i = pam_acct_mgmt(ph, flags)) == PAM_SUCCESS) {
 			retval = -1;
+		}
+	}
 
 	pam_end(ph, i | flags);
 #else
 	crypted_pwd = pw->pw_passwd;
 
 #ifdef HAVE_GETSPNAM
-	if ((sp = getspnam(pw->pw_name)) != NULL)
+	if (pw == NULL)
+		return (0);
+	if (pw->pw_name == NULL)
+		return (0);
+	if ((sp = getspnam(pw->pw_name)) != NULL) {
 		crypted_pwd = sp->sp_pwdp;
+	}
 #endif
 
-	if (!strcmp(crypt(pass, crypted_pwd), crypted_pwd))
+	if (!strcmp(crypt(pass, crypted_pwd), crypted_pwd)) {
 		retval = -1;
+	}
 #endif				/* HAVE_PAM_START */
 
 	return retval;