Sync

diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index 6f4686d..35389e5 100644 (file)
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.3
-DEFVERSION=010503
+PATCH_VERSION=1.5.4
+DEFVERSION=010504
 VERSION=$(PATCH_VERSION)

diff --git a/org.gridsite.core/src/grst_gacl.c b/org.gridsite.core/src/grst_gacl.c
index f289682..b58ca34 100644 (file)
--- a/org.gridsite.core/src/grst_gacl.c
+++ b/org.gridsite.core/src/grst_gacl.c
@@ -337,13 +337,13 @@ int GRSTgaclCredCmp(GRSTgaclCred *cred1, GRSTgaclCred *cred2)
                       (this means a string match, not just any-user=DN etc)
 */
 {
-  if ((cred1 == NULL) && (cred2 == NULL) return 0;
+  if ((cred1 == NULL) && (cred2 == NULL)) return 0;
   
   if (cred1 == NULL) return -1;
 
   if (cred2 == NULL) return 1;
   
-  if ((cred1->auri == NULL) && (cred2->auri == NULL) return 0;
+  if ((cred1->auri == NULL) && (cred2->auri == NULL)) return 0;
   
   if (cred1->auri == NULL) return -1;