[Fedora-directory-commits] adminserver/lib/base Makefile, 1.8, 1.9 file.cpp, 1.6, 1.7 nscputil.cpp, 1.1, 1.2 system.cpp, 1.5, 1.6 pathnames.cpp, 1.3, NONE

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253/adminserver/lib/base

Modified Files:
	Makefile file.cpp nscputil.cpp system.cpp 
Removed Files:
	pathnames.cpp 
Log Message:
Resolves: bug 239502, bug 186280
Description: adminserver: autotools, FHS, clean up CGI parameters
Fix Description: Too numerous to mention




Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	24 Jul 2006 12:51:11 -0000	1.8
+++ Makefile	9 May 2007 00:26:37 -0000	1.9
@@ -46,7 +46,7 @@
 	mkdir -p $(OBJDEST)
 
 ifeq ($(ARCH), WINNT)
-OSOBJS = nterrors.o eventlog.o eventhandler.o ntpipe.o pathnames.o
+OSOBJS = nterrors.o eventlog.o eventhandler.o ntpipe.o
 else
 OSOBJS = 
 endif


Index: file.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/file.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- file.cpp	21 Mar 2006 22:23:50 -0000	1.6
+++ file.cpp	9 May 2007 00:26:37 -0000	1.7
@@ -28,7 +28,7 @@
 
 
 #include "base/file.h"
-#ifdef BSD_RLIMIT
+#if defined(BSD_RLIMIT) || defined(HAVE_SETRLIMIT)
 #include <sys/time.h>
 #include <sys/resource.h>
 #else
@@ -175,7 +175,7 @@
 
 NSAPI_PUBLIC int system_nocoredumps(void)
 {
-#ifdef BSD_RLIMIT
+#if defined(BSD_RLIMIT) || defined(HAVE_SETRLIMIT)
     struct rlimit rl;
 
     rl.rlim_cur = 0;


Index: nscputil.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nscputil.cpp	24 Jul 2006 12:51:11 -0000	1.1
+++ nscputil.cpp	9 May 2007 00:26:37 -0000	1.2
@@ -1423,11 +1423,11 @@
 }
 
 NSAPI_PUBLIC char *
-util_strerror(int errnum, char *msg, int buflen)
+util_strerror(int errnum, char *msg, size_t buflen)
 {
 #ifdef HAVE_STRERROR_R
     /* More IBM real-genius */
-    return ((int)strerror_r(errnum, msg, buflen) > 0) ? msg : NULL;
+    return (strerror_r(errnum, msg, buflen) == 0) ? msg : NULL;
 #else
     /* RE_LOCK(strerror); I don't think this is worth the trouble */
     (void)strncpy(msg, strerror(errnum), buflen);


Index: system.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/system.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system.cpp	18 Aug 2005 19:18:27 -0000	1.5
+++ system.cpp	9 May 2007 00:26:37 -0000	1.6
@@ -27,9 +27,15 @@
 #include "netsite.h"
 #include "base/nsassert.h"
 
+#ifdef MAGNUS_VERSION_STRING
+#define MY_VERSION_STRING MAGNUS_VERSION_STRING
+#else
+#define MY_VERSION_STRING PACKAGE_VERSION
+#endif
+
 #ifdef XP_WIN32
 #include <windows.h>
-static char *version = MAGNUS_VERSION_STRING;
+static char *version = MY_VERSION_STRING;
 #endif
 
 #include "base/systems.h"	/* find out if we have malloc pools */
@@ -66,7 +72,7 @@
 #ifdef XP_WIN32
     return version;
 #else /* XP_UNIX */
-    return MAGNUS_VERSION_STRING;
+    return MY_VERSION_STRING;
 #endif /* XP_UNIX */
 }
 


--- pathnames.cpp DELETED ---