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

Default to SYSLOG' when there is no default' in krb5.conf.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2716 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-06 18:38:16 +00:00
parent 4b6ab028c4
commit c114d1a2e7
1 changed files with 78 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
lib/krb5/log.c
View File

@@ -205,80 +205,96 @@ open_file(struct facility *fac, char *filename, char *mode,
fac->data = fd; fac->data = fd;
} }
static int
openlog_int(krb5_context context, const char *program,
krb5_log_facility *f, const char *p)
{
struct facility *fp = NULL;
int min = 0, max = -1, n;
char c;
n = sscanf(p, "%d%c%d/", &min, &c, &max);
if(n == 2){
if(c == '/')
if(min < 0){
max = -min;
min = 0;
}else{
max = min;
}
}
if(n){
p = strchr(p, '/');
if(p == NULL) return 0;
p++;
}
if(strcmp(p, "STDERR") == 0){
fp = log_realloc(f);
open_file(fp, NULL, NULL, stderr, 1);
}else if(strcmp(p, "CONSOLE") == 0){
fp = log_realloc(f);
open_file(fp, "/dev/console", "w", NULL, 0);
}else if(strncmp(p, "FILE:", 4) == 0 && (p[4] == ':' || p[4] == '=')){
char *fn;
FILE *file = NULL;
int keep_open = 0;
fp = log_realloc(f);
fn = strdup(p + 5);
if(p[4] == '='){
int i = open(fn, O_WRONLY | O_CREAT |
O_TRUNC | O_APPEND, 0666);
file = fdopen(i, "a");
keep_open = 1;
}
open_file(fp, fn, "a", file, keep_open);
}else if(strncmp(p, "DEVICE=", 6) == 0){
fp = log_realloc(f);
open_file(fp, strdup(p + 7), "w", NULL, 0);
}else if(strncmp(p, "SYSLOG", 6) == 0){
char *severity;
char *facility;
severity = strchr(p, ':');
if(severity == NULL)
severity = "ERR";
facility = strchr(severity, ':');
if(facility == NULL)
facility = "AUTH";
fp = log_realloc(f);
open_syslog(program, severity, facility, fp);
}
if(fp){
fp->min = min;
fp->max = max;
}
return 0;
}
krb5_error_code krb5_error_code
krb5_openlog(krb5_context context, krb5_openlog(krb5_context context,
const char *program, const char *program,
krb5_log_facility **fac) krb5_log_facility **fac)
{ {
const char *p; const char *p;
const char *logname = program; krb5_log_facility *f = calloc(1, sizeof(*f));
krb5_log_facility *f;
struct facility *fp;
krb5_config_binding *binding = NULL; krb5_config_binding *binding = NULL;
f = calloc(1, sizeof(*f)); int done = 0;
if(krb5_config_get_string(context->cf, "logging", program, NULL) == NULL)
logname = "default";
while(p = krb5_config_get_next(context->cf, &binding, STRING, while(p = krb5_config_get_next(context->cf, &binding, STRING,
"logging", "logging",
logname, program,
NULL)){ NULL)){
struct facility *fp = NULL; openlog_int(context, program, f, p);
int min = 0, max = -1, n; done = 1;
char c; }
n = sscanf(p, "%d%c%d/", &min, &c, &max); if(!done){
if(n == 2){ while(p = krb5_config_get_next(context->cf, &binding, STRING,
if(c == '/') "logging",
if(min < 0){ "default",
max = -min; NULL)){
min = 0; openlog_int(context, program, f, p);
}else{ done = 1;
max = min;
}
}
if(n){
p = strchr(p, '/');
if(p == NULL) continue;
p++;
}
if(strcmp(p, "STDERR") == 0){
fp = log_realloc(f);
open_file(fp, NULL, NULL, stderr, 1);
}else if(strcmp(p, "CONSOLE") == 0){
fp = log_realloc(f);
open_file(fp, "/dev/console", "w", NULL, 0);
}else if(strncmp(p, "FILE:", 4) == 0 && (p[4] == ':' || p[4] == '=')){
char *fn;
FILE *file = NULL;
int keep_open = 0;
fp = log_realloc(f);
fn = strdup(p + 5);
if(p[4] == '='){
int i = open(fn, O_WRONLY | O_CREAT |
O_TRUNC | O_APPEND, 0666);
file = fdopen(i, "a");
keep_open = 1;
}
open_file(fp, fn, "a", file, keep_open);
}else if(strncmp(p, "DEVICE=", 6) == 0){
fp = log_realloc(f);
open_file(fp, strdup(p + 7), "w", NULL, 0);
}else if(strncmp(p, "SYSLOG", 6) == 0){
char *severity;
char *facility;
severity = strchr(p, ':');
if(severity == NULL)
severity = "ERR";
facility = strchr(severity, ':');
if(facility == NULL)
facility = "AUTH";
fp = log_realloc(f);
open_syslog(program, severity, facility, fp);
}
if(fp){
fp->min = min;
fp->max = max;
} }
} }
if(!done)
openlog_int(context, program, f, "SYSLOG");
*fac = f; *fac = f;
return 0; return 0;
} }