--- a/configure
+++ b/configure
@@ -28209,7 +28209,7 @@ fi
 
 if test "$ac_cv_have_decl_swapctl" = "yes";
 then
-	EXTRAS="$EXTRAS check_swap"
+	EXTRAS="$EXTRAS"
 	{ echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5
 echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; }
 	if test "$ac_cv_type_swaptbl_t" = "yes" -a \
@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_SWAP 1
 _ACEOF
 
-	EXTRAS="$EXTRAS check_swap"
+	EXTRAS="$EXTRAS"
 fi
 if test "x$ac_cv_swap_command" != "x"
 then
@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF
 #define PROC_MEMINFO "$ac_cv_proc_meminfo"
 _ACEOF
 
-	EXTRAS="$EXTRAS check_swap"
+	EXTRAS="$EXTRAS"
 fi
 
 # Extract the first word of "dig", so it can be a program name with args.
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust
 check_tcp_programs = check_ftp check_imap check_nntp check_pop \
 	check_udp check_clamd @check_tcp_ssl@
 
-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
-	check_swap check_fping check_ldap check_game check_dig \
+EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \
+	check_fping check_ldap check_game check_dig \
 	check_nagios check_by_ssh check_dns check_nt check_ide_smart	\
 	check_procs check_mysql_query check_apt
 
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -32,7 +32,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
-	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
+	check_dummy$(EXEEXT) check_http$(EXEEXT) \
 	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
 	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
 	check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch
 	check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \
 	check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@
 EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \
-	check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \
-	check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \
+	check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \
+	check_fping$(EXEEXT) check_ldap$(EXEEXT) \
 	check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
 	check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \
 	check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li
 #include <libpq-fe.h>
 #include <pg_config_manual.h>
 
+#define NAMEDATALEN 64
 #define DEFAULT_DB "template1"
 #define DEFAULT_HOST "127.0.0.1"