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

Declare kdc log functions to be printf-like

Browse Source 
And add a kdc_vlog() function.
This commit is contained in:
Nicolas Williams
2019-06-24 11:45:22 -05:00
parent 7fc90ce1c8
commit 9c51900238
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kdc/connect.c
View File

@@ -1255,15 +1255,15 @@ start_kdc(krb5_context context,
} }
end: end:
kdc_log(context, config, 0, "KDC master process exiting", pid); kdc_log(context, config, 0, "KDC master process exiting");
free(pids); free(pids);
} else { } else {
loop(context, config, d, ndescr, -1); loop(context, config, d, ndescr, -1);
kdc_log(context, config, 0, "KDC exiting", pid); kdc_log(context, config, 0, "KDC exiting");
} }
#else #else
loop(context, config, d, ndescr, -1); loop(context, config, d, ndescr, -1);
kdc_log(context, config, 0, "KDC exiting", pid); kdc_log(context, config, 0, "KDC exiting");
#endif #endif
free(d); free(d);

4
kdc/default_config.c
View File

@@ -97,9 +97,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
digests); digests);
c->enable_digest = 0; c->enable_digest = 0;
} else if (c->digests_allowed == 0) { } else if (c->digests_allowed == 0) {
kdc_log(context, c, 0, kdc_log(context, c, 0, "no digest enable, turning digest off");
"no digest enable, turning digest off",
digests);
c->enable_digest = 0; c->enable_digest = 0;
} }
} }

2
kdc/digest-service.c
View File

@@ -127,7 +127,7 @@ ntlm_service(void *ctx, const heim_idata *req,
} }
kdc_log(context, config, 2, kdc_log(context, config, 2,
"digest-request: found user, processing ntlm request", ret); "digest-request: found user, processing ntlm request");
if (ntq.ntChallengeResponce.length != 24) { if (ntq.ntChallengeResponce.length != 24) {
struct ntlm_buf infotarget, answer; struct ntlm_buf infotarget, answer;

4
kdc/kerberos5.c
View File

@@ -1452,7 +1452,7 @@ kdc_check_flags(krb5_context context,
if (server->flags.locked_out) { if (server->flags.locked_out) {
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Client server locked out -- %s", server_name); "Server locked out -- %s", server_name);
return KRB5KDC_ERR_POLICY; return KRB5KDC_ERR_POLICY;
} }
if (server->flags.invalid) { if (server->flags.invalid) {
@@ -1498,7 +1498,7 @@ kdc_check_flags(krb5_context context,
krb5_format_time(context, *server->pw_end, krb5_format_time(context, *server->pw_end,
pwend_str, sizeof(pwend_str), TRUE); pwend_str, sizeof(pwend_str), TRUE);
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Server's key has expired at -- %s", "Server's key has expired at %s -- %s",
pwend_str, server_name); pwend_str, server_name);
return KRB5KDC_ERR_KEY_EXPIRED; return KRB5KDC_ERR_KEY_EXPIRED;
} }

19
kdc/log.c
View File

@@ -60,10 +60,14 @@ kdc_openlog(krb5_context context,
krb5_set_warn_dest(context, config->logf); krb5_set_warn_dest(context, config->logf);
} }
#undef __attribute__
#define __attribute__(X)
char* char*
kdc_log_msg_va(krb5_context context, kdc_log_msg_va(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
int level, const char *fmt, va_list ap) int level, const char *fmt, va_list ap)
__attribute__ ((__format__ (__printf__, 4, 0)))
{ {
char *msg; char *msg;
krb5_vlog_msg(context, config->logf, &msg, level, fmt, ap); krb5_vlog_msg(context, config->logf, &msg, level, fmt, ap);
@@ -74,6 +78,7 @@ char*
kdc_log_msg(krb5_context context, kdc_log_msg(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
int level, const char *fmt, ...) int level, const char *fmt, ...)
__attribute__ ((__format__ (__printf__, 4, 5)))
{ {
va_list ap; va_list ap;
char *s; char *s;
@@ -83,15 +88,23 @@ kdc_log_msg(krb5_context context,
return s; return s;
} }
void
kdc_vlog(krb5_context context,
krb5_kdc_configuration *config,
int level, const char *fmt, va_list ap)
__attribute__ ((__format__ (__printf__, 4, 0)))
{
free(kdc_log_msg_va(context, config, level, fmt, ap));
}
void void
kdc_log(krb5_context context, kdc_log(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
int level, const char *fmt, ...) int level, const char *fmt, ...)
__attribute__ ((__format__ (__printf__, 4, 5)))
{ {
va_list ap; va_list ap;
char *s;
va_start(ap, fmt); va_start(ap, fmt);
s = kdc_log_msg_va(context, config, level, fmt, ap); free(kdc_log_msg_va(context, config, level, fmt, ap));
if(s) free(s);
va_end(ap); va_end(ap);
} }