mirror of
https://passt.top/passt
synced 2025-08-13 10:33:13 +02:00
passt: Static builds: don't redefine __vsyslog(), skip getpwnam() and initgroups()
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
1fd0c9b0e1
commit
2c7d1ce088
5 changed files with 21 additions and 12 deletions
11
util.c
11
util.c
|
@ -37,7 +37,7 @@
|
|||
#include "util.h"
|
||||
#include "passt.h"
|
||||
|
||||
/* For __openlog() and __setlogmask() wrappers, and __vsyslog() (replacement) */
|
||||
/* For __openlog() and __setlogmask() wrappers, and passt_vsyslog() */
|
||||
static int log_mask;
|
||||
static int log_sock = -1;
|
||||
static char log_ident[BUFSIZ];
|
||||
|
@ -56,7 +56,7 @@ void name(const char *format, ...) { \
|
|||
tp.tv_nsec / (100 * 1000)); \
|
||||
} else { \
|
||||
va_start(args, format); \
|
||||
__vsyslog(level, format, args); \
|
||||
passt_vsyslog(level, format, args); \
|
||||
va_end(args); \
|
||||
} \
|
||||
\
|
||||
|
@ -121,12 +121,12 @@ void __setlogmask(int mask)
|
|||
}
|
||||
|
||||
/**
|
||||
* __vsyslog() - vsyslog() implementation not using heap memory
|
||||
* passt_vsyslog() - vsyslog() implementation not using heap memory
|
||||
* @pri: Facility and level map, same as priority for vsyslog()
|
||||
* @format: Same as vsyslog() format
|
||||
* @ap: Same as vsyslog() ap
|
||||
*/
|
||||
void __vsyslog(int pri, const char *format, va_list ap)
|
||||
void passt_vsyslog(int pri, const char *format, va_list ap)
|
||||
{
|
||||
char buf[BUFSIZ];
|
||||
int n;
|
||||
|
@ -389,6 +389,9 @@ char *line_read(char *buf, size_t len, int fd)
|
|||
|
||||
p = buf + strlen(buf) + 1;
|
||||
|
||||
while (*p == '\n' && strlen(p) && (size_t)(p - buf) < len)
|
||||
p++;
|
||||
|
||||
if (!(nl = strchr(p, '\n')))
|
||||
return NULL;
|
||||
*nl = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue