haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-07-17 00:31:07 +00:00
Code Issues Releases Wiki Activity

Support unix-socket auth for mariadb (#642)

Browse Source 
Co-authored-by: 杨赫然 <heran.yang@seafile.com>
This commit is contained in:
feiniks 2023-12-26 17:01:20 +08:00 committed by GitHub
parent 67dd1468cf
commit 2d3513a631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/seaf-db.c
View File

@ -849,7 +849,11 @@ mysql_db_get_connection (SeafDB *vdb)
int pro_type = MYSQL_PROTOCOL_SOCKET; int pro_type = MYSQL_PROTOCOL_SOCKET;
mysql_options (db_conn, MYSQL_OPT_PROTOCOL, &pro_type); mysql_options (db_conn, MYSQL_OPT_PROTOCOL, &pro_type);
if (!db->user) { if (!db->user) {
#ifndef LIBMARIADB
mysql_options (db_conn, MYSQL_DEFAULT_AUTH, "unix_socket"); mysql_options (db_conn, MYSQL_DEFAULT_AUTH, "unix_socket");
#else
mysql_options (db_conn, MARIADB_OPT_UNIXSOCKET, (void *)db->unix_socket);
#endif
} }
} }

17
common/seaf-utils.c
View File

@ -70,7 +70,7 @@ mysql_db_start (SeafileSession *session)
unix_socket = seaf_key_file_get_string (session->config, unix_socket = seaf_key_file_get_string (session->config,
"database", "unix_socket", NULL); "database", "unix_socket", NULL);
host = seaf_key_file_get_string (session->config, "database", "host", &error); host = seaf_key_file_get_string (session->config, "database", "host", NULL);
if (!host && !unix_socket) { if (!host && !unix_socket) {
seaf_warning ("DB host not set in config.\n"); seaf_warning ("DB host not set in config.\n");
return -1; return -1;
@ -78,22 +78,23 @@ mysql_db_start (SeafileSession *session)
port = g_key_file_get_integer (session->config, "database", "port", &error); port = g_key_file_get_integer (session->config, "database", "port", &error);
if (error) { if (error) {
g_clear_error (&error);
port = MYSQL_DEFAULT_PORT; port = MYSQL_DEFAULT_PORT;
} }
user = seaf_key_file_get_string (session->config, "database", "user", &error); user = seaf_key_file_get_string (session->config, "database", "user", NULL);
if (!user && !unix_socket) { if (!user && !unix_socket) {
seaf_warning ("DB user not set in config.\n"); seaf_warning ("DB user not set in config.\n");
return -1; return -1;
} }
passwd = seaf_key_file_get_string (session->config, "database", "password", &error); passwd = seaf_key_file_get_string (session->config, "database", "password", NULL);
if (!passwd && !unix_socket) { if (!passwd && !unix_socket) {
seaf_warning ("DB passwd not set in config.\n"); seaf_warning ("DB passwd not set in config.\n");
return -1; return -1;
} }
db = seaf_key_file_get_string (session->config, "database", "db_name", &error); db = seaf_key_file_get_string (session->config, "database", "db_name", NULL);
if (!db) { if (!db) {
seaf_warning ("DB name not set in config.\n"); seaf_warning ("DB name not set in config.\n");
return -1; return -1;
@ -117,13 +118,12 @@ mysql_db_start (SeafileSession *session)
charset = seaf_key_file_get_string (session->config, charset = seaf_key_file_get_string (session->config,
"database", "connection_charset", NULL); "database", "connection_charset", NULL);
if (error)
g_clear_error (&error);
max_connections = g_key_file_get_integer (session->config, max_connections = g_key_file_get_integer (session->config,
"database", "max_connections", "database", "max_connections",
&error); &error);
if (error || max_connections < 0) { if (error || max_connections < 0) {
g_clear_error (&error); if (error)
g_clear_error (&error);
max_connections = DEFAULT_MAX_CONNECTIONS; max_connections = DEFAULT_MAX_CONNECTIONS;
} }
@ -320,7 +320,8 @@ ccnet_init_mysql_database (SeafileSession *session)
&error); &error);
if (error || max_connections < 0) { if (error || max_connections < 0) {
max_connections = DEFAULT_MAX_CONNECTIONS; max_connections = DEFAULT_MAX_CONNECTIONS;
g_clear_error (&error); if (error)
g_clear_error (&error);
} }
session->ccnet_db = seaf_db_new_mysql (host, port, user, passwd, db, unix_socket, use_ssl, skip_verify, ca_path, charset, max_connections); session->ccnet_db = seaf_db_new_mysql (host, port, user, passwd, db, unix_socket, use_ssl, skip_verify, ca_path, charset, max_connections);