libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix: -compare reported false differences with directories which have non-trivial ACL but no default ACL

Browse Source
This commit is contained in:
Thomas Schmitt 2013-12-30 10:18:36 +00:00
parent 5483ac27f6
commit 3e03b758c3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libisoburn/trunk/xorriso/iso_tree.c
View File

@ -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++) { for(pass= 0; pass < 1 + (acl_text != NULL && !(flag & 2)); pass++) {
if(pass) { if(pass) {
if(result_len == 0)
break;
*acl_text= calloc(result_len + 1, 1); *acl_text= calloc(result_len + 1, 1);
if(*acl_text == NULL) { if(*acl_text == NULL) {
Xorriso_no_malloc_memory(xorriso, NULL, 0); Xorriso_no_malloc_memory(xorriso, NULL, 0);
@ -764,7 +766,13 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path,
} }
} }
} }
if(result_len == 0) {
if(acl_text != NULL)
*acl_text= NULL;
ret= 2;
} else {
ret= 1; ret= 1;
}
ex:; ex:;
iso_node_get_acl_text(node, &text, &d_text, 1 << 15); iso_node_get_acl_text(node, &text, &d_text, 1 << 15);
return(ret); return(ret);

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2013.12.29.120027" #define Xorriso_timestamP "2013.12.30.101707"