summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-04-12 16:32:37 -0700
committerJeremy Allison <jra@samba.org>2011-04-13 14:13:24 -0700
commitdf269c0834a46bb0f0cf44d0f0822c05c8c797a5 (patch)
treecf162e8a8481c3dae3f44af1e70596a4e2871672
parentc3d89911642a9d6bbcba9e51fa93e5254cd7b2fc (diff)
downloadsamba-df269c0834a46bb0f0cf44d0f0822c05c8c797a5.tar.gz
samba-df269c0834a46bb0f0cf44d0f0822c05c8c797a5.tar.bz2
samba-df269c0834a46bb0f0cf44d0f0822c05c8c797a5.zip
Don't print "success" message after error message in change_file_owner_to_parent(). Remove "goto" in change_dir_owner_to_parent().
-rw-r--r--source3/smbd/open.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 5c449fcb86..66b14ff076 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -226,12 +226,12 @@ void change_file_owner_to_parent(connection_struct *conn,
"was %s\n", fsp_str_dbg(fsp),
(unsigned int)smb_fname_parent->st.st_ex_uid,
strerror(errno) ));
+ } else {
+ DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
+ "parent directory uid %u.\n", fsp_str_dbg(fsp),
+ (unsigned int)smb_fname_parent->st.st_ex_uid));
}
- DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
- "parent directory uid %u.\n", fsp_str_dbg(fsp),
- (unsigned int)smb_fname_parent->st.st_ex_uid));
-
TALLOC_FREE(smb_fname_parent);
}
@@ -325,13 +325,12 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
"Error was %s\n", fname,
(unsigned int)smb_fname_parent->st.st_ex_uid,
strerror(errno) ));
- goto chdir;
+ } else {
+ DEBUG(10,("change_dir_owner_to_parent: changed ownership of new "
+ "directory %s to parent directory uid %u.\n",
+ fname, (unsigned int)smb_fname_parent->st.st_ex_uid ));
}
- DEBUG(10,("change_dir_owner_to_parent: changed ownership of new "
- "directory %s to parent directory uid %u.\n",
- fname, (unsigned int)smb_fname_parent->st.st_ex_uid ));
-
chdir:
vfs_ChDir(conn,saved_dir);
out: