[Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c, 1.10, 1.11 help.c, 1.8, 1.9

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1096/adminserver/admserv/cgi-src40

Modified Files:
	config.c help.c 
Log Message:
Resolves: bug 245214
Bug Description: adminserver: Solaris port for 1.1
Reviewed by: nhosoi (Thanks!)
Fix Description: Fortitude can supply different components, depending on the operating system.  On Fedora, mod_nss and Apache are already there, so we don't use Fortitude.
On RHEL4, we use Fortitude for mod_nss.
On Solaris, we use Fortitude for Apache and mod_nss.
I've created a fortitude.m4 that can handle all of these cases, and changed the existing httpd.m4 and mod_nss.m4 to first see if fortitude.m4 has found the component.  configure will also pass the proper --with flags to mod_admserv and mod_restartd.
ICU introduces a dependency on C++.  Solaris requires linking with the C++ libraries and that also requires using C++ to link as well.  This means using the CXXLINK macro.
There were a few other minor porting issues which required the additional compiler defines and use of config.h.
We need to set the libpath before using the @cgibindir@/config program.
LIBPATH was not being set correctly on Solaris because I was using the extended sort flags instead of the standard ones.
Platforms tested: Solaris 9 64bit
Flag Day: no
Doc impact: no



Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config.c	15 May 2007 00:30:49 -0000	1.10
+++ config.c	22 Jun 2007 01:34:19 -0000	1.11
@@ -523,7 +523,7 @@
 	    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);


Index: help.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/help.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- help.c	9 May 2007 00:26:30 -0000	1.8
+++ help.c	22 Jun 2007 01:34:19 -0000	1.9
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <limits.h>
 
 #ifdef XP_UNIX
 #   include <dirent.h>