Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > 11f97bbd2adce813d2e3f0d63eb2159f > files > 43

glibc-2.20-22.mga5.src.rpm

diff -p -up glibc-2.9/crypt/crypt-entry.c.orig glibc-2.9/crypt/crypt-entry.c
--- glibc-2.9/crypt/crypt-entry.c.orig	2009-01-15 10:43:01.000000000 -0500
+++ glibc-2.9/crypt/crypt-entry.c	2009-01-15 10:43:18.000000000 -0500
@@ -164,18 +164,3 @@ crypt (key, salt)
 #endif
 
 
-/*
- * To make fcrypt users happy.
- * They don't need to call init_des.
- */
-#ifdef _LIBC
-weak_alias (crypt, fcrypt)
-#else
-char *
-__fcrypt (key, salt)
-     const char *key;
-     const char *salt;
-{
-  return crypt (key, salt);
-}
-#endif
diff -p -up glibc-2.14.1/crypt/wrapper.c.orig glibc-2.14.1/crypt/wrapper.c
--- glibc-2.14.1/crypt/wrapper.c.orig
+++ glibc-2.14.1/crypt/wrapper.c
@@ -324,9 +324,25 @@ weak_alias(__crypt, crypt)
 weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
 weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
 weak_alias(__crypt_gensalt, crypt_gensalt)
-weak_alias(crypt, fcrypt)
 #endif
 
+/*
+ * To make fcrypt users happy.
+ * They don't need to call init_des.
+ */
+#ifdef _LIBC
+weak_alias (crypt, fcrypt)
+#else
+char * 
+__fcrypt (key, salt)
+    const char *key;
+    const char *salt;
+{
+    return crypt (key, salt);
+}
+#endif
+
+
 #ifdef TEST
 static const char *tests[][3] = {
 	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",