Massively cleaned up #include's, so they're in a consistent

[freeradius.git] / src / main / valuepair.c

diff --git a/src/main/valuepair.c b/src/main/valuepair.c
index 0b6b254..76e962c 100644 (file)
--- a/src/main/valuepair.c
+++ b/src/main/valuepair.c
@@ -16,23 +16,16 @@
  *
  *   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
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
- * Copyright 2000  The FreeRADIUS server project
+ * Copyright 2000,2006  The FreeRADIUS server project
  * Copyright 2000  Alan DeKok <aland@ox.org>
  */
 
-static const char rcsid[] = "$Id$";
+#include <freeradius-devel/ident.h>
+RCSID("$Id$")
 
-#include "autoconf.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_NETINET_IN_H
-#      include <netinet/in.h>
-#endif
+#include <freeradius-devel/radiusd.h>
 
 #ifdef HAVE_REGEX_H
 #      include <regex.h>
@@ -51,8 +44,6 @@ static const char rcsid[] = "$Id$";
 #endif
 #endif
 
-#include "radiusd.h"
-
 struct cmp {
        int attribute;
        int otherattr;
@@ -271,8 +262,8 @@ int paircompare(REQUEST *req, VALUE_PAIR *request, VALUE_PAIR *check, VALUE_PAIR
                         *
                         *      This hack makes CHAP-Password work..
                         */
-                       case PW_PASSWORD:
-                               if (pairfind(request, PW_PASSWORD) == NULL) {
+                       case PW_USER_PASSWORD:
+                               if (pairfind(request, PW_USER_PASSWORD) == NULL) {
                                        continue;
                                }
                                break;