oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(syslogvals): mark up where severity and facility start resp

Browse Source 
(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:
Love Hörnquist Åstrand
2003-01-23 19:49:32 +00:00
parent ea94038288
commit e0a89410d7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/krb5/verify_krb5_conf.c
View File

@@ -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). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -168,6 +168,7 @@ struct s2i {
#define L(X) { #X, LOG_ ## X } #define L(X) { #X, LOG_ ## X }
static struct s2i syslogvals[] = { static struct s2i syslogvals[] = {
/* severity */
L(EMERG), L(EMERG),
L(ALERT), L(ALERT),
L(CRIT), L(CRIT),
@@ -176,7 +177,7 @@ static struct s2i syslogvals[] = {
L(NOTICE), L(NOTICE),
L(INFO), L(INFO),
L(DEBUG), L(DEBUG),
/* facility */
L(AUTH), L(AUTH),
#ifdef LOG_AUTHPRIV #ifdef LOG_AUTHPRIV
L(AUTHPRIV), L(AUTHPRIV),
@@ -263,12 +264,12 @@ check_log(krb5_context context, const char *path, char *data)
strlcpy(severity, "ERR", sizeof(severity)); strlcpy(severity, "ERR", sizeof(severity));
if(*facility == '\0') if(*facility == '\0')
strlcpy(facility, "AUTH", sizeof(facility)); 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\"", krb5_warnx(context, "%s: unknown syslog facility \"%s\"",
path, facility); path, facility);
ret++; ret++;
} }
if(find_value(severity, syslogvals) == NULL) { if(find_value(severity, syslogvals) == -1) {
krb5_warnx(context, "%s: unknown syslog severity \"%s\"", krb5_warnx(context, "%s: unknown syslog severity \"%s\"",
path, severity); path, severity);
ret++; ret++;