Attachment #76069 for bug #109731

View | Details | Raw Unified | Return to bug 109731
Collapse All | Expand All

Lines 6-12 Link Here

(-)ports/net-mgmt/nagios-plugins/Makefile (-2 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= nagios-plugins	8	PORTNAME= nagios-plugins
9	PORTVERSION= 1.4.5	9	PORTVERSION= 1.4.6
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 21-27 Link Here
21	USE_GETTEXT= yes	21	USE_GETTEXT= yes
22	USE_PERL5= yes	22	USE_PERL5= yes
23	USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:259	23	USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:259
24	ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I m4	24	ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I gl/m4
25		25
26	OPTIONS= QSTAT "Game server query support (check_game)" OFF \	26	OPTIONS= QSTAT "Game server query support (check_game)" OFF \
27	FPING "Support for non-flooding fast ping (check_fping)" OFF \	27	FPING "Support for non-flooding fast ping (check_fping)" OFF \
Lines 55-60 Link Here
55	LDFLAGS="${LDFLAGS}" \	55	LDFLAGS="${LDFLAGS}" \
56	LIBS="-L${LOCALBASE}/lib" \	56	LIBS="-L${LOCALBASE}/lib" \
57	PERL=${PERL}	57	PERL=${PERL}
		58
		59	MAKE_ARGS= MKINSTALLDIRS=../mkinstalldirs
58		60
59	.if defined(WITH_QSTAT)	61	.if defined(WITH_QSTAT)
60	BUILD_DEPENDS+= qstat:${PORTSDIR}/games/qstat	62	BUILD_DEPENDS+= qstat:${PORTSDIR}/games/qstat

Lines 1-3 Link Here

(-)ports/net-mgmt/nagios-plugins/distinfo (-3 / +3 lines)
1	MD5 (nagios-plugins-1.4.5.tar.gz) = 359afddaf6a8e3228a5130b60bed0f67	1	MD5 (nagios-plugins-1.4.6.tar.gz) = ea79fa91092d709aa6b2e732b1d55541
2	SHA256 (nagios-plugins-1.4.5.tar.gz) = 2bf4a629f1217be0621fe280ed835b2497111ba2022e715bcdd01307c0ce52f6	2	SHA256 (nagios-plugins-1.4.6.tar.gz) = 892adc5bde75c711dc63d6bde9caf9c5f93d7a6e6df8df24c160b427bb1d51ca
3	SIZE (nagios-plugins-1.4.5.tar.gz) = 1285997	3	SIZE (nagios-plugins-1.4.6.tar.gz) = 1349110




--- configure.in.orig	Mon Feb  5 23:43:05 2007
+++ configure.in	Thu Feb 22 19:10:56 2007
@@ -12,8 +12,6 @@
 RELEASE=1
 AC_SUBST(RELEASE)
 

 dnl Deprecated configure options
 AC_ARG_WITH(nagios_user,,
  	AC_MSG_ERROR([--with-nagios-user is a deprecated option]))
@@ -27,7 +25,7 @@
 AC_PROG_CC
 gl_EARLY
 AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 
 AM_PROG_CC_C_O
 
@@ -150,11 +148,12 @@
 	ACX_HELP_STRING([--with-pgsql=DIR],
 		[sets path to pgsql installation]),
 	PGSQL=$withval,)

   fi
   AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
   if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
@@ -191,30 +190,42 @@
   AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
   AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
 fi

   AC_CHECK_FUNCS(ldap_set_option)
   EXTRAS="$EXTRAS check_ldap"
 	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
@@ -223,6 +234,7 @@
   AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
 fi
 LIBS="$_SAVEDLIBS"

 
 dnl Check for mysql libraries
 dnl Default is to search path for mysql_config
@@ -485,47 +497,10 @@
 	ac_cv_ps_cols="$PS_COLS"
 	AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
 

 then
 	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
@@ -533,9 +508,8 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 

 elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
 	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
 then
@@ -545,209 +519,6 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 

 else
 	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
 fi
@@ -1117,6 +888,8 @@
 AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
 	[path and arguments for invoking 'who'])
 

 AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
 AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
