diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 7d37f020..4ea3021d 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.01.28.074917" +#define Xorriso_timestamP "2009.01.28.114755" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index 7cc661e5..80b68d47 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -8833,8 +8833,11 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path, #ifdef Xorriso_with_aaiP ret= iso_node_get_acl_text(node, &text, 0); + d_ret= 0; if(ret > 0 && LIBISO_ISDIR(node)) { d_ret= iso_node_get_acl_text(node, &d_text, 1 | 16); + if(d_ret > 0 && d_text == 0) + d_ret= 0; } #else ret= d_ret= 0; @@ -8852,7 +8855,7 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path, ret= 1 + (ret != 1); goto ex; } - if(ret == 0 || ret == 2) { + if((ret == 0 || ret == 2) && (d_ret == 0 || d_ret == 2)) { if(flag & 1) { ret= 1 + (ret == 0); goto ex;