46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
--- lib/nss_parse.y.orig 2016-01-10 10:07:26.854512310 +0100
|
|
+++ lib/nss_parse.y 2016-01-10 10:07:53.134783321 +0100
|
|
@@ -28,6 +28,10 @@
|
|
#include "nsswitch.h"
|
|
#include "nss_parse.tab.h"
|
|
|
|
+#ifndef _PATH_NSSWITCH_CONF
|
|
+#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf"
|
|
+#endif
|
|
+
|
|
static pthread_mutex_t parse_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
static struct list_head *nss_list;
|
|
--- daemon/automount.c.orig 2016-01-10 10:10:23.680333952 +0100
|
|
+++ daemon/automount.c 2016-01-10 10:10:35.599456586 +0100
|
|
@@ -37,6 +37,14 @@
|
|
#include <sys/vfs.h>
|
|
#include <sys/utsname.h>
|
|
|
|
+#ifndef __SWORD_TYPE
|
|
+# if __WORDSIZE == 32 /* System word size */
|
|
+# define __SWORD_TYPE int
|
|
+# else /* __WORDSIZE == 64 */
|
|
+# define __SWORD_TYPE long int
|
|
+# endif
|
|
+#endif
|
|
+
|
|
#include "automount.h"
|
|
#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
|
|
#include <dlfcn.h>
|
|
--- lib/log.c.orig 2019-03-30 10:49:52.965336128 +0100
|
|
+++ lib/log.c 2019-03-30 10:50:43.232710045 +0100
|
|
@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
|
|
char buffer[ATTEMPT_ID_SIZE + 1];
|
|
char *prefixed_msg = NULL;
|
|
|
|
- attempt_id = pthread_getspecific(key_thread_attempt_id);
|
|
+ if (key_thread_attempt_id) {
|
|
+ attempt_id = pthread_getspecific(key_thread_attempt_id);
|
|
+ } else {
|
|
+ attempt_id = 0;
|
|
+ }
|
|
if (attempt_id) {
|
|
int len = sizeof(buffer) + 1 + strlen(msg) + 1;
|
|
|