[Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.9, 1.10 srvutilssl.c, 1.6, 1.7

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10019/adminutil/lib/libadmsslutil

Modified Files:
	admsslutil.c srvutilssl.c 
Log Message:
compiler warning clean up


Index: admsslutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- admsslutil.c	22 Jun 2007 21:06:45 -0000	1.9
+++ admsslutil.c	3 Dec 2008 18:36:50 -0000	1.10
@@ -69,22 +69,6 @@
 char custom_file[BIG_LINE] = "";
 char retried_token[BIG_LINE] = "";
 
-/* returns true if the given path is a valid directory, false otherwise */
-static int
-is_dir_ok(const char *path)
-{
-	PRFileInfo prinfo;
-	int ret = 0;
-
-	if (path && *path &&
-		(PR_SUCCESS == PR_GetFileInfo(path, &prinfo)) &&
-		prinfo.type == PR_FILE_DIRECTORY) {
-		ret = 1;
-	}
-
-	return ret;
-}
-
 PR_IMPLEMENT(int)
 admldapBuildInfoSSL(AdmldapInfo info, int *errorcode)
 {


Index: srvutilssl.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- srvutilssl.c	28 Jun 2007 20:47:56 -0000	1.6
+++ srvutilssl.c	3 Dec 2008 18:36:50 -0000	1.7
@@ -19,6 +19,7 @@
  * END COPYRIGHT BLOCK **/
 #include <string.h>
 #include "libadminutil/admutil.h"
+#include "libadminutil/distadm.h"
 #include "libadmsslutil/psetcssl.h"
 #include "libadmsslutil/srvutilssl.h"
 
@@ -176,7 +177,7 @@
   if (nl) {
     size_t len = strlen(serverID);
     AttrNameList nlptr = nl;
-    while (retval = *nlptr++) {
+    while ((retval = *nlptr++)) {
       /* nl is a list of DNs like this:
 	 cn=slapd-foo, ...
 	 cn=slapd-bar,...