From 2fa832195184d86457bd7b5fd9455830be59837b Mon Sep 17 00:00:00 2001
From: Fish <>
Date: Sat, 24 Jan 2004 04:48:48 +0000
Subject: [PATCH] sync up libopm with blitzed version to fix a problem with
 socks 5 scanning

---
 ChangeLog      | 3 +++
 configure      | 2 +-
 configure.in   | 2 +-
 libopm/proxy.c | 3 +++
 opsb.c         | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d19f579..9fb7f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Open Proxy Scanning Bot Module for NeoStats Changelog.
 ==============================================================================
+* Version 2.1 * 24/01/2004 * Fish (F)
+ - Sync up libopm with blitzed version to fix a Socks 5 bug (F)
+
 * Version 2.0 * 29/12/2003 * Fish (F) and Mark (M)
  - Fixed incorrect parameters to printf style functions (M)
  - Use more appropriate defines for buffer sizes since MAXHOST differs between IRCds (M)
diff --git a/configure b/configure
index 086cfc6..ab8484f 100755
--- a/configure
+++ b/configure
@@ -1265,7 +1265,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
           ac_config_headers="$ac_config_headers modconfig.h"
 
 PACKAGE=OPSB
-VERSION=2.0
+VERSION=2.1
 DIRINST=~/NeoStats/
 
 CFLAGS="$CFLAGS -O2 -Wall"
diff --git a/configure.in b/configure.in
index 93904a8..98edcb9 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(opsb.c)
 AC_CONFIG_HEADER(modconfig.h)
 PACKAGE=OPSB
-VERSION=2.0
+VERSION=2.1
 DIRINST=~/NeoStats/
 AC_PREFIX_DEFAULT(~/NeoStats/)
 CFLAGS="$CFLAGS -O2 -Wall"
diff --git a/libopm/proxy.c b/libopm/proxy.c
index eda9f2a..5c7304f 100644
--- a/libopm/proxy.c
+++ b/libopm/proxy.c
@@ -146,6 +146,9 @@ int libopm_proxy_socks5_write(OPM_T *scanner, OPM_SCAN_T *scan, OPM_CONNECTION_T
    scan_ip = (char *) libopm_config(scanner->config, OPM_CONFIG_SCAN_IP);
    scan_port = *(int *) libopm_config(scanner->config, OPM_CONFIG_SCAN_PORT);
 
+   if (inet_aton(scan_ip, &addr) == 0) 
+   	; /* handle error */
+
    laddr = htonl(addr.s_addr);
 
    /* Form authentication string */
diff --git a/opsb.c b/opsb.c
index b0ba65b..4a69d3c 100644
--- a/opsb.c
+++ b/opsb.c
@@ -64,7 +64,7 @@ int online;
 ModuleInfo __module_info = {
 	"OPSB",
 	"An Open Proxy Scanning Bot",
-	"2.0",
+	"2.1",
 	__DATE__,
 	__TIME__
 };