View | Details | Raw Unified | Return to bug 257866 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/sssd/files/patch-configure.ac (-1 / +17 lines)
Lines 1-7 Link Here
1 
diff --git configure.ac configure.ac
 1 
diff --git configure.ac configure.ac
2 
index 9df463d9c..17d0d9ea7 100644
 2 
index 9df463d9c..17d0d9ea7 100644
3 
--- configure.ac
 3 
--- configure.ac
4 
+++ configure.ac
 4 
+++ configure.ac	2021-10-13 16:29:18.263955000 -0400
5 
@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
 5 
@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
6 
 AC_CHECK_HEADERS(stdint.h dlfcn.h)
 6 
 AC_CHECK_HEADERS(stdint.h dlfcn.h)
7 
 AC_CONFIG_HEADER(config.h)
 7 
 AC_CONFIG_HEADER(config.h)
Lines 11-13 index 9df463d9c..17d0d9ea7 100644 Link Here
11 
 m4_include([src/build_macros.m4])
 11 
 m4_include([src/build_macros.m4])
12 
 BUILD_WITH_SHARED_BUILD_DIR
 12 
 BUILD_WITH_SHARED_BUILD_DIR
13
13
14 
@@ -62,4 +60,15 @@
15
16 
 AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" != "x"])
17 
+
18 
+AC_COMPILE_IFELSE(
19 
+    [AC_LANG_PROGRAM([[#include <string.h>]],
20 
+        [[(void)mempcpy(NULL, NULL, 0);]])],
21 
+    [AC_DEFINE([HAVE_MEMPCPY], [1], [mempcpy() available])
22 
+     HAVE_MEMPCPY=1
23 
+    ],
24 
+    [AC_MSG_WARN([mempcpy() not found, will use private implementation])])
25 
+
26 
+
27 
+AM_CONDITIONAL([HAVE_MEMPCPY], [test x"$HAVE_MEMPCPY" != "x"])
28
29 
 # Check library for the timer_create function
(-)b/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c (-1 / +3 lines)
Lines 2-16 diff --git src/util/crypto/nss/nss_sha512crypt.c src/util/crypto/nss/nss_sha512c Link Here
2 
index 4d0594d9f..49801222d 100644
 2 
index 4d0594d9f..49801222d 100644
3 
--- src/util/crypto/nss/nss_sha512crypt.c
 3 
--- src/util/crypto/nss/nss_sha512crypt.c
4 
+++ src/util/crypto/nss/nss_sha512crypt.c
 4 
+++ src/util/crypto/nss/nss_sha512crypt.c
5 
@@ -29,6 +29,12 @@
 5 
@@ -29,6 +29,14 @@
6 
 #include <sechash.h>
 6 
 #include <sechash.h>
7 
 #include <pk11func.h>
 7 
 #include <pk11func.h>
8
8
9 
+#ifndef HAVE_MEMPCPY
9 
+static void *
 10 
+static void *
10 
+mempcpy (void *dest, const void *src, size_t n)
 11 
+mempcpy (void *dest, const void *src, size_t n)
11 
+{
 12 
+{
12 
+  return (char *) memcpy (dest, src, n) + n;
 13 
+  return (char *) memcpy (dest, src, n) + n;
13 
+}
 14 
+}
15 
+#endif /* HAVE_MEMPCPY */
14 
+
 16 
+
15 
 /* Define our magic string to mark salt for SHA512 "encryption" replacement. */
 17 
 /* Define our magic string to mark salt for SHA512 "encryption" replacement. */
16 
 const char sha512_salt_prefix[] = "$6$";
 18 
 const char sha512_salt_prefix[] = "$6$";

Return to bug 257866