summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaforge <laforge>2005-02-16 11:25:09 +0000
committerlaforge <laforge>2005-02-16 11:25:09 +0000
commitac79cc1081443a043218becf86af822a2e92632d (patch)
tree314872c940d5155d472de3747896f2b4429dde82
parent8d422a45d8b7879d2d263b5e8db091e0ec987db0 (diff)
various --ip-as-string fixes
-rw-r--r--ulogd/configure.in6
-rw-r--r--ulogd/mysql/ulogd_MYSQL.c2
-rw-r--r--ulogd/sqlite3/ulogd_SQLITE3.c2
3 files changed, 5 insertions, 5 deletions
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;