summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-15 11:30:50 +0200
committerJeremy Allison <jra@samba.org>2013-04-17 14:50:02 -0700
commitfb211c39dbdb026c4294ccfb42e0c648c4464a27 (patch)
treece7d48dcd2c9dd334b1b2ba7306064f1b4cdacf2
parentaf40d236ea851cab4ad34928fcabf556a153327e (diff)
downloadsamba-fb211c39dbdb026c4294ccfb42e0c648c4464a27.tar.gz
samba-fb211c39dbdb026c4294ccfb42e0c648c4464a27.tar.bz2
samba-fb211c39dbdb026c4294ccfb42e0c648c4464a27.zip
smbd: Convert unix_mode to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/smbd/dosmode.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 1949006c19..93eddbb865 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -84,20 +84,18 @@ mode_t unix_mode(connection_struct *conn, int dosmode,
}
if ((inherit_from_dir != NULL) && lp_inherit_perms(SNUM(conn))) {
- struct smb_filename *smb_fname_parent = NULL;
- NTSTATUS status;
+ struct smb_filename *smb_fname_parent;
DEBUG(2, ("unix_mode(%s) inheriting from %s\n",
smb_fname_str_dbg(smb_fname),
inherit_from_dir));
- status = create_synthetic_smb_fname(talloc_tos(),
- inherit_from_dir, NULL,
- NULL, &smb_fname_parent);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1,("unix_mode(%s) failed, [dir %s]: %s\n",
+ smb_fname_parent = synthetic_smb_fname(
+ talloc_tos(), inherit_from_dir, NULL, NULL);
+ if (smb_fname_parent == NULL) {
+ DEBUG(1,("unix_mode(%s) failed, [dir %s]: No memory\n",
smb_fname_str_dbg(smb_fname),
- inherit_from_dir, nt_errstr(status)));
+ inherit_from_dir));
return(0);
}