Attachment 6753 Details for Bug 8345 – integrated patch

integrated patch

8345-kingson.patch (text/plain), 1.32 KB, created by jinyunshuai on 2011-08-04 09:27:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jinyunshuai

Created: 2011-08-04 09:27:05 UTC

Size: 1.32 KB

patch

obsolete

>From 5ac8f364c172f030324ddc86766900eae259f2ac Mon Sep 17 00:00:00 2001
>From: root <root@webserver.(none)>
>Date: Thu, 4 Aug 2011 16:29:09 +0800
>Subject: [PATCH] /tmp/tmp.patch
>
>---
> source3/modules/vfs_hpuxacl.c |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
>index 0f5af9d..e440278 100644
>--- a/source3/modules/vfs_hpuxacl.c
>+++ b/source3/modules/vfs_hpuxacl.c
>@@ -270,7 +270,7 @@ int hpuxacl_sys_acl_set_file(vfs_handle_struct *handle,
> 		goto done;
> 	}
> 	if (S_ISDIR(smb_fname->st.st_ex_mode)) {
>-		HPUX_ACL_T other_acl; 
>+		HPUX_ACL_T other_acl = NULL; 
> 		int other_count;
> 		SMB_ACL_TYPE_T other_type;
> 
>@@ -371,9 +371,9 @@ int hpuxacl_sys_acl_set_fd(vfs_handle_struct *handle,
> int hpuxacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
> 				    const char *path)
> {
>-	SMB_ACL_T smb_acl;
>+	SMB_ACL_T smb_acl = NULL;
> 	int ret = -1;
>-	HPUX_ACL_T hpux_acl;
>+	HPUX_ACL_T hpux_acl = NULL;
> 	int count;
> 
> 	DEBUG(10, ("entering hpuxacl_sys_acl_delete_def_file.\n"));
>@@ -508,7 +508,7 @@ static bool smb_acl_to_hpux_acl(SMB_ACL_T smb_acl,
> static SMB_ACL_T hpux_acl_to_smb_acl(HPUX_ACL_T hpux_acl, int count, 
> 					SMB_ACL_TYPE_T type)
> {
>-	SMB_ACL_T result;
>+	SMB_ACL_T result = NULL;
> 	int i;
> 
> 	if ((result = sys_acl_init(0)) == NULL) {
>-- 
>1.5.4.3
>

Actions: View

Attachments on bug 8345: 6750 | 6753