[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Jun 10 21:37:01 UTC 2021


The branch, master has been updated
       via  a602256269a s3: smbd: Cleanup - Remove #ifdef'ed out load_inherited_info().
       via  210e7628ac4 smbd: remove more dead code from dos_mode_at_vfs_get_dosmode_done()
      from  5c7ba35be48 smbd: remove unneeded code from dos_mode_at_vfs_get_dosmode_done()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a602256269aa13ed1cfaece6ed1b175e8becd01c
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 9 09:39:04 2021 -0700

    s3: smbd: Cleanup - Remove #ifdef'ed out load_inherited_info().
    
    I commented this out but forgot to remove in the
    previous mega-patch.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jun 10 21:36:11 UTC 2021 on sn-devel-184

commit 210e7628ac4c28743070641b8ecfd910ecae4931
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jun 10 10:55:30 2021 -0700

    smbd: remove more dead code from dos_mode_at_vfs_get_dosmode_done()
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/dosmode.c    |  9 ------
 source3/smbd/posix_acls.c | 70 -----------------------------------------------
 2 files changed, 79 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index d9ea80c5306..c4c8be0b722 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -837,7 +837,6 @@ static void dos_mode_at_vfs_get_dosmode_done(struct tevent_req *subreq)
 	struct dos_mode_at_state *state =
 		tevent_req_data(req,
 		struct dos_mode_at_state);
-	char *path = NULL;
 	struct vfs_aio_state aio_state;
 	NTSTATUS status;
 	bool ok;
@@ -889,14 +888,6 @@ static void dos_mode_at_vfs_get_dosmode_done(struct tevent_req *subreq)
 	 * Fall back to sync dos_mode() if we got NOT_IMPLEMENTED.
 	 */
 
-	path = talloc_asprintf(state,
-			       "%s/%s",
-			       state->dir_fsp->fsp_name->base_name,
-			       state->smb_fname->base_name);
-	if (tevent_req_nomem(path, req)) {
-		return;
-	}
-
 	state->dosmode = fdos_mode(state->smb_fname->fsp);
 	tevent_req_done(req);
 	return;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 4ad5c2b4284..2f3d911f178 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -670,76 +670,6 @@ static struct pai_val *fload_inherited_info(files_struct *fsp)
 	return paiv;
 }
 
-#if 0
-/************************************************************************
- Load the user.SAMBA_PAI attribute.
-************************************************************************/
-
-static struct pai_val *load_inherited_info(const struct connection_struct *conn,
-					   const struct smb_filename *smb_fname)
-{
-	char *pai_buf;
-	size_t pai_buf_size = 1024;
-	struct pai_val *paiv = NULL;
-	ssize_t ret;
-
-	if (!lp_map_acl_inherit(SNUM(conn))) {
-		return NULL;
-	}
-
-	if ((pai_buf = talloc_array(talloc_tos(), char, pai_buf_size)) == NULL) {
-		return NULL;
-	}
-
-	do {
-		ret = SMB_VFS_GETXATTR(conn, smb_fname,
-				       SAMBA_POSIX_INHERITANCE_EA_NAME,
-				       pai_buf, pai_buf_size);
-
-		if (ret == -1) {
-			if (errno != ERANGE) {
-				break;
-			}
-			/* Buffer too small - enlarge it. */
-			pai_buf_size *= 2;
-			TALLOC_FREE(pai_buf);
-			if (pai_buf_size > 1024*1024) {
-				return NULL; /* Limit malloc to 1mb. */
-			}
-			if ((pai_buf = talloc_array(talloc_tos(), char, pai_buf_size)) == NULL)
-				return NULL;
-		}
-	} while (ret == -1);
-
-	DEBUG(10,("load_inherited_info: ret = %lu for file %s\n",
-			(unsigned long)ret, smb_fname->base_name));
-
-	if (ret == -1) {
-		/* No attribute or not supported. */
-#if defined(ENOATTR)
-		if (errno != ENOATTR)
-			DEBUG(10,("load_inherited_info: Error %s\n", strerror(errno) ));
-#else
-		if (errno != ENOSYS)
-			DEBUG(10,("load_inherited_info: Error %s\n", strerror(errno) ));
-#endif
-		TALLOC_FREE(pai_buf);
-		return NULL;
-	}
-
-	paiv = create_pai_val(pai_buf, ret);
-
-	if (paiv) {
-		DEBUG(10,("load_inherited_info: ACL type 0x%x for file %s\n",
-			(unsigned int)paiv->sd_type,
-			smb_fname->base_name));
-	}
-
-	TALLOC_FREE(pai_buf);
-	return paiv;
-}
-#endif
-
 /****************************************************************************
  Functions to manipulate the internal ACE format.
 ****************************************************************************/


-- 
Samba Shared Repository



More information about the samba-cvs mailing list