mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
Don't include my_global.h in "pure" plugins
this partially reverts 6e56ebbb498
This commit is contained in:
parent
a6e215f221
commit
828602356c
10 changed files with 35 additions and 36 deletions
plugin
auth_gssapi
client_plugin.ccgssapi_client.ccgssapi_errmsg.ccgssapi_server.ccserver_plugin.ccsspi_client.ccsspi_errmsg.ccsspi_server.cc
cracklib_password_check
simple_password_check
|
@ -31,12 +31,13 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
GSSAPI authentication plugin, client side
|
||||
*/
|
||||
#include <my_global.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <mysql/client_plugin.h>
|
||||
#include <mysql.h>
|
||||
#include <stdio.h>
|
||||
#include "common.h"
|
||||
#include <string.h>
|
||||
|
||||
extern int auth_client(char *principal_name,
|
||||
char *mech,
|
||||
|
|
|
@ -26,8 +26,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|||
POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <my_global.h>
|
||||
#include <gssapi/gssapi.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <mysql.h>
|
||||
|
|
|
@ -26,7 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|||
POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <my_global.h>
|
||||
#include <gssapi.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include <my_global.h>
|
||||
#include <my_config.h>
|
||||
#include <gssapi/gssapi.h>
|
||||
#include <stdio.h>
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include <my_sys.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <log.h>
|
||||
#include <string.h>
|
||||
#include "server_plugin.h"
|
||||
#include "gssapi_errmsg.h"
|
||||
|
||||
|
@ -17,11 +17,11 @@ static void log_error( OM_uint32 major, OM_uint32 minor, const char *msg)
|
|||
char sysmsg[1024];
|
||||
gssapi_errmsg(major, minor, sysmsg, sizeof(sysmsg));
|
||||
my_printf_error(ER_UNKNOWN_ERROR,"Server GSSAPI error (major %u, minor %u) : %s -%s",
|
||||
MYF(0), major, minor, msg, sysmsg);
|
||||
0, major, minor, msg, sysmsg);
|
||||
}
|
||||
else
|
||||
{
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "Server GSSAPI error : %s", MYF(0), msg);
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "Server GSSAPI error : %s", 0, msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio,const char *user, size_t userlen, int use_
|
|||
/* send token to peer */
|
||||
if (output.length)
|
||||
{
|
||||
if (vio->write_packet(vio, (const uchar *) output.value, output.length))
|
||||
if (vio->write_packet(vio, (const unsigned char *) output.value, output.length))
|
||||
{
|
||||
gss_release_buffer(&minor, &output);
|
||||
log_error(major, minor, "communication error(write)");
|
||||
|
@ -236,7 +236,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio,const char *user, size_t userlen, int use_
|
|||
{
|
||||
my_printf_error(ER_ACCESS_DENIED_ERROR,
|
||||
"GSSAPI name mismatch, requested '%s', actual name '%.*s'",
|
||||
MYF(0), user, (int)client_name_buf.length, client_name_str);
|
||||
0, user, (int)client_name_buf.length, client_name_str);
|
||||
}
|
||||
|
||||
gss_release_buffer(&minor, &client_name_buf);
|
||||
|
|
|
@ -31,10 +31,18 @@
|
|||
|
||||
GSSAPI authentication plugin, server side
|
||||
*/
|
||||
#include <my_global.h>
|
||||
#include <my_sys.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef unsigned __int64 my_ulonglong;
|
||||
#else
|
||||
typedef unsigned long long my_ulonglong;
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <typelib.h>
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include "string.h"
|
||||
#include "server_plugin.h"
|
||||
#include "common.h"
|
||||
|
||||
|
@ -133,7 +141,7 @@ static const char* mech_names[] = {
|
|||
NULL
|
||||
};
|
||||
static TYPELIB mech_name_typelib = {
|
||||
array_elements(mech_names) - 1,
|
||||
3,
|
||||
"mech_name_typelib",
|
||||
mech_names,
|
||||
NULL
|
||||
|
|
|
@ -27,10 +27,11 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||
*/
|
||||
|
||||
#define SECURITY_WIN32
|
||||
#include <my_global.h>
|
||||
#include <windows.h>
|
||||
#include <sspi.h>
|
||||
#include <SecExt.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include <mysql.h>
|
||||
|
|
|
@ -26,9 +26,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|||
POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <my_global.h>
|
||||
#include <windows.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#define ERRSYM(x) {x, #x}
|
||||
static struct {
|
||||
|
|
|
@ -26,14 +26,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|||
POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <my_global.h>
|
||||
#include "sspi.h"
|
||||
#include "common.h"
|
||||
#include "server_plugin.h"
|
||||
#include <mysql/plugin_auth.h>
|
||||
#include <my_sys.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <log.h>
|
||||
|
||||
|
||||
/* This sends the error to the client */
|
||||
|
@ -43,11 +40,11 @@ static void log_error(SECURITY_STATUS err, const char *msg)
|
|||
{
|
||||
char buf[1024];
|
||||
sspi_errmsg(err, buf, sizeof(buf));
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", MYF(0), msg, buf);
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, msg, buf);
|
||||
}
|
||||
else
|
||||
{
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error %s", MYF(0), msg);
|
||||
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error %s", 0, msg);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -250,7 +247,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio, const char *user, size_t user_len, int co
|
|||
{
|
||||
my_printf_error(ER_ACCESS_DENIED_ERROR,
|
||||
"GSSAPI name mismatch, requested '%s', actual name '%s'",
|
||||
MYF(0), user, client_name);
|
||||
0, user, client_name);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
|
|
|
@ -13,12 +13,10 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||
|
||||
#include <my_global.h>
|
||||
#include <mysql/plugin_password_validation.h>
|
||||
#include <crack.h>
|
||||
#include <string.h>
|
||||
#include <alloca.h>
|
||||
#include <my_sys.h>
|
||||
#include <mysqld_error.h>
|
||||
|
||||
static char *dictionary;
|
||||
|
@ -37,11 +35,11 @@ static int crackme(MYSQL_CONST_LEX_STRING *username, MYSQL_CONST_LEX_STRING *pas
|
|||
if ((res= FascistCheckUser(password->str, dictionary, user, host)))
|
||||
{
|
||||
my_printf_error(ER_NOT_VALID_PASSWORD, "cracklib: %s",
|
||||
MYF(ME_JUST_WARNING), res);
|
||||
return TRUE;
|
||||
ME_WARNING, res);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static MYSQL_SYSVAR_STR(dictionary, dictionary, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
|
||||
|
|
|
@ -14,13 +14,10 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_sys.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <mysql/plugin_password_validation.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <my_attribute.h>
|
||||
|
||||
static unsigned min_length, min_digits, min_letters, min_others;
|
||||
|
||||
|
@ -53,19 +50,17 @@ static int validate(MYSQL_CONST_LEX_STRING *username,
|
|||
others < min_others;
|
||||
}
|
||||
|
||||
static void fix_min_length(MYSQL_THD thd __attribute__((unused)),
|
||||
struct st_mysql_sys_var *var __attribute__((unused)),
|
||||
static void fix_min_length(MYSQL_THD thd, struct st_mysql_sys_var *var,
|
||||
void *var_ptr, const void *save)
|
||||
{
|
||||
uint new_min_length;
|
||||
unsigned int new_min_length;
|
||||
*((unsigned int *)var_ptr)= *((unsigned int *)save);
|
||||
new_min_length= min_digits + 2 * min_letters + min_others;
|
||||
if (min_length < new_min_length)
|
||||
{
|
||||
my_printf_error(ER_TRUNCATED_WRONG_VALUE,
|
||||
"Adjusted the value of simple_password_check_minimal_length "
|
||||
"from %u to %u", ME_JUST_WARNING,
|
||||
min_length, new_min_length);
|
||||
"from %u to %u", ME_WARNING, min_length, new_min_length);
|
||||
min_length= new_min_length;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue