- minor fix

git-svn-id: svn://svn.zabbix.com/trunk@2347 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 51 insertions, 36 deletions

diff --git a/Makefile.am b/Makefile.am
index af437a64..495fc968 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,2 @@
 SUBDIRS = src
+EXTRA_DIST = create FAQ frontends misc upgrades
diff --git a/configure.in b/configure.in
index c8eb84b9..c6bde968 100644
--- a/configure.in
+++ b/configure.in
@@ -19,8 +19,9 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/zabbix_server/server.c)
+AM_INIT_AUTOMAKE([zabbix],[1.1beta3])
 
-AM_INIT_AUTOMAKE(ZABBIX,1.1alpha11)
+AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION])
 
 AC_PROG_MAKE_SET
 
@@ -31,20 +32,6 @@ AC_CANONICAL_HOST
 dnl Checks for programs.
 AC_PROG_CC
 
-dnl Checks for libraries.
-dnl Check for crypto moved under SNMP
-dnl Why I had -lsnmp before ???
-dnl AC_CHECK_LIB(snmp, main, LIBS="-lsnmp $LIBS")
-dnl Required for AIX when -lsnmp is used
-dnl AC_CHECK_LIB(isode, main)
-AC_CHECK_LIB(socket, main)
-#Solaris SNMP requires this
-AC_CHECK_LIB(kstat, main)
-AC_CHECK_LIB(nsl, main)
-AC_CHECK_LIB(resolv, main)
-AC_CHECK_LIB(kvm, main)
-dnl AC_CHECK_LIB(pthread, pthread_exit, LIBS="-pthread $LIBS")
-
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(stdio.h stdlib.h string.h unistd.h netdb.h signal.h \
@@ -63,6 +50,20 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T
 
+dnl Checks for libraries.
+dnl Check for crypto moved under SNMP
+dnl Why I had -lsnmp before ???
+dnl AC_CHECK_LIB(snmp, main, LIBS="-lsnmp $LIBS")
+dnl Required for AIX when -lsnmp is used
+dnl AC_CHECK_LIB(isode, main)
+AC_CHECK_LIB(socket, main)
+#Solaris SNMP requires this
+AC_CHECK_LIB(kstat, main)
+AC_CHECK_LIB(nsl, main)
+AC_CHECK_LIB(resolv, main)
+AC_CHECK_LIB(kvm, main)
+dnl AC_CHECK_LIB(pthread, pthread_exit, LIBS="-pthread $LIBS")
+
 dnl Check for socklen_t
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE(
@@ -455,20 +456,24 @@ AC_ARG_ENABLE(static,[
 AC_ARG_ENABLE(server,
 [  --enable-server         Turn on build of server],
 [case "${enableval}" in
-  yes) server=true ;;
-  no)  server=false ;;
+  yes) server=yes ;;
+  no)  server=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-server) ;;
-esac],[server=false])
-AM_CONDITIONAL(SERVER, test x$server = xtrue)
+esac],
+[server=no])
+AM_CONDITIONAL(SERVER, test x$server = xyes)
 
 AC_ARG_ENABLE(agent,
 [  --enable-agent          Turn on build of agent],
 [case "${enableval}" in
-  yes) agent=true ;;
-  no)  agent=false ;;
+  yes) agent=yes ;;
+  no)  agent=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-agent) ;;
-esac],[agent=false])
-AM_CONDITIONAL(AGENT, test x$agent = xtrue)
+esac],
+[agent=no])
+AM_CONDITIONAL(AGENT, test x$agent = xyes)
+    
+have_db="no"
 
 AC_MSG_CHECKING(for MySQL support)
 AC_ARG_WITH(mysql,
@@ -517,7 +522,7 @@ dnl    MYSQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r"
 
     AC_DEFINE(HAVE_MYSQL,1,[Define to 1 if MySQL should be enabled.])
     AC_MSG_RESULT(yes)
-    have_db=yes
+    have_db="MySQL"
     dnl MySQL requires -lm sometime
     AC_CHECK_FUNC(floor, , AC_CHECK_LIB(m, floor, MYSQL_LFLAGS="$MYSQL_LFLAGS -lm"))
     dnl MySQL 3.23 requires -lz sometime
@@ -541,7 +546,7 @@ AC_ARG_WITH(pgsql,
                          base install directory, defaults to /usr/local/pgsql.],
 [
   if test "$withval" != "no"; then
-      if test "$have_db" = "yes"; then
+      if test "$have_db" != "no"; then
           AC_MSG_RESULT(error)
           AC_MSG_ERROR("You can configure for only one database.");
       fi
@@ -578,7 +583,7 @@ dnl    AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, LIBS="-lcrypt $LIBS"))
 
     AC_DEFINE(HAVE_PGSQL,1,[Define to 1 if PostgreSQL should be enabled.])
     AC_MSG_RESULT(yes)
