[Nagios-checkins] CVS: nagios configure,1.39,1.40 configure.in,1.39,1.40

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs1:/tmp/cvs-serv27086

Modified Files:
	configure configure.in 
Log Message:
Fixed memory leak

Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** configure	9 Jan 2003 02:53:09 -0000	1.39
--- configure	27 Jan 2003 03:14:11 -0000	1.40
***************
*** 16,26 ****
  --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
! --with-nagios-grp=<grp> sets group name to run nagios"
! ac_help="$ac_help
! --with-mail=<path_to_mail> sets path to equivalent program to mail"
  ac_help="$ac_help
  --with-command-user=<user> sets user name for command access"
  ac_help="$ac_help
! --with-command-grp=<grp> sets group name for command access"
  ac_help="$ac_help
  --with-init-dir=<path> sets directory to place init script into"
--- 16,26 ----
  --with-nagios-user=<user> sets user name to run nagios"
  ac_help="$ac_help
! --with-nagios-group=<grp> sets group name to run nagios"
  ac_help="$ac_help
  --with-command-user=<user> sets user name for command access"
  ac_help="$ac_help
! --with-command-group=<grp> sets group name for command access"
! ac_help="$ac_help
! --with-mail=<path_to_mail> sets path to equivalent program to mail"
  ac_help="$ac_help
  --with-init-dir=<path> sets directory to place init script into"
***************
*** 2059,2062 ****
--- 2059,2083 ----
  
  
+ # Check whether --with-command_user or --without-command_user was given.
+ if test "${with_command_user+set}" = set; then
+   withval="$with_command_user"
+   command_user=$withval
+ else
+   command_user=$nagios_user
+ fi
+ 
+ # Check whether --with-command_grp or --without-command_grp was given.
+ if test "${with_command_grp+set}" = set; then
+   withval="$with_command_grp"
+   command_grp=$withval
+ else
+   command_grp=$nagios_grp
+ fi
+ 
+ 
+ 
+ COMMAND_OPTS="-o $command_user -g $command_grp"
+ 
+ 
  MAIL_PROG=no
  # Check whether --with-mail or --without-mail was given.
***************
*** 2072,2076 ****
  set dummy mail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2075: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MAIL_PROG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2093,2097 ----
  set dummy mail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2096: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MAIL_PROG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2107,2131 ****
  
  
- # Check whether --with-command_user or --without-command_user was given.
- if test "${with_command_user+set}" = set; then
-   withval="$with_command_user"
-   command_user=$withval
- else
-   command_user=$nagios_user
- fi
- 
- # Check whether --with-command_grp or --without-command_grp was given.
- if test "${with_command_grp+set}" = set; then
-   withval="$with_command_grp"
-   command_grp=$withval
- else
-   command_grp=$nagios_grp
- fi
- 
- 
- 
- COMMAND_OPTS="-o $command_user -g $command_grp"
- 
- 
  init_dir=/etc/rc.d/init.d
  if test -d /etc/rc.d/init.d; then
--- 2128,2131 ----
***************
*** 3336,3343 ****
  s%@nagios_grp@%$nagios_grp%g
  s%@INSTALL_OPTS@%$INSTALL_OPTS%g
- s%@MAIL_PROG@%$MAIL_PROG%g
  s%@command_user@%$command_user%g
  s%@command_grp@%$command_grp%g
  s%@COMMAND_OPTS@%$COMMAND_OPTS%g
  s%@init_dir@%$init_dir%g
  s%@lockfile@%$lockfile%g
--- 3336,3343 ----
  s%@nagios_grp@%$nagios_grp%g
  s%@INSTALL_OPTS@%$INSTALL_OPTS%g
  s%@command_user@%$command_user%g
  s%@command_grp@%$command_grp%g
  s%@COMMAND_OPTS@%$COMMAND_OPTS%g
+ s%@MAIL_PROG@%$MAIL_PROG%g
  s%@init_dir@%$init_dir%g
  s%@lockfile@%$lockfile%g

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** configure.in	9 Jan 2003 02:53:09 -0000	1.39
--- configure.in	27 Jan 2003 03:14:11 -0000	1.40
***************
*** 126,130 ****
  
  AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name to run nagios,nagios_user=$withval,nagios_user=nagios)
! AC_ARG_WITH(nagios_grp,--with-nagios-grp=<grp> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
  AC_SUBST(nagios_user)
  AC_SUBST(nagios_grp)
--- 126,130 ----
  
  AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name to run nagios,nagios_user=$withval,nagios_user=nagios)
! AC_ARG_WITH(nagios_grp,--with-nagios-group=<grp> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
  AC_SUBST(nagios_user)
  AC_SUBST(nagios_grp)
***************
*** 134,137 ****
--- 134,144 ----
  AC_SUBST(INSTALL_OPTS)
  
+ AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
+ AC_ARG_WITH(command_grp,--with-command-group=<grp> sets group name for command access,command_grp=$withval,command_grp=$nagios_grp)
+ AC_SUBST(command_user)
+ AC_SUBST(command_grp)
+ COMMAND_OPTS="-o $command_user -g $command_grp"
+ AC_SUBST(COMMAND_OPTS)
+ 
  dnl Check for location of mail program
  MAIL_PROG=no
***************
*** 141,151 ****
  fi 
  AC_SUBST(MAIL_PROG)
- 
- AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
- AC_ARG_WITH(command_grp,--with-command-grp=<grp> sets group name for command access,command_grp=$withval,command_grp=$nagios_grp)
- AC_SUBST(command_user)
- AC_SUBST(command_grp)
- COMMAND_OPTS="-o $command_user -g $command_grp"
- AC_SUBST(COMMAND_OPTS)
  
  dnl Check for location of init scripts
--- 148,151 ----