Remzona54/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 05:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

NOODBC inverted to WITH_ODBC

Browse source
This commit is contained in:
Vladimir Dubrovin 2026-05-08 20:30:14 +03:00
parent 7871279fae
commit 5fdd4a4d6f
14 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -300,9 +300,9 @@ if(WIN32 OR 3PROXY_USE_ODBC)
endif() endif()
endif() endif()
# Set NOODBC if ODBC is not found # Define WITH_ODBC when ODBC is available
if(NOT ODBC_FOUND) if(ODBC_FOUND)
add_compile_definitions(NOODBC) add_compile_definitions(WITH_ODBC)
endif() endif()
# Set NORADIUS if OpenSSL is not available (RADIUS requires MD5 from OpenSSL) # Set NORADIUS if OpenSSL is not available (RADIUS requires MD5 from OpenSSL)

4
Makefile.FreeBSD
View file

@ -1,7 +1,7 @@
# #
# 3 proxy Makefile for GCC/Unix # 3 proxy Makefile for GCC/Unix
# #
# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC # add -DWITH_ODBC to CFLAGS and -lodbc to LDFLAGS to compile with ODBC
# library support. Add -DSAFESQL for poorely written ODBC library / drivers. # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
BUILDDIR = ../bin/ BUILDDIR = ../bin/
@ -11,7 +11,7 @@ MANDIR ?= /usr/share/man
CC ?= cc CC ?= cc
CFLAGS ?= -O3 -flto CFLAGS ?= -O3 -flto
CFLAGS += -c -fno-strict-aliasing -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN CFLAGS += -c -fno-strict-aliasing -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN
COUT = -o COUT = -o
LN ?= ${CC} LN ?= ${CC}
LDFLAGS ?= -flto LDFLAGS ?= -flto

4
Makefile.Linux
View file

@ -1,7 +1,7 @@
# #
# 3 proxy Makefile for GCC/Linux/Cygwin # 3 proxy Makefile for GCC/Linux/Cygwin
# #
# remove -DNOODBC from CFLAGS and add -lodbc to LIBS to compile with ODBC # add -DWITH_ODBC to CFLAGS and -lodbc to LIBS to compile with ODBC
# library support. Add -DSAFESQL for poorely written ODBC library / drivers. # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
BUILDDIR = ../bin/ BUILDDIR = ../bin/
@ -10,7 +10,7 @@ CRYPT_PREFIX ?= $(PREFIX)
CC ?= gcc CC ?= gcc
CFLAGS ?= -O3 -flto CFLAGS ?= -O3 -flto
CFLAGS += -fPIC -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -D WITH_UN CFLAGS += -fPIC -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -D WITH_UN
COUT = -o COUT = -o
LN ?= ${CC} LN ?= ${CC}
DCFLAGS ?= DCFLAGS ?=

4
Makefile.Solaris
View file

@ -2,12 +2,12 @@
# 3 proxy Makefile for Solaris/SunCC # 3 proxy Makefile for Solaris/SunCC
# #
# #
# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC # add -DWITH_ODBC to CFLAGS and -lodbc to LDFLAGS to compile with ODBC
# library support. Add -DSAFESQL for poorely written ODBC library / drivers. # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
BUILDDIR = ../bin/ BUILDDIR = ../bin/
CC ?= cc CC ?= cc
CFLAGS = -xO3 -c -D_SOLARIS -D_THREAD_SAFE -DGETHOSTBYNAME_R -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL CFLAGS = -xO3 -c -D_SOLARIS -D_THREAD_SAFE -DGETHOSTBYNAME_R -D_REENTRANT -DFD_SETSIZE=4096 -DWITH_POLL
COUT = -o ./ COUT = -o ./
LN = $(CC) LN = $(CC)
LDFLAGS = -xO3 LDFLAGS = -xO3

3
Makefile.msvc
View file

@ -2,13 +2,14 @@
# 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake) # 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake)
# #
# #
# ODBC support is enabled by default on Windows (/D WITH_ODBC, odbc32.lib)
# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver # Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver
BUILDDIR = ../bin/ BUILDDIR = ../bin/
CC = cl CC = cl
VERSION = $(VERSION) VERSION = $(VERSION)
BUILDDATE = $(BUILDDATE) BUILDDATE = $(BUILDDATE)
CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "WITH_PCRE" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c $(BUILDDATE) $(VERSION) CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "WITH_PCRE" /D "WITH_ODBC" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c $(BUILDDATE) $(VERSION)
COUT = /Fo COUT = /Fo
LN = link LN = link
LDFLAGS = /nologo /subsystem:console /incremental:no LDFLAGS = /nologo /subsystem:console /incremental:no

4
Makefile.unix
View file

@ -2,7 +2,7 @@
# 3 proxy Makefile for GCC/Unix # 3 proxy Makefile for GCC/Unix
# #
# #
# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC # add -DWITH_ODBC to CFLAGS and -lodbc to LDFLAGS to compile with ODBC
# library support. Add -DSAFESQL for poorely written ODBC library / drivers. # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
BUILDDIR = ../bin/ BUILDDIR = ../bin/
@ -13,7 +13,7 @@ CC ?= gcc
# you may need -L/usr/pkg/lib for older NetBSD versions # you may need -L/usr/pkg/lib for older NetBSD versions
CFLAGS ?= -O3 -flto CFLAGS ?= -O3 -flto
CFLAGS += -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN CFLAGS += -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_UN
COUT = -o COUT = -o
LN ?= $(CC) LN ?= $(CC)
LDFLAGS ?= -flto LDFLAGS ?= -flto

