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

diff --git a/citadel/auth.c b/citadel/auth.c
index d2061a8cb..07f4e9fa7 100644
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -1,26 +1,17 @@
 /*
- * $Id$
- *
  * 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 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 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
+ * 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.
  */
 
 #if defined(__linux) || defined(__sun) /* needed for crypt(): */
@@ -115,11 +106,12 @@ int validate_password(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 = PAM_DATA_SILENT;
+#else
+	flags = 0;
 #endif /* PAM_DATA_SILENT */
+
 	if ((pw = getpwuid(uid)) == NULL) {
 		return retval;
 	}
@@ -151,4 +143,3 @@ int validate_password(uid_t uid, const char *pass)
 
 	return retval;
 }
-