From ac79cc1081443a043218becf86af822a2e92632d Mon Sep 17 00:00:00 2001
From: laforge <laforge>
Date: Wed, 16 Feb 2005 11:25:09 +0000
Subject: various --ip-as-string fixes

---
 ulogd/configure.in            | 6 +++---
 ulogd/mysql/ulogd_MYSQL.c     | 2 +-
 ulogd/sqlite3/ulogd_SQLITE3.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ulogd')

diff --git a/ulogd/configure.in b/ulogd/configure.in
index 075115d..93b8cbf 100644
--- a/ulogd/configure.in
+++ b/ulogd/configure.in
@@ -101,7 +101,7 @@ else
 
 	if test "x$MYSQL_FUNCTION_TEST" = x
 	then
-                EXTRA_MYSQL_DEF="OLD_MYSQL=1 "
+                EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "
                 AC_MSG_RESULT(found old MySQL)
 	else
 		AC_MSG_RESULT(found new MySQL)
@@ -122,7 +122,7 @@ AC_ARG_WITH(mysql-log-ip-as-string,
  --with-mysql-log-ip-as-string		log IPs as string rather than as
 					unsigned long-integer.
 ,[
-   EXTRA_MYSQL_DEF="-D${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
+   EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
    AC_MSG_WARN(the use of --with-mysql-log-ip-as-string is discouraged)
 ])
 
@@ -261,7 +261,7 @@ AC_ARG_WITH(sqlite3-log-ip-as-string,
  --with-sqlite3-log-ip-as-string		log IPs as string rather than as
 						unsigned long-integer.
 ,[
-   EXTRA_SQLITE3_DEF="-D${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
+   EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
    AC_MSG_WARN(the use of --with-sqlite3-log-ip-as-string is discouraged)
 ])
 
diff --git a/ulogd/mysql/ulogd_MYSQL.c b/ulogd/mysql/ulogd_MYSQL.c
index 206055f..8ec2f34 100644
--- a/ulogd/mysql/ulogd_MYSQL.c
+++ b/ulogd/mysql/ulogd_MYSQL.c
@@ -156,7 +156,7 @@ static int mysql_output(ulog_iret_t *result)
 				break;
 			case ULOGD_RET_IPADDR:
 #ifdef IP_AS_STRING
-				memset(&addr, 0, sizeof(addr0));
+				memset(&addr, 0, sizeof(addr));
 				addr.s_addr = ntohl(res->value.ui32);
 				*stmt_ins++ = '\'';
 				tmpstr = inet_ntoa(addr);
diff --git a/ulogd/sqlite3/ulogd_SQLITE3.c b/ulogd/sqlite3/ulogd_SQLITE3.c
index 284da3c..3d6a925 100644
--- a/ulogd/sqlite3/ulogd_SQLITE3.c
+++ b/ulogd/sqlite3/ulogd_SQLITE3.c
@@ -93,7 +93,7 @@ static int _sqlite3_output(ulog_iret_t *result)
 	int col_counter;
 #ifdef IP_AS_STRING
 	char *ipaddr;
-	struct in_addr *addr;
+	struct in_addr addr;
 #endif
 
 	col_counter = 0;
-- 
cgit v1.2.3