@@ -1147,7 +920,10 @@
 else
 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi

 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 AC_ARG_WITH(qstat_command,
@@ -1172,7 +948,10 @@
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
 fi

 AC_PATH_PROG(PATH_TO_FPING,fping)
 AC_ARG_WITH(fping_command,
             ACX_HELP_STRING([--with-fping-command=PATH],
@@ -1184,6 +963,7 @@
 else
 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
 fi

 
 AC_PATH_PROG(PATH_TO_SSH,ssh)
 AC_ARG_WITH(ssh_command,
@@ -1251,32 +1031,12 @@
 dnl end if for PATH_TO_SWAP
 fi
 

-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
-then
-	ac_cv_have_swap=yes
-	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
-	ac_cv_swap_format=["%*s %f %*d %f"]
-	ac_cv_swap_conv=1024
-	AC_MSG_RESULT([using HP-UX format swapinfo])

Lines 1-11 Link Here

(-)ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h (-11 lines)
1	--- lib/regex_internal.h.orig Thu May 25 22:03:24 2006
2	+++ lib/regex_internal.h Sat Oct 28 10:04:21 2006
3	@@ -455,8 +455,6 @@
4	#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
5	#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
6
7	-#include <alloca.h>
8	-
9	#ifndef _LIBC
10	# if HAVE_ALLOCA
11	/* The OS usually guarantees only one guard page at the bottom of the stack,

Lines 1-11 Link Here

(-)ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am (-5 / +5 lines)
1	--- plugins/Makefile.am.orig Tue Mar 21 22:12:59 2006	1	--- plugins/Makefile.am.orig Thu Jan 25 09:48:05 2007
2	+++ plugins/Makefile.am Fri May 12 23:37:04 2006	2	+++ plugins/Makefile.am Thu Feb 22 19:32:15 2007
3	@@ -4,7 +4,7 @@	3	@@ -2,7 +2,7 @@
4		4
5	VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t	5	VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
6		6
7	-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@	7	-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
8	+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@	8	+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
9		9
10	datadir = @datadir@	10	datadir = @datadir@
11	localedir = $(datadir)/locale	11	localedir = $(datadir)/locale




--- plugins/check_radius.c.orig	Mon Jan 29 08:16:40 2007
+++ plugins/check_radius.c	Tue Feb 27 21:36:09 2007
@@ -43,7 +43,7 @@
 #include "utils.h"
 #include "netutils.h"
 

 
 int process_arguments (int, char **);
 void print_help (void);
@@ -124,6 +124,7 @@
 	int result = STATE_UNKNOWN;
 	UINT4 client_id;
 	char *str;

 
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
@@ -133,33 +134,36 @@
 		usage4 (_("Could not parse arguments"));
 
 	str = strdup ("dictionary");

 
 	service = PW_AUTHENTICATE_ONLY;
 
 	memset (&data, 0, sizeof(data));
-	if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
-				rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
-				rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&

Lines 1-11 Link Here

(-)ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c (-11 lines)
1	--- plugins/check_tcp.c.orig Thu Mar 30 02:03:36 2006
2	+++ plugins/check_tcp.c Fri May 12 23:27:44 2006
3	@@ -155,7 +155,7 @@
4	SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
5	EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
6	QUIT = "</stream:stream>\n";
7	- flags \|= FLAG_SSL \| FLAG_HIDE_OUTPUT;
8	+ flags \|= FLAG_HIDE_OUTPUT;
9	PORT = 5222;
10	}
11	else if (!strncmp (SERVICE, "NNTPS", 5)) {

Return to bug 109731

Lines 1-6 Link Here

(-)ports/net-mgmt/nagios-plugins/files/patch-configure.in (-19 / +19 lines)
1	--- configure.in.orig Fri Oct 20 05:34:23 2006	1	--- configure.in.orig Mon Feb 5 23:43:05 2007
2	+++ configure.in Sat Oct 28 09:57:25 2006	2	+++ configure.in Thu Feb 22 19:10:56 2007
3	@@ -10,8 +10,6 @@	3	@@ -12,8 +12,6 @@
4	RELEASE=1	4	RELEASE=1
5	AC_SUBST(RELEASE)	5	AC_SUBST(RELEASE)
6		6
Lines 9-24 Link Here
9	dnl Deprecated configure options	9	dnl Deprecated configure options
10	AC_ARG_WITH(nagios_user,,	10	AC_ARG_WITH(nagios_user,,
11	AC_MSG_ERROR([--with-nagios-user is a deprecated option]))	11	AC_MSG_ERROR([--with-nagios-user is a deprecated option]))
12	@@ -29,7 +27,7 @@	12	@@ -27,7 +25,7 @@
13	AC_PROG_CC	13	AC_PROG_CC
14	AC_PROG_CPP	14	gl_EARLY
15	AC_PROG_GCC_TRADITIONAL	15	AC_PROG_GCC_TRADITIONAL
16	-AC_PROG_LIBTOOL	16	-AC_PROG_LIBTOOL
17	+AC_PROG_RANLIB	17	+AC_PROG_RANLIB
18		18
19	AC_PROG_MAKE_SET	19	AM_PROG_CC_C_O
20	AC_PROG_AWK	20
21	@@ -167,11 +165,12 @@	21	@@ -150,11 +148,12 @@
22	ACX_HELP_STRING([--with-pgsql=DIR],	22	ACX_HELP_STRING([--with-pgsql=DIR],
23	[sets path to pgsql installation]),	23	[sets path to pgsql installation]),
24	PGSQL=$withval,)	24	PGSQL=$withval,)
Lines 33-39 Link Here
33	fi	33	fi
34	AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)	34	AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
35	if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then	35	if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
36	@@ -208,30 +207,42 @@	36	@@ -191,30 +190,42 @@
37	AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])	37	AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
38	AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])	38	AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
39	fi	39	fi
Lines 83-89 Link Here
83	AC_CHECK_FUNCS(ldap_set_option)	83	AC_CHECK_FUNCS(ldap_set_option)
84	EXTRAS="$EXTRAS check_ldap"	84	EXTRAS="$EXTRAS check_ldap"
85	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)	85	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
86	@@ -240,6 +251,7 @@	86	@@ -223,6 +234,7 @@
87	AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])	87	AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
88	fi	88	fi
89	LIBS="$_SAVEDLIBS"	89	LIBS="$_SAVEDLIBS"
Lines 91-97 Link Here
91		91
92	dnl Check for mysql libraries	92	dnl Check for mysql libraries
93	dnl Default is to search path for mysql_config	93	dnl Default is to search path for mysql_config
94	@@ -654,47 +666,10 @@	94	@@ -485,47 +497,10 @@
95	ac_cv_ps_cols="$PS_COLS"	95	ac_cv_ps_cols="$PS_COLS"
96	AC_MSG_RESULT([(command-line) $ac_cv_ps_command])	96	AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
97		97
Lines 142-148 Link Here
142	then	142	then
143	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"	143	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
144	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"	144	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
145	@@ -702,9 +677,8 @@	145	@@ -533,9 +508,8 @@
146	ac_cv_ps_cols=9	146	ac_cv_ps_cols=9
147	AC_MSG_RESULT([$ac_cv_ps_command])	147	AC_MSG_RESULT([$ac_cv_ps_command])
148		148
Lines 154-160 Link Here
154	elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null \| \	154	elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null \| \
155	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null	155	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
156	then	156	then
157	@@ -714,209 +688,6 @@	157	@@ -545,209 +519,6 @@
158	ac_cv_ps_cols=9	158	ac_cv_ps_cols=9
159	AC_MSG_RESULT([$ac_cv_ps_command])	159	AC_MSG_RESULT([$ac_cv_ps_command])
160		160
Lines 364-370 Link Here
364	else	364	else
365	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])	365	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
366	fi	366	fi
367	@@ -1286,6 +1057,8 @@	367	@@ -1117,6 +888,8 @@
368	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",	368	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
369	[path and arguments for invoking 'who'])	369	[path and arguments for invoking 'who'])
370		370
Lines 373-379 Link Here
373	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)	373	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
374	AC_ARG_WITH(snmpget_command,	374	AC_ARG_WITH(snmpget_command,
375	ACX_HELP_STRING([--with-snmpget-command=PATH],	375	ACX_HELP_STRING([--with-snmpget-command=PATH],
376	@@ -1316,7 +1089,10 @@	376	@@ -1147,7 +920,10 @@
377	else	377	else
378	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])	378	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
379	fi	379	fi
Lines 384-390 Link Here
384	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)	384	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
385	AC_PATH_PROG(PATH_TO_QSTAT,qstat)	385	AC_PATH_PROG(PATH_TO_QSTAT,qstat)
386	AC_ARG_WITH(qstat_command,	386	AC_ARG_WITH(qstat_command,
387	@@ -1341,7 +1117,10 @@	387	@@ -1172,7 +948,10 @@
388	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",	388	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
389	[path to qstat/quakestat])	389	[path to qstat/quakestat])
390	fi	390	fi
Lines 395-401 Link Here
395	AC_PATH_PROG(PATH_TO_FPING,fping)	395	AC_PATH_PROG(PATH_TO_FPING,fping)
396	AC_ARG_WITH(fping_command,	396	AC_ARG_WITH(fping_command,
397	ACX_HELP_STRING([--with-fping-command=PATH],	397	ACX_HELP_STRING([--with-fping-command=PATH],
398	@@ -1353,6 +1132,7 @@	398	@@ -1184,6 +963,7 @@
399	else	399	else
400	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])	400	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
401	fi	401	fi
Lines 403-409 Link Here
403		403
404	AC_PATH_PROG(PATH_TO_SSH,ssh)	404	AC_PATH_PROG(PATH_TO_SSH,ssh)
405	AC_ARG_WITH(ssh_command,	405	AC_ARG_WITH(ssh_command,
406	@@ -1420,32 +1200,12 @@	406	@@ -1251,32 +1031,12 @@
407	dnl end if for PATH_TO_SWAP	407	dnl end if for PATH_TO_SWAP
408	fi	408	fi
409		409
Lines 426-432 Link Here
426	-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null \| egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]	426	-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null \| egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
427	-then	427	-then
428	- ac_cv_have_swap=yes	428	- ac_cv_have_swap=yes
429	- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM",	429	- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
430	- ac_cv_swap_format=["%s %f %d %f"]	430	- ac_cv_swap_format=["%s %f %d %f"]
431	- ac_cv_swap_conv=1024	431	- ac_cv_swap_conv=1024
432	- AC_MSG_RESULT([using HP-UX format swapinfo])	432	- AC_MSG_RESULT([using HP-UX format swapinfo])

Lines 1-6 Link Here

(-)ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c (-5 / +6 lines)
1	--- plugins/check_radius.c.orig Tue Jun 20 20:47:02 2006	1	--- plugins/check_radius.c.orig Mon Jan 29 08:16:40 2007
2	+++ plugins/check_radius.c Sat Oct 28 09:57:25 2006	2	+++ plugins/check_radius.c Tue Feb 27 21:36:09 2007
3	@@ -40,7 +40,7 @@	3	@@ -43,7 +43,7 @@
4	#include "utils.h"	4	#include "utils.h"
5	#include "netutils.h"	5	#include "netutils.h"
6		6
Lines 9-15 Link Here
9		9
10	int process_arguments (int, char **);	10	int process_arguments (int, char **);
11	void print_help (void);	11	void print_help (void);
12	@@ -121,6 +121,7 @@	12	@@ -124,6 +124,7 @@
13	int result = STATE_UNKNOWN;	13	int result = STATE_UNKNOWN;
14	UINT4 client_id;	14	UINT4 client_id;
15	char *str;	15	char *str;
Lines 17-23 Link Here
17		17
18	setlocale (LC_ALL, "");	18	setlocale (LC_ALL, "");
19	bindtextdomain (PACKAGE, LOCALEDIR);	19	bindtextdomain (PACKAGE, LOCALEDIR);
20	@@ -130,32 +131,35 @@	20	@@ -133,33 +134,36 @@
21	usage4 (_("Could not parse arguments"));	21	usage4 (_("Could not parse arguments"));
22		22
23	str = strdup ("dictionary");	23	str = strdup ("dictionary");
Lines 32-37 Link Here
32		32
33	service = PW_AUTHENTICATE_ONLY;	33	service = PW_AUTHENTICATE_ONLY;
34		34
		35	memset (&data, 0, sizeof(data));
35	- if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&	36	- if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
36	- rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&	37	- rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
37	- rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&	38	- rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&