summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2003-04-09 17:36:33 +0000
committerSimo Sorce <idra@samba.org>2003-04-09 17:36:33 +0000
commit525d18a2b0bb04639100adacb359d35da8472dfc (patch)
treeb55e60bd5b64ae296a70281a3811c4057a355295
parent4235c93fe8eb638510cea376e569fe6843052fef (diff)
downloadsamba-525d18a2b0bb04639100adacb359d35da8472dfc.tar.gz
samba-525d18a2b0bb04639100adacb359d35da8472dfc.tar.bz2
samba-525d18a2b0bb04639100adacb359d35da8472dfc.zip
collaps same repeted task into 2 code paths
(This used to be commit bc5d1873da187c83a1a19a7560685ed903d37455)
-rw-r--r--source3/modules/vfs_recycle.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index d554f4bfdd..3a23e1a365 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -555,11 +555,10 @@ static int recycle_unlink(connection_struct *conn, const char *file_name)
/* see if we need to recreate the original directory structure in the recycle bin */
if (recbin->keep_dir_tree == True) {
asprintf(&temp_name, "%s/%s", recbin->repository, path_name);
- ALLOC_CHECK(temp_name, done);
} else {
temp_name = strdup(recbin->repository);
- ALLOC_CHECK(temp_name, done);
}
+ ALLOC_CHECK(temp_name, done);
exist = recycle_directory_exist(conn, temp_name);
if (exist) {