-    have_db=yes
+    have_db="PostagreSQL"
   else
     AC_MSG_RESULT(no)
   fi
@@ -770,9 +775,14 @@ If you want to check LDAP servers:
 AC_SUBST(LDAP_LFLAGS)
 AC_SUBST(LDAP_INCLUDE)
 
-if test "$have_db" != "yes"; then
-	echo "configure: No database selected! Use --with-XXX where XXX is your preferred database type";
-	echo "configure: Server processes (zabbix_suckerd and zabbix_trapper) will not be created !";
+if test "$have_db" = "no"; then
+	echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+	echo "!! configure WARNING:                                     !!";
+	echo "!!     No database selected! Use --with-XXX, where XXX    !!";
+	echo "!!   is your preferred database type (mysql or pgsql)     !!";
+	echo "!!   Server processes (zabbix_suckerd and zabbix_trapper) !!";
+	echo "!!   will not be created!                                 !!";
+	echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 
 #	SUBDIRS="src/zabbix_agent src/zabbix_sender"
 #else
@@ -897,7 +907,12 @@ Configuration:
   Install path:     ${prefix}
   Compiler:         ${CC}
   Compiler flags:   ${CFLAGS}
-  Linker flags:     ${LIBS}"
+  Linker flags:     ${LIBS}
+
+  Enable server:    ${server}
+  With database:    ${have_db}
+
+  Enable agent:     ${agent}"
 
 echo
 echo "***********************************************************"
diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c
index b35b73a4..b8ba70e9 100644
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -195,9 +195,8 @@ int	num_param(const char *param)
  ******************************************************************************/
 void	delete_reol(char *c)
 {
-	int i,j;
+	int i;
 
-	j=0;
 	for(i=(int)strlen(c)-1;i>=0;i--)
 	{
 		if( c[i] != '\n')	break;
diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c
index 9936d3c1..11585391 100644
--- a/src/zabbix_server/poller/checks_agent.c
+++ b/src/zabbix_server/poller/checks_agent.c
@@ -126,7 +126,7 @@ int	get_value_agent(DB_ITEM *item, AGENT_RESULT *result)
 		return	NETWORK_ERROR;
 	}
 
-	snprintf(c,sizeof(c)-1,"%s\n",item->key);
+	snprintf(c, MAX_STRING_LEN - 1, "%s\n",item->key);
 	zabbix_log(LOG_LEVEL_DEBUG, "Sending [%s]", c);
 	if( write(s,c,strlen(c)) == -1 )
 	{
@@ -147,7 +147,7 @@ int	get_value_agent(DB_ITEM *item, AGENT_RESULT *result)
 	} 
 
 	memset(c,0,MAX_STRING_LEN);
-	len=read(s,c,MAX_STRING_LEN);
+	len=read(s, c, MAX_STRING_LEN);
 	if(len == -1)
 	{
 		switch (errno)
@@ -181,7 +181,7 @@ int	get_value_agent(DB_ITEM *item, AGENT_RESULT *result)
 
 /*	if(len>0)
 	{
-		c[len-1]=0;
+		c[len]=0;
 	}*/
 	zabbix_log(LOG_LEVEL_DEBUG, "Got string:[%d] [%s]", len, c);
 
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index ff182141..305af93e 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -212,7 +212,7 @@ int get_values(void)
 
 		init_result(&agent);
 		res = get_value(&item, &agent);
-		zabbix_log( LOG_LEVEL_DEBUG, "GOT VALUE TYPE [%d]", agent.type);
+		zabbix_log( LOG_LEVEL_DEBUG, "GOT VALUE TYPE [0x%X]", agent.type);
 		
 		if(res == SUCCEED )
 		{