Merge lp:~abychko/percona-server/bug1050654 into lp:percona-server/5.5

[Alexey Bychko]

[+] added Fedora linker script to the build to split symbols by versions
jenkins job and install test are ok

[+] added symbols for compatibility
php build and php bundled tests are ok

[Alexey Kopytov (akopytov)]

See http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3644.1.2 for the detailed problem analysis and proposed fix.

That fix, however, introduced another problem: https://mariadb.atlassian.net/browse/MDEV-4127

But should we consider that approach to fix the problem in general?

review: Needs Information

[Alexey Bychko (abychko)]

seems fix is incomplete, working on ABI test now

[Alexey Bychko (abychko)]

seems fixed properly now

[Vadim Tkachenko (vadim-tk)]

Do we need fixed in mysql-5.5.28/client/mysqladmin.cc here ?

review: Needs Information

[Alexey Bychko (abychko)]

build/rpm/mysql-dubious-exports.patch is Fedora patch and contains several functions for mysql compatibility. in PS it will be applied only to RPM. if Debian systems contains the same compatibility symbols, then patch will be applied to the tree and deleted

[Raghavendra D Prabhu (raghavendra-prabhu)]

I see mysql_client_errors being added to libmysqlclient_16.1 here -- https://lists.fedoraproject.org/pipermail/scm-commits/2010-December/537257.html

[Alexey Kopytov (akopytov)]

That was for 5.5.8, i.e. before libmysqlclient_16/18 separation which happened in 5.5.10 as a fix for http://bugs.mysql.com/bug.php?id=60061.

[Alexey Kopytov (akopytov)]

This looks good to me, but please get Ignacio's opinion.

review: Approve

[Ignacio Nin (ignacio-nin)]

> This looks good to me, but please get Ignacio's opinion.

Hello,

The patch looks good, however the description for lp:1050654 doesn't seem to describe correctly the bug/feature anymore, since the error reported doesn't apply anymore (also notice similarites to bug lp:1031427).

At the time, what does exactly the bug fix -- does it give compatibility with remi's repos? Also, should this be tested on Fedora?

Thanks!

review: Needs Information

[Alexey Bychko (abychko)]

yes, it can give compatibility with remi, atomic and other repos. i have it tested on Centos and we have customers running this patch for production. ovais@ can give the details.
i don't know if the fix should be tested on Fedora, because it's not fully supported distribution.

[Roel Van de Paar (roel11)]

Fedora is indeed not supported. Centos working fine is enough.

[Roel Van de Paar (roel11)]

Note that the 5.5 patch was already pushed into Percona Server 5.5.31-30.3.

[Roel Van de Paar (roel11)]

s/was already pushed/is ready to be pushed/ - the 5.6 patch is missing.

[Alexey Kopytov (akopytov)]

OK, changing to WiP, since we now require 5.6 MPs.

=== modified file 'Percona-Server/include/errmsg.h'
--- Percona-Server/include/errmsg.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/include/errmsg.h	2013-04-09 12:03:23 +0000
@@ -25,6 +25,7 @@
 void	init_client_errs(void);
 void	finish_client_errs(void);
 extern const char *client_errors[];	/* Error messages */
+extern const char **mysql_client_errors;	/* Error messages */
 #ifdef	__cplusplus
 }
 #endif
 
=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt	2012-02-16 09:48:16 +0000
+++ Percona-Server/libmysql/CMakeLists.txt	2013-04-09 12:03:23 +0000
@@ -208,8 +208,11 @@
       IF(NOT libmysql_link_flag)
         SET(libmysql_link_flags)
       ENDIF()
-      SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
-        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+    IF(INSTALL_LAYOUT STREQUAL "RPM")
+      SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmysql.map ${LINK_FLAG_NO_UNDEFINED}")
+    ELSE()
+      SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+    ENDIF(INSTALL_LAYOUT STREQUAL "RPM")
     ENDIF() 
     # clean direct output needs to be set several targets have the same name
     #(mysqlclient in this case)
 
=== modified file 'Percona-Server/libmysql/errmsg.c'
--- Percona-Server/libmysql/errmsg.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/libmysql/errmsg.c	2013-04-09 12:03:23 +0000
@@ -23,6 +23,7 @@
 #include <my_sys.h>
 #include "errmsg.h"
 
