mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 16:51:29 +00:00
Newer versions of libmariadb default to tls forced on, return to the default of not forcing that.
auto_login were breaking on linux builds loginserver wasn't setting proper openssl compile flag
This commit is contained in:
parent
1db4882cda
commit
04d947a40e
@ -258,9 +258,17 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
|
||||
if (pCompress) {
|
||||
flags |= CLIENT_COMPRESS;
|
||||
}
|
||||
|
||||
//todo: we need to revisit this ssl handling later
|
||||
//the whole connect code is ancient and tls is starting to come as a default requirement for many db setups
|
||||
if (pSSL) {
|
||||
flags |= CLIENT_SSL;
|
||||
}
|
||||
else {
|
||||
int off = 0;
|
||||
mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &off);
|
||||
mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &off);
|
||||
}
|
||||
if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
|
||||
pStatus = Connected;
|
||||
|
||||
|
||||
@ -26,6 +26,8 @@ set(eqlogin_headers
|
||||
world_server.h
|
||||
)
|
||||
|
||||
add_compile_definitions(EQEMU_USE_OPENSSL)
|
||||
|
||||
add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
|
||||
|
||||
install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#include "../../groups.h"
|
||||
#include "../../raids.h"
|
||||
#include "../../raids.h"
|
||||
#include "../../common/repositories/account_repository.h"
|
||||
#include "../../../common/repositories/account_repository.h"
|
||||
|
||||
void SetAutoLogin(Client* c, const Seperator* sep)
|
||||
{
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#include "../../client.h"
|
||||
#include "../../common/repositories/account_repository.h"
|
||||
#include "../../../common/repositories/account_repository.h"
|
||||
|
||||
void ShowAutoLogin(Client* c, const Seperator* sep)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user