diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2012-07-24 14:13:21 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2012-07-30 07:42:06 +0200 |
| commit | e01603d72813053a6ba8414e6337062c3bdacd73 (patch) | |
| tree | 4b9490ff4a654f6086594a9786f14bf9d28a9d9e | |
| parent | e26286847d4325d4c75cb5c661ddfc10af840177 (diff) | |
| download | libumberlog-e01603d72813053a6ba8414e6337062c3bdacd73.tar.gz libumberlog-e01603d72813053a6ba8414e6337062c3bdacd73.tar.xz libumberlog-e01603d72813053a6ba8414e6337062c3bdacd73.zip | |
Don't set up caches if UL_NO_DISCOVER is set
We won't need the data in that case.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| -rw-r--r-- | lib/umberlog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/umberlog.c b/lib/umberlog.c index fa5934f..1697c12 100644 --- a/lib/umberlog.c +++ b/lib/umberlog.c @@ -107,12 +107,12 @@ ul_openlog (const char *ident, int option, int facility) ul_process_data.facility = facility; ul_process_data.ident = ident; - if ((ul_process_data.flags & LOG_UL_NOCACHE) != 0) + if ((ul_process_data.flags & (LOG_UL_NODISCOVER | LOG_UL_NOCACHE)) != 0) ul_process_data.pid = -1; else ul_process_data.pid = getpid (); - if ((ul_process_data.flags & LOG_UL_NOCACHE) != 0 || - (ul_process_data.flags & LOG_UL_NOCACHE_UID) != 0) + if ((ul_process_data.flags & + (LOG_UL_NODISCOVER | LOG_UL_NOCACHE | LOG_UL_NOCACHE_UID)) != 0) { ul_process_data.gid = (gid_t)-1; ul_process_data.uid = (uid_t)-1; @@ -122,7 +122,7 @@ ul_openlog (const char *ident, int option, int facility) ul_process_data.gid = getgid (); ul_process_data.uid = getuid (); } - if ((ul_process_data.flags & LOG_UL_NOCACHE) != 0) + if ((ul_process_data.flags & (LOG_UL_NODISCOVER | LOG_UL_NOCACHE)) != 0) ul_process_data.hostname[0] = '\0'; else gethostname (ul_process_data.hostname, _POSIX_HOST_NAME_MAX); |