(syslogvals): mark up where severity and facility start resp
(check_log): find_value() returns -1 when key isn't found git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11611 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		| @@ -1,5 +1,5 @@ | ||||
| /* | ||||
|  * Copyright (c) 1999 - 2002 Kungliga Tekniska H<>gskolan | ||||
|  * Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan | ||||
|  * (Royal Institute of Technology, Stockholm, Sweden).  | ||||
|  * All rights reserved.  | ||||
|  * | ||||
| @@ -168,6 +168,7 @@ struct s2i { | ||||
| #define L(X) { #X, LOG_ ## X } | ||||
|  | ||||
| static struct s2i syslogvals[] = { | ||||
|     /* severity */ | ||||
|     L(EMERG), | ||||
|     L(ALERT), | ||||
|     L(CRIT), | ||||
| @@ -176,7 +177,7 @@ static struct s2i syslogvals[] = { | ||||
|     L(NOTICE), | ||||
|     L(INFO), | ||||
|     L(DEBUG), | ||||
|  | ||||
|     /* facility */ | ||||
|     L(AUTH), | ||||
| #ifdef LOG_AUTHPRIV | ||||
|     L(AUTHPRIV), | ||||
| @@ -263,12 +264,12 @@ check_log(krb5_context context, const char *path, char *data) | ||||
| 	    strlcpy(severity, "ERR", sizeof(severity)); | ||||
|  	if(*facility == '\0') | ||||
| 	    strlcpy(facility, "AUTH", sizeof(facility)); | ||||
| 	if(find_value(severity, syslogvals) == NULL) { | ||||
| 	if(find_value(severity, syslogvals) == -1) { | ||||
| 	    krb5_warnx(context, "%s: unknown syslog facility \"%s\"",  | ||||
| 		       path, facility); | ||||
| 	    ret++; | ||||
| 	} | ||||
| 	if(find_value(severity, syslogvals) == NULL) { | ||||
| 	if(find_value(severity, syslogvals) == -1) { | ||||
| 	    krb5_warnx(context, "%s: unknown syslog severity \"%s\"",  | ||||
| 		       path, severity); | ||||
| 	    ret++; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Love Hörnquist Åstrand
					Love Hörnquist Åstrand