Attachment 157561 Details for Bug 245214 – diffs

[patch] diffs

cvsdiffs (text/plain), 17.36 KB, created by Rich Megginson on 2007-06-21 18:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-21 18:10:18 UTC

Size: 17.36 KB

patch

obsolete

>Index: adminserver/m4/httpd.m4
>===================================================================
>RCS file: /cvs/dirsec/adminserver/m4/httpd.m4,v
>retrieving revision 1.3
>diff -u -8 -r1.3 httpd.m4
>--- adminserver/m4/httpd.m4	21 May 2007 15:52:27 -0000	1.3
>+++ adminserver/m4/httpd.m4	21 Jun 2007 18:06:12 -0000
>@@ -13,23 +13,41 @@
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
> #
> # END COPYRIGHT BLOCK
> 
>-AC_PATH_PROG([HTTPD], [httpd.worker], [],
>-			 [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>-if test -z "$HTTPD" -o ! -x "$HTTPD" ; then
>-    AC_PATH_PROG([HTTPD], [httpd], [],
>-	    		 [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>+AC_MSG_CHECKING(for --with-httpd)
>+AC_ARG_WITH(httpd,
>+            AS_HELP_STRING([--with-httpd=PATH],
>+                           [Full path of Apache binary.  Configure will usually find the right one, but if it does not, use this to specify the correct binary.]),
>+[
>+  if test -x "$withval"
>+  then
>+    AC_MSG_RESULT([using $withval])
>+    HTTPD="$withval"
>+  else
>+    echo
>+    AC_MSG_ERROR([$withval not found])
>+  fi
>+],
>+AC_MSG_RESULT(no))
>+
>+if test -z "$HTTPD" ; then
>+    AC_PATH_PROG([HTTPD], [httpd.worker], [],
>+                 [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>+    if test -z "$HTTPD" -o ! -x "$HTTPD" ; then
>+        AC_PATH_PROG([HTTPD], [httpd], [],
>+                     [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>+    fi
>     if test -z "$HTTPD" -o ! -x "$HTTPD" ; then
>-	    AC_MSG_ERROR([Apache2 httpd server not found])
>+        AC_MSG_ERROR([Apache2 httpd server not found])
>     fi
> fi
> 
> httpd_root=`$HTTPD -V | grep HTTPD_ROOT | cut -f2 -d=`
> httpd_root=`eval echo $httpd_root`
> httpd_conf_rel=`$HTTPD -V | grep SERVER_CONFIG_FILE | cut -f2 -d=`
> httpd_conf_rel=`eval echo $httpd_conf_rel`
> # Server version: Apache/2.2.2
>@@ -43,17 +61,80 @@
> httpdconf=${httpd_root}/${httpd_conf_rel}
> 
> mimemagic=`grep MIMEMagicFile $httpdconf|grep -v \^# | awk '{print $2}'`
> if test ! -f "$mimemagic" ; then
> # assume relative to root
>     mimemagic=${httpd_root}/${mimemagic}
> fi
> 
>-AC_PATH_PROG([APXS], [apxs], [],
>-			 [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>-if test -n "$APXS" -a -x "$APXS" ; then
>-    moddir=`$APXS -q LIBEXECDIR`
>+# check for --with-apxs
>+AC_MSG_CHECKING(for --with-apxs)
>+AC_ARG_WITH(apxs,
>+            AS_HELP_STRING([--with-apxs=PATH],
>+                           [Path to apxs]),
>+[
>+  if test -x "$withval"
>+  then
>+    AC_MSG_RESULT([using $withval])
>+    APXS=$withval
>+  else
>+    echo
>+    AC_MSG_ERROR([$withval not found or not executable])
>+  fi
>+],
>+AC_MSG_RESULT(no))
>+
>+if test -z "$APXS" ; then
>+    # first look for APXS in same dir as HTTPD
>+    apachedir=`dirname $HTTPD`
>+    if test -x "$apachedir/apxs" ; then
>+        APXS="$apachedir/apxs"
>+    else
>+        AC_PATH_PROG([APXS], [apxs], [],
>+                     [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
>+    fi
>+    if test -z "$APXS" ; then
>+        AC_MSG_ERROR([Apache2 apxs program not found])
>+    fi
>+fi
>+
>+AC_CHECKING(for apr-config)
>+# check for --with-apr-config
>+AC_MSG_CHECKING(for --with-apr-config)
>+AC_ARG_WITH(apr-config,
>+            AS_HELP_STRING([--with-apr-config],
>+                           [Use apr-config to determine the APR directory]),
>+[
>+  if test -x "$withval"
>+  then
>+    AC_MSG_RESULT([using $withval])
>+    APR_CONFIG=$withval
>+  fi
>+],
>+AC_MSG_RESULT(no))
>+
>+if test -z "$APR_CONFIG" ; then
>+    # first look for APR_CONFIG in the bin dir if HTTPD is in the sbin dir
>+    apachedir=`dirname $HTTPD`
>+    parentdir=`dirname $apachedir`
>+    if test -x "$parentdir/bin/apr-1-config" ; then
>+        APR_CONFIG="$parentdir/bin/apr-1-config"
>+    elif test -x "$parentdir/bin/apr-config" ; then
>+        APR_CONFIG="$parentdir/bin/apr-config"
>+    else
>+        AC_PATH_PROGS(APR_CONFIG, apr-1-config apr-config, NO_APR_CONFIG,
>+                      [$PATH:/opt/hpws/apache/bin:/usr/local/apache/bin:/usr/bin])
>+    fi
>+    if test -z "$APR_CONFIG" ; then
>+        AC_MSG_ERROR([Apache2 apr-config program not found])
>+    fi
> fi
> 
> if test -z "$moddir" ; then
>-    moddir='$(libdir)/httpd/modules'
>+    if test -n "$APXS" -a -x "$APXS" ; then
>+        moddir=`$APXS -q LIBEXECDIR`
>+    fi
>+
>+    if test -z "$moddir" ; then
>+        moddir='$(libdir)/httpd/modules'
>+    fi
> fi
>Index: adminserver/m4/mod_nss.m4
>===================================================================
>RCS file: /cvs/dirsec/adminserver/m4/mod_nss.m4,v
>retrieving revision 1.2
>diff -u -8 -r1.2 mod_nss.m4
>--- adminserver/m4/mod_nss.m4	21 May 2007 15:52:27 -0000	1.2
>+++ adminserver/m4/mod_nss.m4	21 Jun 2007 18:06:12 -0000
>@@ -45,46 +45,17 @@
>     modnssbindir="$withval"
>   else
>     echo
>     AC_MSG_ERROR([$withval not found])
>   fi
> ],
> AC_MSG_RESULT(no))
> 
>-# check for --with-fortitude
>-default_fortitudedir=/opt/fortitude
>-AC_MSG_CHECKING(for --with-fortitude)
>-AC_ARG_WITH(fortitude, [  --with-fortitude=PATH     Fortitude root directory (default: $default_fortitudedir)],
>-[
>-  if test -d "$withval"
>-  then
>-    AC_MSG_RESULT([using $withval])
>-    fortitudedir="$withval"
>-  elif test "$withval" = "yes" -a -d $default_fortitudedir ; then
>-    AC_MSG_RESULT([using $default_fortitudedir])
>-    fortitudedir="$default_fortitudedir"
>-  else
>-    echo
>-    AC_MSG_ERROR([$withval not found])
>-  fi
>-],
>-AC_MSG_RESULT(no))
>-
>-if test -n "$fortitudedir" ; then
>-    if test -z "$nssmoddir" ; then
>-        nssmoddir="$fortitudedir/modules.local"
>-    fi
>-    if test -z "$modnssbindir" ; then
>-        modnssbindir="$fortitudedir/bin"
>-    fi
>-fi
> # else, parse httpd.conf or httpconfdir/nss.conf
>-
>-# else, punt
> if test -z "$modnssbindir" ; then
>     nsspcache=`grep NSSPassPhraseHelper $httpdconf|awk '{print $2}'`
>     if test -z "$nsspcache" ; then
>         nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/* | awk '{print $2}'`
>     fi
>     if test -z "$nsspcache" ; then
>         # same directory as Apache?
>         modnssbindir=`dirname $HTTPD`
>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.13
>diff -u -8 -r1.13 Makefile.am
>--- adminserver/Makefile.am	20 Jun 2007 22:33:15 -0000	1.13
>+++ adminserver/Makefile.am	21 Jun 2007 18:06:12 -0000
>@@ -108,19 +108,24 @@
> 	-DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
> 	-DPIDFILE=\"$(pidfile)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \
> 	-DBUILD_NUM=$(BUILDNUM) -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\"
> 
> lib_LTLIBRARIES = libds-admin-serv.la
> 
> noinst_LIBRARIES = libdsa.a
> 
>+LIBSOCKET=@LIBSOCKET@
>+LIBNSL=@LIBNSL@
>+LIBCSTD=@LIBCSTD@
>+LIBCRUN=@LIBCRUN@
>+
> DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \
> 	@icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
>-	@nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4
>+	@nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
> 
> init_SCRIPTS = wrappers/$(PACKAGE_NAME)
> 
> ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
> 	admserv/schema/ldif/01nsroot.ldif.tmpl \
> 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
> 	admserv/schema/ldif/10dsdata.ldif.tmpl \
> 	admserv/schema/ldif/11dstasks.ldif.tmpl \
>@@ -289,17 +294,17 @@
> # Resource Bundle Compiler 
> if WINNT
> ICU_GENRB = @icu_bin@/genrb.exe
> else
> ICU_GENRB = sh $(srcdir)/admserv/genrb_wrapper.sh @icu_bin@ @icu_libdir@
> endif
> 
> # need a reverse sort
>-mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | sort $1 --key=1,1 -)
>+mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | sort $1 -k1,1)
> 
> # need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
> # sort also strips out duplicates
> LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
> LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
> # now put it in the canonical form
> LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS))
> 
>Index: adminserver/autogen.sh
>===================================================================
>RCS file: /cvs/dirsec/adminserver/autogen.sh,v
>retrieving revision 1.1
>diff -u -8 -r1.1 autogen.sh
>--- adminserver/autogen.sh	9 May 2007 00:26:29 -0000	1.1
>+++ adminserver/autogen.sh	21 Jun 2007 18:06:12 -0000
>@@ -10,16 +10,19 @@
> * )
>     echo "Found autoconf version $AC_VERSION"
>     ;;
> esac
> 
> # Check automake version
> AM_VERSION=`automake --version | grep '^automake' | sed 's/.*) *//'`
> case $AM_VERSION in
>+1.1*)
>+    echo "Found automake version $AM_VERSION"
>+    ;; # 1.10 or later - ok
> '' | 0.* | 1.[0-8]* | 1.9.[0-5]* )
>     echo "You must have automake version 1.9.6 or later installed (found version $AM_VERSION)."
>     exit 1
>     ;;
> * )
>     echo "Found automake version $AM_VERSION"
>     ;;
> esac
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.9
>diff -u -8 -r1.9 configure.ac
>--- adminserver/configure.ac	20 Jun 2007 22:33:15 -0000	1.9
>+++ adminserver/configure.ac	21 Jun 2007 18:06:13 -0000
>@@ -101,29 +101,72 @@
>   icondir=/$PACKAGE_BASE_NAME/icons
>   manualdir=/$PACKAGE_BASE_NAME/manual
>   ldifdir=/$PACKAGE_BASE_NAME/data
> fi
> 
> initdir=/rc.d
> case $host in
>   *-*-linux*)
>+    AC_DEFINE([XP_UNIX], [1], [UNIX])
>+    AC_DEFINE([Linux], [1], [Linux])
>+    AC_DEFINE([LINUX], [1], [Linux])
>     initdir=/rc.d/init.d
> 	;;
>   ia64-hp-hpux*)
>+    AC_DEFINE([XP_UNIX], [1], [UNIX])
>+    AC_DEFINE([hpux], [1], [HP-UX])
>+    AC_DEFINE([HPUX], [1], [HP-UX])
>+    AC_DEFINE([HPUX11], [1], [HP-UX 11])
>+    AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23])
>+    AC_DEFINE([CPU_ia64], [], [cpu type ia64])
>+    AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
> 	;;
>   hppa*-hp-hpux*)
>+    AC_DEFINE([XP_UNIX], [1], [UNIX])
>+    AC_DEFINE([hpux], [1], [HP-UX])
>+    AC_DEFINE([HPUX], [1], [HP-UX])
>+    AC_DEFINE([HPUX11], [1], [HP-UX 11])
>+    AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
>+    AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
>+    AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
> 	;;
>   sparc-sun-solaris*)
>+    AC_DEFINE([XP_UNIX], [1], [UNIX])
>+    AC_DEFINE([SVR4], [1], [SVR4])
>+    AC_DEFINE([__svr4], [1], [SVR4])
>+    AC_DEFINE([__svr4__], [1], [SVR4])
>+    AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
>+    AC_DEFINE([CPU_sparc], [], [cpu type sparc])
>+    AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
>+    AC_DEFINE([sunos5], [1], [SunOS5])
>+    AC_DEFINE([OSVERSION], [509], [OS version])
>+    AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
>+dnl socket nsl and dl are required to link several programs
>+    LIBSOCKET=-lsocket
>+    AC_SUBST([LIBSOCKET], [$LIBSOCKET])
>+    LIBNSL=-lnsl
>+    AC_SUBST([LIBNSL], [$LIBNSL])
>+dnl Cstd and Crun are required to link any C++ related code (ICU)
>+    LIBCSTD=-lCstd
>+    AC_SUBST([LIBCSTD], [$LIBCSTD])
>+    LIBCRUN=-lCrun
>+    AC_SUBST([LIBCRUN], [$LIBCRUN])
>     initdir=/init.d
> 	;;
>   *)
> esac
> AC_SUBST(initdir)
> 
>+# Check for fortitude
>+m4_include(m4/fortitude.m4)
> # Check for web server
> m4_include(m4/httpd.m4)
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
> m4_include(m4/icu.m4)
>@@ -231,17 +274,17 @@
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)
> AM_CONDITIONAL([APACHE22], test $APACHE22)
> 
> AC_CONFIG_FILES([Makefile])
> 
> # if doing a recursive configure, add --with-adminserver
> # to the list of args for the modules
>-ac_configure_args="$ac_configure_args --with-adminserver --with-moddir=$admmoddir"
>+ac_configure_args="$ac_configure_args --with-adminserver --with-apxs=$APXS --with-apr-config=$APR_CONFIG --with-moddir=$admmoddir"
> 
> if test -d $srcdir/mod_admserv ; then
>    AC_CONFIG_SUBDIRS([mod_admserv])
>    MOD_ADMSERV=true
> fi
> AM_CONDITIONAL([MOD_ADMSERV], $MOD_ADMSERV)
> 
> if test -d $srcdir/mod_restartd ; then
>Index: adminserver/admserv/cfgstuff/console.conf.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console.conf.in,v
>retrieving revision 1.1
>diff -u -8 -r1.1 console.conf.in
>--- adminserver/admserv/cfgstuff/console.conf.in	9 May 2007 00:26:30 -0000	1.1
>+++ adminserver/admserv/cfgstuff/console.conf.in	21 Jun 2007 18:06:13 -0000
>@@ -69,17 +69,17 @@
> # directive.
> #
> # Change this to Listen on specific IP addresses as shown below to 
> # prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
> # e.g. "Listen 12.34.56.78:80"
> #
> # To allow connections to IPv6 addresses add "Listen [::]:80"
> #
>-Listen @admservport@
>+Listen 0.0.0.0:@admservport@
> 
> #   SSL Engine Switch:
> #   Enable/Disable SSL for this virtual host.
> NSSEngine off
> 
> #   SSL Certificate Nickname:
> #   The nickname of the server certificate you are going to use.
> NSSNickname server-cert
>Index: adminserver/admserv/cgi-src40/config.c
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
>retrieving revision 1.10
>diff -u -8 -r1.10 config.c
>--- adminserver/admserv/cgi-src40/config.c	15 May 2007 00:30:49 -0000	1.10
>+++ adminserver/admserv/cgi-src40/config.c	21 Jun 2007 18:06:13 -0000
>@@ -518,17 +518,17 @@
> 	    /*
> 	      If ip address is not defined, it means that server should
> 	      listen on all interfaces. This is dependant upon console
> 	      to always include the port string first.
> 	    */
> 	    if (valptr && valptr[0] ) {
>           PR_snprintf(line, sizeof(line), "%s:%s", valptr, ptr);
> 	    } else {
>-		  PR_snprintf(line, sizeof(line), "%s", ptr);
>+		  PR_snprintf(line, sizeof(line), "0.0.0.0:%s", ptr);
> 	    }
> 		err = update_conf("console.conf", "Listen", line); 
> 		PL_strfree(val);
> 	  }
> 	}
> 	
> 	/* Check if access log file is being changed */
> 	if (strcasecmp(nameptr,"configuration.nsaccesslog") == 0) {
>Index: adminserver/admserv/cgi-src40/help.c
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/help.c,v
>retrieving revision 1.8
>diff -u -8 -r1.8 help.c
>--- adminserver/admserv/cgi-src40/help.c	9 May 2007 00:26:30 -0000	1.8
>+++ adminserver/admserv/cgi-src40/help.c	21 Jun 2007 18:06:13 -0000
>@@ -28,16 +28,17 @@
> /*/                                                     /*/
> /*///////////////////////////////////////////////////////*/
> 
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> #include <stdarg.h>
> #include <unistd.h>
>+#include <limits.h>
> 
> #ifdef XP_UNIX
> #   include <dirent.h>
> #   define SYS_DIR DIR
> #   define SYS_DIRENT struct dirent
> #   define dir_open opendir
> #   define dir_read readdir
> #   define dir_close closedir
>Index: adminserver/admserv/newinst/src/AdminServer.pm.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
>retrieving revision 1.2
>diff -u -8 -r1.2 AdminServer.pm.in
>--- adminserver/admserv/newinst/src/AdminServer.pm.in	20 Jun 2007 16:35:02 -0000	1.2
>+++ adminserver/admserv/newinst/src/AdminServer.pm.in	21 Jun 2007 18:06:13 -0000
>@@ -294,28 +294,36 @@
> sub updateHttpConfFiles {
>     my $serverAddress = shift;
>     my $port = shift;
>     my $configdir = shift;
>     my $origport = shift;
>     my $admConf = getAdmConf($configdir);
>     my $user = $admConf->{sysuser};
> 
>+    # this is required on some platforms in order to execute the config command
>+    my $savepath = $ENV{SHLIB_PATH} || $ENV{LD_LIBRARY_PATH};
>+    $ENV{LD_LIBRARY_PATH} = "@LIBPATH@:$savepath";
>+    $ENV{SHLIB_PATH} = $ENV{LD_LIBRARY_PATH};
>     my $cmd = "@cgibindir@/config op=set configuration.nsSuiteSpotUser=\"$user\"";
>     if ($port != $origport) { # need to change the port number
>         $cmd .= " configuration.nsServerPort=\"$port\"";
>     }
>     if ($serverAddress) {
>         $cmd .= " configuration.nsServerAddress=\"$serverAddress\"";
>     }
> 
>     if (system($cmd)) {
>+        $ENV{LD_LIBRARY_PATH} = $savepath;
>+        $ENV{SHLIB_PATH} = $savepath;
>         return 0;
>     }
> 
>+    $ENV{LD_LIBRARY_PATH} = $savepath;
>+    $ENV{SHLIB_PATH} = $savepath;
>     return 1;
> }
> 
> sub startAdminServer {
>     my $setup = shift;
>     my $configdir = shift;
>     my $logdir = shift;
>     my $rundir = shift;
>Index: adminserver/lib/base/nscputil.cpp
>===================================================================
>RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
>retrieving revision 1.2
>diff -u -8 -r1.2 nscputil.cpp
>--- adminserver/lib/base/nscputil.cpp	9 May 2007 00:26:37 -0000	1.2
>+++ adminserver/lib/base/nscputil.cpp	21 Jun 2007 18:06:13 -0000
>@@ -20,16 +20,19 @@
>  * END COPYRIGHT BLOCK **/
> /*
>  * util.c: A hodge podge of utility functions and standard functions which 
>  *         are unavailable on certain systems
>  * 
>  * Rob McCool
>  */
> 
>+#ifdef HAVE_CONFIG_H
>+#include "config.h"
>+#endif
> 
> #include <stdio.h>
> #include <string.h>
> #include <stdlib.h>
> #include <ctype.h>
> #include <errno.h>
> 
> #ifdef XP_UNIX

Actions: View | Diff

Attachments on bug 245214: 157561 | 157589 | 157592