26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
Index: libxcrypt-4.3.3/crypt.h.in.in
|
|
===================================================================
|
|
--- libxcrypt-4.3.3.orig/crypt.h.in.in
|
|
+++ libxcrypt-4.3.3/crypt.h.in.in
|
|
@@ -178,12 +178,14 @@ extern char *crypt_gensalt_rn (const cha
|
|
char *__output, int __output_size)
|
|
__THROW;
|
|
|
|
-/* Identical to crypt_gensalt_rn. Kept for code compatibility with
|
|
- older versions (v3.1.1 and earlier) of libxcrypt. */
|
|
-extern char *crypt_gensalt_r (const char *__prefix, unsigned long __count,
|
|
- const char *__rbytes, int __nrbytes,
|
|
- char *__output, int __output_size)
|
|
-__THROW;
|
|
+/* Kept for code compatibility with older versions (v3.1.1 and earlier)
|
|
+ of libxcrypt.
|
|
+ We intentionally define a macro here, since we actually want to
|
|
+ link compiled applications against the identical crypt_gensalt_rn
|
|
+ function. */
|
|
+#ifndef IN_LIBCRYPT /* Defined when building libxcrypt. */
|
|
+# define crypt_gensalt_r crypt_gensalt_rn
|
|
+#endif
|
|
|
|
/* Another thread-safe version of crypt_gensalt; the generated setting
|
|
string is in storage allocated by malloc, and should be deallocated
|