smbd: Fix a typo in a few places

[samba.git] / source3 / modules / vfs_afsacl.c

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index c4aa200cc7eccf3d87bd78ef896feb5d8e948c65..3dc80d3bddc7173fdeb86e72ecbae16ae72b1356 100644 (file)
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -75,7 +75,7 @@ static bool init_afs_acl(struct afs_acl *acl)
        ZERO_STRUCT(*acl);
        acl->ctx = talloc_init("afs_acl");
        if (acl->ctx == NULL) {
-               DEBUG(10, ("Could not init afs_acl"));
+               DEBUG(10, ("Could not init afs_acl\n"));
                return false;
        }
        return true;
@@ -691,7 +691,7 @@ static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
 {
        SMB_STRUCT_STAT sbuf;
 
-       if (fsp->fh->fd == -1) {
+       if (fsp_get_pathref_fd(fsp) == -1) {
                /* Get the stat struct for the owner info. */
                return afs_to_nt_acl(afs_acl, fsp->conn, fsp->fsp_name,
                                     security_info, mem_ctx, ppdesc);
@@ -723,7 +723,7 @@ static bool mappable_sid(const struct dom_sid *sid)
 
        string_to_sid(&domain_sid, "S-1-5-21");
 
-       if (sid_compare_domain(sid, &domain_sid) == 0)
+       if (dom_sid_compare_domain(sid, &domain_sid) == 0)
                return true;
 
        return false;
@@ -1036,34 +1036,6 @@ static NTSTATUS afsacl_fget_nt_acl(struct vfs_handle_struct *handle,
        return (sd_size != 0) ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
 }
 
-static NTSTATUS afsacl_get_nt_acl_at(struct vfs_handle_struct *handle,
-                               struct files_struct *dirfsp,
-                               const struct smb_filename *smb_fname,
-                               uint32_t security_info,
-                               TALLOC_CTX *mem_ctx,
-                               struct security_descriptor **ppdesc)
-{
-       struct afs_acl acl;
-       size_t sd_size;
-
-       SMB_ASSERT(dirfsp == handle->conn->cwd_fsp);
-
-       DEBUG(5, ("afsacl_get_nt_acl: %s\n", smb_fname->base_name));
-
-       sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", false);
-
-       if (!afs_get_afs_acl(smb_fname->base_name, &acl)) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       sd_size = afs_to_nt_acl(&acl, handle->conn, smb_fname, security_info,
-                               mem_ctx, ppdesc);
-
-       free_afs_acl(&acl);
-
-       return (sd_size != 0) ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
-}
-
 static NTSTATUS afsacl_fset_nt_acl(vfs_handle_struct *handle,
                         files_struct *fsp,
                         uint32_t security_info_sent,
@@ -1091,17 +1063,6 @@ static int afsacl_connect(vfs_handle_struct *handle,
        return 0;
 }
 
-/* We don't have a linear form of the AFS ACL yet */
-static int afsacl_sys_acl_blob_get_file(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       TALLOC_CTX *mem_ctx,
-                       char **blob_description,
-                       DATA_BLOB *blob)
-{
-       errno = ENOSYS;
-       return -1;
-}
-
 /* We don't have a linear form of the AFS ACL yet */
 static int afsacl_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob)
 {
@@ -1112,9 +1073,7 @@ static int afsacl_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *f
 static struct vfs_fn_pointers vfs_afsacl_fns = {
        .connect_fn = afsacl_connect,
        .fget_nt_acl_fn = afsacl_fget_nt_acl,
-       .get_nt_acl_at_fn = afsacl_get_nt_acl_at,
        .fset_nt_acl_fn = afsacl_fset_nt_acl,
-       .sys_acl_blob_get_file_fn = afsacl_sys_acl_blob_get_file,
        .sys_acl_blob_get_fd_fn = afsacl_sys_acl_blob_get_fd
 };