[mod_auth_mysql/f15] remove make_scrambled_password_323, not exported in fedoras libmysql

[Ján ONDREJ]

commit 4199653dd7424ad87f621e1b649d42d2b3a7917c
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Wed Jun 8 22:58:55 2011 +0200

    remove make_scrambled_password_323, not exported in fedoras libmysql

 mod_auth_mysql.spec                          |    6 +++---
 mod_auth_mysql_make_scrambled_password.patch |   23 ++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/mod_auth_mysql.spec b/mod_auth_mysql.spec
index 58fbd59..d468de5 100644
--- a/mod_auth_mysql.spec
+++ b/mod_auth_mysql.spec
@@ -1,7 +1,7 @@
 Summary: Basic authentication for the Apache web server using a MySQL database
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
@@ -55,8 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
-* Wed Jun 08 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1:3.0.0-17
-- also fix make_scrambled_password_323
+* Wed Jun 08 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1:3.0.0-18
+- remove make_scrambled_password_323, not exported in fedoras libmysql
 
 * Wed Jun 08 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1:3.0.0-15
 - mod_auth_mysql.so: undefined symbol: make_scrambled_password error
diff --git a/mod_auth_mysql_make_scrambled_password.patch b/mod_auth_mysql_make_scrambled_password.patch
index f6c98e1..3487bf4 100644
--- a/mod_auth_mysql_make_scrambled_password.patch
+++ b/mod_auth_mysql_make_scrambled_password.patch
@@ -1,21 +1,18 @@
---- mod_auth_mysql-3.0.0/mod_auth_mysql.c.scrambled	2011-06-08 21:53:32.294239782 +0200
-+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c	2011-06-08 22:13:37.757060039 +0200
-@@ -808,12 +808,16 @@
+--- mod_auth_mysql-3.0.0/mod_auth_mysql.c.scrambled	2011-06-08 22:52:09.123339737 +0200
++++ mod_auth_mysql-3.0.0/mod_auth_mysql.c	2011-06-08 22:54:22.793714558 +0200
+@@ -808,12 +808,9 @@
  /* Checks scrambled passwords */
  static short pw_scrambled(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
    char * encrypted_sent_pw = PCALLOC(pool, SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
-+  void my_make_scrambled_password_323(char *to, const char *password,
-+                                      size_t pass_len);
-+  void my_make_scrambled_password(char *to, const char *password,                 
-+                                  size_t pass_len);
- #ifdef SCRAMBLED_PASSWORD_CHAR_LENGTH_323   /* If we may need to use old password */
-   if (real_pw[0] != '*')
+-#ifdef SCRAMBLED_PASSWORD_CHAR_LENGTH_323   /* If we may need to use old password */
+-  if (real_pw[0] != '*')
 -    make_scrambled_password_323(encrypted_sent_pw, sent_pw);
-+    my_make_scrambled_password_323(encrypted_sent_pw, sent_pw, strlen(sent_pw));
-   else
- #endif
+-  else
+-#endif
 -    make_scrambled_password(encrypted_sent_pw, sent_pw);
-+    my_make_scrambled_password(encrypted_sent_pw, sent_pw, strlen(sent_pw));
++  void my_make_scrambled_password(char *to, const char *password,             
++                                  size_t pass_len);
++  my_make_scrambled_password(encrypted_sent_pw, sent_pw, strlen(sent_pw));
    return strcmp(real_pw, encrypted_sent_pw) == 0;
  }