X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fauth.c;h=07f4e9fa701bdc0cc7dc29a60e7f74fd63b38f34;hb=aa7365c86de8e26e796d3aa3fd605c85d8c26220;hp=a11d9c767aa37b7995c3c8f85c790a6de190de5c;hpb=ddeb0195c4ba638cf886c108319545bea2b66b59;p=citadel.git

diff --git a/citadel/auth.c b/citadel/auth.c
index a11d9c767..07f4e9fa7 100644
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -1,16 +1,19 @@
 /*
- * $Id$
- *
- * system-level password checking for autologin
+ * system-level password checking for host auth mode
  * by Nathan Bryant, March 1999
  * updated by Trey van Riper, June 2005
  *
+ * Copyright (c) 1999-2009 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #if defined(__linux) || defined(__sun) /* needed for crypt(): */
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED 1
@@ -82,11 +85,11 @@ static int conv(int num_msg, const struct pam_message **msg,
 
 
 /*
- * validpw(): check that `pass' is the correct password for `uid'
- *            returns zero if no, nonzero if yes
+ * check that `pass' is the correct password for `uid'
+ * returns zero if no, nonzero if yes
  */
 
-int validpw(uid_t uid, const char *pass)
+int validate_password(uid_t uid, const char *pass)
 {
 #ifdef HAVE_PAM_START
 	struct pam_conv pc;
@@ -104,10 +107,14 @@ int validpw(uid_t uid, const char *pass)
 	int flags = 0;
 
 #ifdef PAM_DATA_SILENT
-	flags = flags | PAM_DATA_SILENT
+	flags = PAM_DATA_SILENT;
+#else
+	flags = 0;
 #endif /* PAM_DATA_SILENT */
-	    if ((pw = getpwuid(uid)) == NULL)
+
+	if ((pw = getpwuid(uid)) == NULL) {
 		return retval;
+	}
 
 #ifdef HAVE_PAM_START
 	pc.conv = conv;
@@ -136,4 +143,3 @@ int validpw(uid_t uid, const char *pass)
 
 	return retval;
 }
-