From 3e03b758c3fdd4474eea53bb1839228f8493d766 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 30 Dec 2013 10:18:36 +0000
Subject: [PATCH] Bug fix: -compare reported false differences with directories
 which have non-trivial ACL but no default ACL

---
 libisoburn/trunk/xorriso/iso_tree.c          | 10 +++++++++-
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libisoburn/trunk/xorriso/iso_tree.c b/libisoburn/trunk/xorriso/iso_tree.c
index 2d4203d8..3385d3d5 100644
--- a/libisoburn/trunk/xorriso/iso_tree.c
+++ b/libisoburn/trunk/xorriso/iso_tree.c
@@ -705,6 +705,8 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path,
 
  for(pass= 0; pass < 1 + (acl_text != NULL && !(flag & 2)); pass++) {
    if(pass) {
+     if(result_len == 0) 
+ break;
      *acl_text= calloc(result_len + 1, 1);
      if(*acl_text == NULL) {
        Xorriso_no_malloc_memory(xorriso, NULL, 0);
@@ -764,7 +766,13 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path,
      }
    }
  }
- ret= 1;
+ if(result_len == 0) {
+   if(acl_text != NULL)
+     *acl_text= NULL;
+   ret= 2; 
+ } else {
+   ret= 1;
+ }
 ex:;
  iso_node_get_acl_text(node, &text, &d_text, 1 << 15);
  return(ret);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 42a32ece..98da7f16 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2013.12.29.120027"
+#define Xorriso_timestamP "2013.12.30.101707"