Index: src/dict.c
===================================================================
RCS file: /cvsroot/vanessa/scratch/radius/src/dict.c,v
retrieving revision 1.3
diff -u -r1.3 dict.c
--- src/dict.c	1 Apr 2002 01:28:10 -0000	1.3
+++ src/dict.c	16 May 2002 14:33:57 -0000
@@ -370,14 +370,16 @@
  *************************************************************************/
 
 DICT_VALUE	*
-dict_valfind(valname)
+dict_valfind(valname,attrname)
 char	*valname;
+char	*attrname;
 {
 	DICT_VALUE	*val;
 
 	val = dictionary_values;
 	while(val != (DICT_VALUE *)NULL) {
-		if(strcmp(val->name, valname) == 0) {
+		if((strcmp(val->name, valname) == 0) && 
+			(strcmp(val->attrname,attrname) == 0) ) {
 			return(val);
 		}
 		val = val->next;
Index: src/dict.h
===================================================================
RCS file: /cvsroot/vanessa/scratch/radius/src/dict.h,v
retrieving revision 1.1
diff -u -r1.1 dict.h
--- src/dict.h	15 Mar 2002 04:22:05 -0000	1.1
+++ src/dict.h	16 May 2002 14:33:57 -0000
@@ -109,12 +109,12 @@
  *	Function: dict_valfind
  *
  *	Purpose: Return the full value structure based on the
- *		 value name.
+ *		 value and attribute names.
  *
  *************************************************************************/
 
 DICT_VALUE	*
-dict_valfind(char *valname);
+dict_valfind(char *valname, char *attrname);
 
 
 /*************************************************************************
Index: src/radiusd.c
===================================================================
RCS file: /cvsroot/vanessa/scratch/radius/src/radiusd.c,v
retrieving revision 1.4
diff -u -r1.4 radiusd.c
--- src/radiusd.c	1 Apr 2002 01:28:10 -0000	1.4
+++ src/radiusd.c	16 May 2002 14:33:59 -0000
@@ -2711,13 +2711,13 @@
 {
 	DICT_VALUE	*dval;
 
-	if((dval = dict_valfind("Password-Expiration")) == (DICT_VALUE *)NULL) {
+	if((dval = dict_valfind("Password-Expiration","Server-Config")) == (DICT_VALUE *)NULL) {
 		expiration_seconds = (UINT4)0;
 	}
 	else {
 		expiration_seconds = dval->value * (UINT4)SECONDS_PER_DAY;
 	}
-	if((dval = dict_valfind("Password-Warning")) == (DICT_VALUE *)NULL) {
+	if((dval = dict_valfind("Password-Warning","Server-Config")) == (DICT_VALUE *)NULL) {
 		warning_seconds = (UINT4)0;
 	}
 	else {
Index: src/users.c
===================================================================
RCS file: /cvsroot/vanessa/scratch/radius/src/users.c,v
retrieving revision 1.3
diff -u -r1.3 users.c
--- src/users.c	1 Apr 2002 01:28:10 -0000	1.3
+++ src/users.c	16 May 2002 14:34:00 -0000
@@ -452,7 +452,7 @@
 				if(isdigit(*valstr)) {
 					pair->lvalue = atoi(valstr);
 				}
-				else if((dval = dict_valfind(valstr)) ==
+				else if((dval = dict_valfind(valstr,pair->name)) ==
 							(DICT_VALUE *)NULL) {
 					free(pair);
 					return(-1);