X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fauth.c;h=74fa9ebc321b6814ac3bab1bed45e6095b41d6a2;hb=4c274aa94a53d8850ed363e64c5863970fe629a4;hp=f1062a84f923b1d9cbb3f48abdde7306ce03888c;hpb=56d69e5d8434e98835a2582c59b771ba69475431;p=citadel.git

diff --git a/citadel/auth.c b/citadel/auth.c
index f1062a84f..74fa9ebc3 100644
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -5,19 +5,13 @@
  *
  * Copyright (c) 1999-2009 by the citadel.org team
  *
- * This program is free 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 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.
- *
- * 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
  */
 
 #if defined(__linux) || defined(__sun) /* needed for crypt(): */
@@ -110,18 +104,19 @@ int validate_password(uid_t uid, const char *pass)
 #endif
 	struct passwd *pw;
 	int retval = 0;
-	int flags = 0;
-
-	flags = 0;	/* silences compiler warning */
 
-#ifdef PAM_DATA_SILENT
-	flags = ( flags | PAM_DATA_SILENT ) ;
-#endif /* PAM_DATA_SILENT */
 	if ((pw = getpwuid(uid)) == NULL) {
 		return retval;
 	}
 
 #ifdef HAVE_PAM_START
+
+#ifdef PAM_DATA_SILENT
+	int flags = PAM_DATA_SILENT;
+#else
+	int flags = 0;
+#endif /* PAM_DATA_SILENT */
+
 	pc.conv = conv;
 	pc.appdata_ptr = &data;
 	data.name = pw->pw_name;