Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / auth.c

diff --git a/citadel/auth.c b/citadel/auth.c
index a11d9c767aa37b7995c3c8f85c790a6de190de5c..501008633a09cd1b4ac7a947796f8d99a0dd323e 100644 (file)
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -1,16 +1,25 @@
 /*
- * $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 as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#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 +91,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;
@@ -103,11 +112,14 @@ int validpw(uid_t uid, const char *pass)
        int retval = 0;
        int flags = 0;
 
+       flags = 0;      /* silences compiler warning */
+
 #ifdef PAM_DATA_SILENT
-       flags = flags | PAM_DATA_SILENT
+       flags = ( flags | PAM_DATA_SILENT ) ;
 #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 +148,3 @@ int validpw(uid_t uid, const char *pass)
 
        return retval;
 }
-