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

Include log-level.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2711 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-06 16:12:57 +00:00
parent 7f30ceef1d
commit 364392c861
1 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
lib/krb5/log.c
View File

@@ -1,39 +1,39 @@
/* /*
* Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* 3. All advertising materials mentioning features or use of this software * 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement: * must display the following acknowledgement:
* This product includes software developed by the Kungliga Tekniska * This product includes software developed by Kungliga Tekniska
* H<>gskolan and its contributors. * H<>gskolan and its contributors.
* *
* 4. Neither the name of the Institute nor the names of its contributors * 4. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "krb5_locl.h" #include "krb5_locl.h"
@@ -41,6 +41,8 @@
RCSID("$Id"); RCSID("$Id");
struct facility { struct facility {
int min;
int max;
void (*log)(struct facility *, const char *, const char *); void (*log)(struct facility *, const char *, const char *);
void (*close)(struct facility*); void (*close)(struct facility*);
void *data; void *data;
@@ -220,17 +222,26 @@ krb5_openlog(krb5_context context,
"logging", "logging",
logname, logname,
NULL)){ NULL)){
struct facility *fp = NULL;
int min = 0, max = 0, n;
n = sscanf(p, "%d-%d/", &min, &max);
if(n){
p = strchr(p, '/');
if(p == NULL) continue;
p++;
}
if(strcmp(p, "STDERR") == 0){ if(strcmp(p, "STDERR") == 0){
struct facility *fp = log_realloc(f); fp = log_realloc(f);
open_file(fp, NULL, NULL, stderr, 1); open_file(fp, NULL, NULL, stderr, 1);
}else if(strcmp(p, "CONSOLE") == 0){ }else if(strcmp(p, "CONSOLE") == 0){
struct facility *fp = log_realloc(f); fp = log_realloc(f);
open_file(fp, "/dev/console", "w", NULL, 0); open_file(fp, "/dev/console", "w", NULL, 0);
}else if(strncmp(p, "FILE:", 4) == 0 && (p[4] == ':' || p[4] == '=')){ }else if(strncmp(p, "FILE:", 4) == 0 && (p[4] == ':' || p[4] == '=')){
struct facility *fp = log_realloc(f); char *fn;
char *fn = strdup(p + 5);
FILE *file = NULL; FILE *file = NULL;
int keep_open = 0; int keep_open = 0;
fp = log_realloc(f);
fn = strdup(p + 5);
if(p[4] == '='){ if(p[4] == '='){
int i = open(fn, O_WRONLY | O_CREAT | int i = open(fn, O_WRONLY | O_CREAT |
O_TRUNC | O_APPEND, 0666); O_TRUNC | O_APPEND, 0666);
@@ -239,20 +250,23 @@ krb5_openlog(krb5_context context,
} }
open_file(fp, fn, "a", file, keep_open); open_file(fp, fn, "a", file, keep_open);
}else if(strncmp(p, "DEVICE=", 6) == 0){ }else if(strncmp(p, "DEVICE=", 6) == 0){
struct facility *fp = log_realloc(f); fp = log_realloc(f);
open_file(fp, strdup(p + 7), "w", NULL, 0); open_file(fp, strdup(p + 7), "w", NULL, 0);
}else if(strncmp(p, "SYSLOG", 6) == 0){ }else if(strncmp(p, "SYSLOG", 6) == 0){
char *severity; char *severity;
char *facility; char *facility;
struct facility *fd;
severity = strchr(p, ':'); severity = strchr(p, ':');
if(severity == NULL) if(severity == NULL)
severity = "ERR"; severity = "ERR";
facility = strchr(severity, ':'); facility = strchr(severity, ':');
if(facility == NULL) if(facility == NULL)
facility = "AUTH"; facility = "AUTH";
fd = log_realloc(f); fp = log_realloc(f);
open_syslog(program, severity, facility, fd); open_syslog(program, severity, facility, fp);
}
if(fp){
fp->min = min;
fp->max = max;
} }
} }
*fac = f; *fac = f;
@@ -273,6 +287,7 @@ krb5_error_code
krb5_vlog_msg(krb5_context context, krb5_vlog_msg(krb5_context context,
krb5_log_facility *fac, krb5_log_facility *fac,
char **reply, char **reply,
int level,
const char *fmt, const char *fmt,
va_list ap) va_list ap)
{ {
@@ -285,7 +300,9 @@ krb5_vlog_msg(krb5_context context,
t = time(NULL); t = time(NULL);
strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&t)); strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&t));
for(i = 0; i < fac->len; i++) for(i = 0; i < fac->len; i++)
(*fac->val[i].log)(&fac->val[i], buf, msg); if(fac->val[i].min <= level &&
(fac->val[i].max == 0 || fac->val[i].max >= level))
(*fac->val[i].log)(&fac->val[i], buf, msg);
*reply = msg; *reply = msg;
return 0; return 0;
} }
@@ -293,13 +310,14 @@ krb5_vlog_msg(krb5_context context,
krb5_error_code krb5_error_code
krb5_vlog(krb5_context context, krb5_vlog(krb5_context context,
krb5_log_facility *fac, krb5_log_facility *fac,
int level,
const char *fmt, const char *fmt,
va_list ap) va_list ap)
{ {
char *msg; char *msg;
krb5_error_code ret; krb5_error_code ret;
ret = krb5_vlog_msg(context, fac, &msg, fmt, ap); ret = krb5_vlog_msg(context, fac, &msg, level, fmt, ap);
free(msg); free(msg);
return ret; return ret;
} }
@@ -307,6 +325,7 @@ krb5_vlog(krb5_context context,
krb5_error_code krb5_error_code
krb5_log_msg(krb5_context context, krb5_log_msg(krb5_context context,
krb5_log_facility *fac, krb5_log_facility *fac,
int level,
char **reply, char **reply,
const char *fmt, const char *fmt,
...) ...)
@@ -315,7 +334,7 @@ krb5_log_msg(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
va_start(ap, fmt); va_start(ap, fmt);
ret = krb5_vlog_msg(context, fac, reply, fmt, ap); ret = krb5_vlog_msg(context, fac, reply, level, fmt, ap);
va_end(ap); va_end(ap);
return ret; return ret;
} }
@@ -324,6 +343,7 @@ krb5_log_msg(krb5_context context,
krb5_error_code krb5_error_code
krb5_log(krb5_context context, krb5_log(krb5_context context,
krb5_log_facility *fac, krb5_log_facility *fac,
int level,
const char *fmt, const char *fmt,
...) ...)
{ {
@@ -331,7 +351,7 @@ krb5_log(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
va_start(ap, fmt); va_start(ap, fmt);
ret = krb5_vlog(context, fac, fmt, ap); ret = krb5_vlog(context, fac, level, fmt, ap);
va_end(ap); va_end(ap);
return ret; return ret;
} }