smbd: Convert unix_mode to synthetic_smb_fname
authorVolker Lendecke <vl@samba.org>
Mon, 15 Apr 2013 09:30:50 +0000 (11:30 +0200)
committerJeremy Allison <jra@samba.org>
Wed, 17 Apr 2013 21:50:02 +0000 (14:50 -0700)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/dosmode.c

index 1949006c1939b0b1b9a5679e019bf028d13699a8..93eddbb865d14ded988711b90e29dce56a2b59cd 100644 (file)
@@ -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);
                }