summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Troy <dave@popvox.com>2006-04-01 17:47:13 +0000
committerDavid Troy <dave@popvox.com>2006-04-01 17:47:13 +0000
commit268eacb1fa13470f22d6bcea81e9403d3824e8cb (patch)
tree00d363dae6c58aa0a2c028d736ca3e7ef9bd4be3
parentb4846e8daffe14658826c638a843aea45606ca79 (diff)
downloadastmanproxy-268eacb1fa13470f22d6bcea81e9403d3824e8cb.tar.gz
astmanproxy-268eacb1fa13470f22d6bcea81e9403d3824e8cb.tar.xz
astmanproxy-268eacb1fa13470f22d6bcea81e9403d3824e8cb.zip
git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@48 f02b47b9-160a-0410-81a6-dc3441afb0ec
-rw-r--r--Makefile4
-rw-r--r--src/ssl.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2350849..37da0d4 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ BINDIR := $(DESTDIR)$(PREFIX)/sbin
MODS := astmanproxy config config_perms common proxyfunc log ssl md5
HANDLERS := xml standard csv http
SOBJS := $(HANDLERS:%=%.so)
-LIBS := ssl
+LIBS := -lssl
ifeq (${OSARCH},Darwin)
LIBS+=-lresolv
@@ -59,7 +59,7 @@ VPATH = src
# Add -g below for debug/GDB symbols
#CFLAGS+= $(DEFINES) -Wall -O2 -dynamic -D_REENTRANT -fPIC
-CFLAGS+= $(DEFINES) -Wall -O2 -D_REENTRANT -fPIC -Isrc/include -I-
+CFLAGS+= $(DEFINES) -Wall -O2 -D_REENTRANT -fPIC -Isrc/include -I/usr/include/openssl -I-
# For printing only
SRCS := $(MODS:%=%.c)
diff --git a/src/ssl.c b/src/ssl.c
index 5570790..7ff4ab5 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -289,12 +289,12 @@ int is_encrypt_request(int sslclhellotimeout, int fd)
if ((buf[0x00] == 0x16) && (buf[0x01] == 0x03) &&
/* for tls buf[0x02] = 0x01 and ssl v3 buf[0x02] = 0x02 */
((buf[0x02] == 0x00) || (buf[0x02] == 0x01))) {
- if (option_debug > 1)
+ if (debug)
debugmsg("Received a SSL request\n");
return 1;
/* check for sslv23_client_method */
} else if ((buf[0x02] == 0x01) && (buf[0x03] == 0x03) && (buf[0x04] == 0x01)) {
- if (option_debug > 1)
+ if (debug)
debugmsg("Received a SSL request for SSLv23_client_method()\n");
return 1;
}