Attachment 13653 Details for Bug 13049 – git-am fix cherry-pick from master.

[patch] git-am fix cherry-pick from master.

0001-vfs_solarisacl-fix-build-for-samba-4.7-and-up.patch (text/plain), 1.64 KB, created by Jeremy Allison on 2017-10-04 21:14:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-10-04 21:14:45 UTC

Size: 1.64 KB

patch

obsolete

>From 1aeca707f8f5d807bd4138a48c7bb0d25a5de34d Mon Sep 17 00:00:00 2001
>From: Jorge Schrauwen via samba-technical <samba-technical@lists.samba.org>
>Date: Tue, 3 Oct 2017 19:55:28 +0200
>Subject: [PATCH] vfs_solarisacl: fix build for samba 4.7 and up
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13049
>
>Signed-off-by: Jorge Schrauwen <sjorge@blackdot.be>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit d774aeba5e04eacb98cf938d356e4cc502caa2e7)
>---
> source3/modules/vfs_solarisacl.c | 2 +-
> source3/modules/vfs_solarisacl.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
>index 74086bd9fa7..5c011396ed4 100644
>--- a/source3/modules/vfs_solarisacl.c
>+++ b/source3/modules/vfs_solarisacl.c
>@@ -306,7 +306,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
>  * check is considered unnecessary. --- Agreed? XXX
>  */
> int solarisacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
>-				struct smb_filename *smb_fname)
>+				const struct smb_filename *smb_fname)
> {
> 	SMB_ACL_T smb_acl;
> 	int ret = -1;
>diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
>index 02bd3711da8..ce2206cbe5b 100644
>--- a/source3/modules/vfs_solarisacl.h
>+++ b/source3/modules/vfs_solarisacl.h
>@@ -41,7 +41,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
> int solarisacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
> 				const struct smb_filename *smb_fname);
> 
>-NTSTATUS vfs_solarisacl_init(void);
>+NTSTATUS vfs_solarisacl_init(TALLOC_CTX *);
> 
> #endif
> 
>-- 
>2.14.2.920.gcf0c67979c-goog
>

Flags:

slow: review+

Actions: View

Attachments on bug 13049: 13626 | 13627 | 13628 | 13653