ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

attest: Disable syslog logging if syslog() missing

This commit is contained in:
Martin Willi 2014-01-08 12:03:58 +01:00
parent a81a04d39e
commit 3f8a818610
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/libpts/plugins/imv_attestation/attest.c
View File

@ -19,8 +19,10 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <syslog.h>
#include <libgen.h>
#ifdef HAVE_SYSLOG
# include <syslog.h>
#endif
#include <library.h>
#include <utils/debug.h>
@ -43,9 +45,6 @@ static bool stderr_quiet = TRUE;
*/
static void attest_dbg(debug_t group, level_t level, char *fmt, ...)
{
int priority = LOG_INFO;
char buffer[8192];
char *current = buffer, *next;
va_list args;
if (level <= debug_level)
@ -58,22 +57,30 @@ static void attest_dbg(debug_t group, level_t level, char *fmt, ...)
va_end(args);
}
/* write in memory buffer first */
va_start(args, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
/* do a syslog with every line */
while (current)
#ifdef HAVE_SYSLOG
{
next = strchr(current, '\n');
if (next)
int priority = LOG_INFO;
char buffer[8192];
char *current = buffer, *next;
/* write in memory buffer first */
va_start(args, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
/* do a syslog with every line */
while (current)
{
*(next++) = '\0';
next = strchr(current, '\n');
if (next)
{
*(next++) = '\0';
}
syslog(priority, "%s\n", current);
current = next;
}
syslog(priority, "%s\n", current);
current = next;
}
#endif /* HAVE_SYSLOG */
}
}
@ -91,7 +98,9 @@ static void cleanup(void)
attest->destroy(attest);
libpts_deinit();
libimcv_deinit();
#ifdef HAVE_SYSLOG
closelog();
#endif
}
static void do_args(int argc, char *argv[])
@ -440,7 +449,9 @@ int main(int argc, char *argv[])
/* enable attest debugging hook */
dbg = attest_dbg;
#ifdef HAVE_SYSLOG
openlog("attest", 0, LOG_DEBUG);
#endif
atexit(library_deinit);
@ -474,4 +485,3 @@ int main(int argc, char *argv[])
exit(EXIT_SUCCESS);
}