summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-01-11 11:26:31 +0000
committerAndrew Tridgell <tridge@samba.org>2002-01-11 11:26:31 +0000
commita78fd0468156dd789c57adffd5e64adbabdedcc3 (patch)
tree2ded62b25f5577b74c9d6da62ee3221d5f5d2771
parent13059beb245b9d088d523473bbc0d564ed88ed69 (diff)
downloadsamba-a78fd0468156dd789c57adffd5e64adbabdedcc3.tar.gz
samba-a78fd0468156dd789c57adffd5e64adbabdedcc3.tar.bz2
samba-a78fd0468156dd789c57adffd5e64adbabdedcc3.zip
fixed a crash in merge_aces()
when we free curr_ace_outer we need to not try to use it again :) (This used to be commit 1c5e19a418136c0ae524e62a4907501212ebac3d)
-rw-r--r--source3/smbd/posix_acls.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 765bd0f3b2..889408b631 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -318,6 +318,7 @@ static void merge_aces( canon_ace **pp_list_head )
DLIST_REMOVE(list_head, curr_ace_outer);
SAFE_FREE(curr_ace_outer);
+ break;
}
}