+const char **mysql_client_errors = client_errors;
 const char *client_errors[]=
 {
   "Unknown MySQL error",
 
=== added file 'Percona-Server/libmysql/libmysql.map'
--- Percona-Server/libmysql/libmysql.map	1970-01-01 00:00:00 +0000
+++ Percona-Server/libmysql/libmysql.map	2013-04-09 12:03:23 +0000
@@ -0,0 +1,146 @@
+# symbols exported from mysql 5.1
+libmysqlclient_16 {
+  global:
+	_fini;
+	_init;
+	my_init;
+	myodbc_remove_escape;
+	mysql_affected_rows;
+	mysql_autocommit;
+	mysql_change_user;
+	mysql_character_set_name;
+	mysql_close;
+	mysql_commit;
+	mysql_data_seek;
+	mysql_debug;
+	mysql_dump_debug_info;
+	mysql_embedded;
+	mysql_eof;
+	mysql_errno;
+	mysql_error;
+	mysql_escape_string;
+	mysql_fetch_field;
+	mysql_fetch_field_direct;
+	mysql_fetch_fields;
+	mysql_fetch_lengths;
+	mysql_fetch_row;
+	mysql_field_count;
+	mysql_field_seek;
+	mysql_field_tell;
+	mysql_free_result;
+	mysql_get_character_set_info;
+	mysql_get_client_info;
+	mysql_get_client_version;
+	mysql_get_host_info;
+	mysql_get_parameters;
+	mysql_get_proto_info;
+	mysql_get_server_info;
+	mysql_get_server_version;
+	mysql_get_ssl_cipher;
+	mysql_hex_string;
+	mysql_info;
+	mysql_init;
+	mysql_insert_id;
+	mysql_kill;
+	mysql_list_dbs;
+	mysql_list_fields;
+	mysql_list_processes;
+	mysql_list_tables;
+	mysql_more_results;
+	mysql_next_result;
+	mysql_num_fields;
+	mysql_num_rows;
+	mysql_options;
+	mysql_ping;
+	mysql_query;
+	mysql_read_query_result;
+	mysql_real_connect;
+	mysql_real_escape_string;
+	mysql_real_query;
+	mysql_refresh;
+	mysql_rollback;
+	mysql_row_seek;
+	mysql_row_tell;
+	mysql_select_db;
+	mysql_send_query;
+	mysql_server_end;
+	mysql_server_init;
+	mysql_set_character_set;
+	mysql_set_local_infile_default;
+	mysql_set_local_infile_handler;
+	mysql_set_server_option;
+	mysql_shutdown;
+	mysql_sqlstate;
+	mysql_ssl_set;
+	mysql_stat;
+	mysql_stmt_affected_rows;
+	mysql_stmt_attr_get;
+	mysql_stmt_attr_set;
+	mysql_stmt_bind_param;
+	mysql_stmt_bind_result;
+	mysql_stmt_close;
+	mysql_stmt_data_seek;
+	mysql_stmt_errno;
+	mysql_stmt_error;
+	mysql_stmt_execute;
+	mysql_stmt_fetch;
+	mysql_stmt_fetch_column;
+	mysql_stmt_field_count;
+	mysql_stmt_free_result;
+	mysql_stmt_init;
+	mysql_stmt_insert_id;
+	mysql_stmt_num_rows;
+	mysql_stmt_param_count;
+	mysql_stmt_param_metadata;
+	mysql_stmt_prepare;
+	mysql_stmt_reset;
+	mysql_stmt_result_metadata;
+	mysql_stmt_row_seek;
+	mysql_stmt_row_tell;
+	mysql_stmt_send_long_data;
+	mysql_stmt_sqlstate;
+	mysql_stmt_store_result;
+	mysql_store_result;
+	mysql_thread_end;
+	mysql_thread_id;
+	mysql_thread_init;
+	mysql_thread_safe;
+	mysql_use_result;
+	mysql_warning_count;
+# These are documented in Paul DuBois' MySQL book, so we treat them as part
+# of the de-facto API.
+	free_defaults;
+	handle_options;
+	load_defaults;
+	my_print_help;
+# This isn't really documented anywhere, but it seems to be part of the
+# de-facto API as well.  We're not going to export the deprecated version
+# make_scrambled_password, however.
+	my_make_scrambled_password;
+  local:
+	*;
+};
+# symbols added in mysql 5.5
+libmysqlclient_18 {
+  global:
+	mysql_client_find_plugin;
+	mysql_client_register_plugin;
+	mysql_load_plugin;
+	mysql_load_plugin_v;
+	mysql_plugin_options;
+	mysql_stmt_next_result;
+#
+# Ideally the following symbols wouldn't be exported, but various applications
+# require them.  We limit the namespace damage by prefixing mysql_
+# (see mysql-dubious-exports.patch), which means the symbols are not present
+# in libmysqlclient_16.
+#
+# mysql-connector-odbc requires these
+	mysql_default_charset_info;
+	mysql_get_charset;
+	mysql_get_charset_by_csname;
+	mysql_net_realloc;
+# PHP's mysqli.so requires this (via the ER() macro)
+	client_errors;
+	mysql_client_errors;
+};
 
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh	2013-03-06 10:47:52 +0000
+++ build/build-rpm.sh	2013-04-09 12:03:23 +0000
@@ -121,7 +121,7 @@
 
 # Create directories for rpmbuild if these don't exist
 (cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
-
+cp -f $(readlink -f $(dirname $0))/rpm/*.patch ${WORKDIR}/SOURCES/
 (
     cd "$SOURCEDIR"
  
@@ -133,7 +133,6 @@
     then
         sed -i 's/lib64/lib/' "$PRODUCT/cmake/install_layout.cmake"
     fi
-
     # Create tarball for build
     tar czf "$WORKDIR_ABS/SOURCES/$PRODUCT.tar.gz" "$PRODUCT/"*
 
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-08 06:26:11 +0000
+++ build/percona-server.spec	2013-04-09 12:03:23 +0000
@@ -209,10 +209,10 @@
 ##############################################################################
 
 %if %{commercial}
-%define license_files_server    %{src_dir}/LICENSE.mysql
+%define license_files_server    LICENSE.mysql
 %define license_type            Commercial
 %else
-%define license_files_server    %{src_dir}/COPYING %{src_dir}/README
+%define license_files_server    COPYING README
 %define license_type            GPL
 %endif
 
@@ -228,6 +228,7 @@
 Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2010, %{mysql_vendor}.  All rights reserved.  Use is subject to license terms.  Under %{license_type} license as shown in the Description field.
 Source:         http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-%{mysql_version}-%{majorversion}.%{minorversion}/source/%{src_dir}.tar.gz
+Patch1:         mysql-dubious-exports.patch
 URL:            http://www.percona.com/
 Packager:       Percona MySQL Development Team <[e-mail]>
 Vendor:         %{percona_server_vendor}
@@ -323,8 +324,10 @@
 
 ##############################################################################
 %prep
-%setup -T -a 0 -c -n %{src_dir}
-
+%setup -n %{src_dir}
+#
+%patch1 -p1 
+#
 ##############################################################################
 %build
 
@@ -337,7 +340,7 @@
     echo "Configuring HandlerSocket"
     CXX="${HS_CXX:-g++}" \
         MYSQL_CFLAGS="-I $RPM_BUILD_DIR/%{src_dir}/release/include" \
-        ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir}/%{src_dir} \
+        ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir} \
         --with-mysql-bindir=$RPM_BUILD_DIR/%{src_dir}/release/scripts \
         --with-mysql-plugindir=%{_libdir}/mysql/plugin \
         --libdir=%{_libdir} \
@@ -350,7 +353,7 @@
     cd UDF
     CXX="${UDF_CXX:-g++}"\
         CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
-        ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/%{src_dir}/include \
+        ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \
         --libdir=%{_libdir}/mysql/plugin
     make all
     cd -
@@ -405,7 +408,7 @@
                   -e 's/ $//'`
   # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
+  ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
@@ -422,7 +425,7 @@
   cd release
   # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
+  ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
@@ -432,7 +435,7 @@
            -DWITH_PAM=ON
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
   make ${MAKE_JFLAG}
-  cd ../%{src_dir}
+  cd ../
   d="`pwd`"
   BuildHandlerSocket
   BuildUDF
@@ -499,10 +502,10 @@
   cd $MBD/release
   make DESTDIR=$RBR benchdir_root=%{_datadir} install
   d="`pwd`"
-  cd $MBD/%{src_dir}/storage/HandlerSocket-Plugin-for-MySQL
+  cd $MBD/storage/HandlerSocket-Plugin-for-MySQL
   make DESTDIR=$RBR benchdir_root=%{_datadir} install
   cd "$d"
-  cd $MBD/%{src_dir}/UDF
+  cd $MBD/UDF
   make DESTDIR=$RBR benchdir_root=%{_datadir} install
   cd "$d"
 )
@@ -531,7 +534,7 @@
 touch $RBR%{_sysconfdir}/my.cnf
 
 # Install SELinux files in datadir
-install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
+install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
   $RBR%{_datadir}/mysql/SELinux/RHEL4
 
 %if %{WITH_TCMALLOC}
 
=== added directory 'build/rpm'
=== added file 'build/rpm/mysql-dubious-exports.patch'
--- build/rpm/mysql-dubious-exports.patch	1970-01-01 00:00:00 +0000
+++ build/rpm/mysql-dubious-exports.patch	2013-04-09 12:03:23 +0000
@@ -0,0 +1,158 @@
+Prefix mysql_ to the real names of several symbols that have to be exported
+from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
+This limits the intrusion on application namespace.
+
+Also, remove all traces of make_scrambled_password and
+make_scrambled_password_323, so that references to these functions draw
+compile-time warnings, per a suggestion from Paul Howarth in bug #690346.
+It doesn't seem worth trying to get rid of all the internal symbols exposed
+by mysql.h, but these two are relatively easy to get rid of.
+
+
+diff -up mysql-5.5.28/client/mysqladmin.cc.p8 mysql-5.5.28/client/mysqladmin.cc
+--- mysql-5.5.28/client/mysqladmin.cc.p8	2012-08-29 10:50:46.000000000 +0200
++++ mysql-5.5.28/client/mysqladmin.cc	2012-12-06 14:16:14.598520859 +0100
+@@ -21,6 +21,7 @@
+ #include <my_pthread.h>				/* because of signal()	*/
+ #include <sys/stat.h>
+ #include <mysql.h>
++#include <password.h>       /* my_make_scrambled_password_323, my_make_scrambled_password */
+ #include <sql_common.h>
+ #include <welcome_copyright_notice.h>           /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
+ 
+@@ -989,9 +990,9 @@ static int execute_commands(MYSQL *mysql
+           }
+         }
+         if (old)
+-          make_scrambled_password_323(crypted_pw, typed_password);
++          my_make_scrambled_password_323(crypted_pw, typed_password, strlen(typed_password));
+         else
+-          make_scrambled_password(crypted_pw, typed_password);
++          my_make_scrambled_password(crypted_pw, typed_password, strlen(typed_password));
+       }
+       else
+ 	crypted_pw[0]=0;			/* No password */
+diff -up mysql-5.5.28/include/mysql_com.h.p8 mysql-5.5.28/include/mysql_com.h
+--- mysql-5.5.28/include/mysql_com.h.p8	2012-08-29 10:50:46.000000000 +0200
++++ mysql-5.5.28/include/mysql_com.h	2012-12-06 14:16:14.599520860 +0100
+@@ -452,6 +452,7 @@ my_bool	my_net_init(NET *net, Vio* vio);
+ void	my_net_local_init(NET *net);
+ void	net_end(NET *net);
+   void	net_clear(NET *net, my_bool clear_buffer);
++#define net_realloc mysql_net_realloc		/* namespace sanity */
+ my_bool net_realloc(NET *net, size_t length);
+ my_bool	net_flush(NET *net);
+ my_bool	my_net_write(NET *net,const unsigned char *packet, size_t len);
+@@ -533,14 +534,12 @@ double my_rnd(struct rand_struct *);
+ void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
+ 
+ void hash_password(unsigned long *to, const char *password, unsigned int password_len);
+-void make_scrambled_password_323(char *to, const char *password);
+ void scramble_323(char *to, const char *message, const char *password);
+ my_bool check_scramble_323(const unsigned char *reply, const char *message,
+                            unsigned long *salt);
+ void get_salt_from_password_323(unsigned long *res, const char *password);
+ void make_password_from_salt_323(char *to, const unsigned long *salt);
+ 
+-void make_scrambled_password(char *to, const char *password);
+ void scramble(char *to, const char *message, const char *password);
+ my_bool check_scramble(const unsigned char *reply, const char *message,
+                        const unsigned char *hash_stage2);
+diff -up mysql-5.5.28/include/mysql.h.pp.p8 mysql-5.5.28/include/mysql.h.pp
+--- mysql-5.5.28/include/mysql.h.pp.p8	2012-08-29 10:50:46.000000000 +0200
++++ mysql-5.5.28/include/mysql.h.pp	2012-12-06 14:16:14.598520859 +0100
+@@ -86,7 +86,7 @@ my_bool my_net_init(NET *net, Vio* vio);
+ void my_net_local_init(NET *net);
+ void net_end(NET *net);
+   void net_clear(NET *net, my_bool clear_buffer);
+-my_bool net_realloc(NET *net, size_t length);
++my_bool mysql_net_realloc(NET *net, size_t length);
+ my_bool net_flush(NET *net);
+ my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
+ my_bool net_write_command(NET *net,unsigned char command,
+@@ -128,13 +128,11 @@ void randominit(struct rand_struct *, un
+ double my_rnd(struct rand_struct *);
+ void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
+ void hash_password(unsigned long *to, const char *password, unsigned int password_len);
+-void make_scrambled_password_323(char *to, const char *password);
+ void scramble_323(char *to, const char *message, const char *password);
+ my_bool check_scramble_323(const unsigned char *reply, const char *message,
+                            unsigned long *salt);
+ void get_salt_from_password_323(unsigned long *res, const char *password);
+ void make_password_from_salt_323(char *to, const unsigned long *salt);
+-void make_scrambled_password(char *to, const char *password);
+ void scramble(char *to, const char *message, const char *password);
+ my_bool check_scramble(const unsigned char *reply, const char *message,
+                        const unsigned char *hash_stage2);
+diff -up mysql-5.5.28/include/my_sys.h.p8 mysql-5.5.28/include/my_sys.h
+--- mysql-5.5.28/include/my_sys.h.p8	2012-12-06 14:09:15.218170154 +0100
++++ mysql-5.5.28/include/my_sys.h	2012-12-06 14:16:14.598520859 +0100
+@@ -218,6 +218,7 @@ extern uint    my_large_page_size;
+ 
+ /* charsets */
+ #define MY_ALL_CHARSETS_SIZE 2048
++#define default_charset_info mysql_default_charset_info	/* namespace sanity */
+ extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
+ extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE];
+ extern CHARSET_INFO compiled_charsets[];
+@@ -895,6 +896,9 @@ extern uint get_charset_number(const cha
+ extern uint get_collation_number(const char *name);
+ extern const char *get_charset_name(uint cs_number);
+ 
++#define get_charset mysql_get_charset		/* namespace sanity */
++#define get_charset_by_csname mysql_get_charset_by_csname
++
+ extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
+ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
+ extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
+diff -up mysql-5.5.28/sql/password.c.p8 mysql-5.5.28/sql/password.c
+--- mysql-5.5.28/sql/password.c.p8	2012-08-29 10:50:46.000000000 +0200
++++ mysql-5.5.28/sql/password.c	2012-12-06 14:16:14.599520860 +0100
+@@ -155,23 +155,6 @@ void my_make_scrambled_password_323(char
+ 
+ 
+ /*
+-  Wrapper around my_make_scrambled_password_323() to maintain client lib ABI
+-  compatibility.
+-  In server code usage of my_make_scrambled_password_323() is preferred to
+-  avoid strlen().
+-  SYNOPSIS
+-    make_scrambled_password_323()
+-    to        OUT store scrambled password here
+-    password  IN  NULL-terminated string with user-supplied password
+-*/
+-
+-void make_scrambled_password_323(char *to, const char *password)
+-{
+-  my_make_scrambled_password_323(to, password, strlen(password));
+-}
+-
+-
+-/*
+     Scramble string with password.
+     Used in pre 4.1 authentication phase.
+   SYNOPSIS
+@@ -434,23 +417,6 @@ void my_make_scrambled_password(char *to
+   
+ 
+ /*
+-  Wrapper around my_make_scrambled_password() to maintain client lib ABI
+-  compatibility.
+-  In server code usage of my_make_scrambled_password() is preferred to
+-  avoid strlen().
+-  SYNOPSIS
+-    make_scrambled_password()
+-    buf       OUT buffer of size 2*SHA1_HASH_SIZE + 2 to store hex string
+-    password  IN  NULL-terminated password string
+-*/
+-
+-void make_scrambled_password(char *to, const char *password)
+-{
+-  my_make_scrambled_password(to, password, strlen(password));
+-}
+-
+-
+-/*
+     Produce an obscure octet sequence from password and random
+     string, recieved from the server. This sequence corresponds to the
+     password, but password can not be easily restored from it. The sequence