diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-03-29 17:13:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-03-29 17:13:53 +0200 |
| commit | 291fd9698340f3d83ff096542720f7335cb078d2 (patch) | |
| tree | 1e727dd05959dfa20ecc93fc8a4f8050ead61689 /server-tools | |
| parent | 3e13f97bd4aaba25af5558512f933036c952494c (diff) | |
| download | mariadb-git-291fd9698340f3d83ff096542720f7335cb078d2.tar.gz | |
pluggable auth with plugin examples
Makefile.am:
add new API files to the check_abi rule,
remove duplicates
client/CMakeLists.txt:
now a client can use dlopen too
client/Makefile.am:
be csh-friendly
include/my_global.h:
add dummy plugs for dlopen and co.
for the code that needs them to work in static builds
mysys/Makefile.am:
be csh-friendly
plugin/auth/dialog.c:
typo fixed
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 5 | ||||
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 19c4ac8de19..5c5af3377eb 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -46,7 +46,8 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \ $(top_builddir)/sql/pack.$(OBJEXT) \ $(top_builddir)/sql/sql_state.$(OBJEXT) \ $(top_builddir)/sql/mini_client_errors.$(OBJEXT)\ - $(top_builddir)/sql/client.$(OBJEXT) + $(top_builddir)/sql/client.$(OBJEXT) \ + $(top_builddir)/sql/client_plugin.$(OBJEXT) CLEANFILES= net_serv.cc client_settings.h @@ -91,7 +92,7 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ @LIBDL@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ IMService.h CMakeLists.txt diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index 85e3f4a2cac..b7a32f1d047 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -368,7 +368,7 @@ int User_map::authenticate(const LEX_STRING *user_name, const char *scramble) const { const User *user= find_user(user_name); - return user ? check_scramble(scrambled_password, scramble, user->salt) : 2; + return user ? check_scramble((uchar*)scrambled_password, scramble, user->salt) : 2; } |