2
Makefile.watcom
View file

@ -6,7 +6,7 @@
BUILDDIR = ../bin/ BUILDDIR = ../bin/
CC = cl CC = cl
CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NOODBC" /D "NORADIUS" /D"WATCOM" /D "MSVC" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "SCNx64=\"I64x\"" /D "SCNd64=\"I64d\"" /D "PRIx64=\"I64x\"" /c $(VERSION) $(BUILDDATE) CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NORADIUS" /D"WATCOM" /D "MSVC" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRId64=\"I64d\"" /D "PRIu64=\"I64u\"" /D "SCNu64=\"I64u\"" /D "SCNx64=\"I64x\"" /D "SCNd64=\"I64d\"" /D "PRIx64=\"I64x\"" /c $(VERSION) $(BUILDDATE)
COUT = /Fo COUT = /Fo
LN = link LN = link
LDFLAGS = /nologo /subsystem:console /incremental:no LDFLAGS = /nologo /subsystem:console /incremental:no

5
Makefile.win
View file

@ -2,14 +2,13 @@
# 3 proxy Makefile for GCC/windows # 3 proxy Makefile for GCC/windows
# #
# #
# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC # ODBC support is enabled by default on Windows (-DWITH_ODBC, -lodbc32)
# library support
BUILDDIR = ../bin/ BUILDDIR = ../bin/
CC ?= gcc CC ?= gcc
CFLAGS ?= -O3 -flto -fno-strict-aliasing CFLAGS ?= -O3 -flto -fno-strict-aliasing
CFLAGS += -c -mthreads -DWITH_WSAPOLL CFLAGS += -c -mthreads -DWITH_WSAPOLL -DWITH_ODBC
COUT = -o COUT = -o
LN ?= $(CC) LN ?= $(CC)
LDFLAGS ?= -flto -fno-strict-aliasing LDFLAGS ?= -flto -fno-strict-aliasing

2
src/3proxy.c
View file

@ -71,7 +71,7 @@ void __stdcall CommandHandler( DWORD dwCommand )
conf.paused++; conf.paused++;
Sleep(2000); Sleep(2000);
SetStatus( SERVICE_STOPPED, 0, 0 ); SetStatus( SERVICE_STOPPED, 0, 0 );
#ifndef NOODBC #ifdef WITH_ODBC
_3proxy_mutex_lock(&log_mutex); _3proxy_mutex_lock(&log_mutex);
close_sql(); close_sql();
_3proxy_mutex_unlock(&log_mutex); _3proxy_mutex_unlock(&log_mutex);

2
src/conf.c
View file

@ -334,7 +334,7 @@ static int h_log(int argc, unsigned char ** argv){
openlog((char *)conf.logtarget+1, LOG_PID, LOG_DAEMON); openlog((char *)conf.logtarget+1, LOG_PID, LOG_DAEMON);
#endif #endif
} }
#ifndef NOODBC #ifdef WITH_ODBC
else if(*argv[1]=='&'){ else if(*argv[1]=='&'){
conf.logfunc = logsql; conf.logfunc = logsql;
if(notchanged) return 0; if(notchanged) return 0;

2
src/datatypes.c
View file

@ -561,7 +561,7 @@ static void * ef_server_log(struct node * node){
#ifndef _WIN32 #ifndef _WIN32
else if(((struct srvparam *)node->value) -> logfunc == logsyslog) return "syslog"; else if(((struct srvparam *)node->value) -> logfunc == logsyslog) return "syslog";
#endif #endif
#ifndef NOODBC #ifdef WITH_ODBC
else if(((struct srvparam *)node->value) -> logfunc == logsql) return "odbc"; else if(((struct srvparam *)node->value) -> logfunc == logsql) return "odbc";
#endif #endif
return NULL; return NULL;

2
src/plugins/PamAuth/pamauth.c
View file

@ -1,7 +1,7 @@
/* plugin for 3proxy with PAM auth only for *NIX (linux,*bsd) /* plugin for 3proxy with PAM auth only for *NIX (linux,*bsd)
Kirill Lopuchov <lopuchov@mail.ru> Kirill Lopuchov <lopuchov@mail.ru>
Compile with: gcc -shared -o pamauth.so pamauth.c -lpam -DNOODBC Compile with: gcc -shared -o pamauth.so pamauth.c -lpam
*/ */
#include "../../structures.h" #include "../../structures.h"

2
src/proxy.h
View file

@ -112,7 +112,7 @@ void daemonize(void);
#endif #endif
#endif #endif
#ifndef NOODBC #ifdef WITH_ODBC
#ifndef _WIN32 #ifndef _WIN32
#include <sqltypes.h> #include <sqltypes.h>
#endif #endif

2
src/sql.c
View file

@ -1,5 +1,5 @@
#include "proxy.h" #include "proxy.h"
#ifndef NOODBC #ifdef WITH_ODBC
SQLHENV henv = NULL; SQLHENV henv = NULL;
SQLHSTMT hstmt = NULL; SQLHSTMT hstmt = NULL;