Use all ACEs from original ACL on Samba share
* security.cc (convert_samba_sd): Fix accidental dropping of all non-Unix User, non-Unix Group accounts. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
		| @@ -1,3 +1,8 @@ | |||||||
|  | 2015-04-30  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
|  | 	* security.cc (convert_samba_sd): Fix accidental dropping of all | ||||||
|  | 	non-Unix User, non-Unix Group accounts. | ||||||
|  |  | ||||||
| 2015-04-27  Corinna Vinschen  <corinna@vinschen.de> | 2015-04-27  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
| 	* include/asm/types.h: Add __s64 and __u64 types. | 	* include/asm/types.h: Add __s64 and __u64 types. | ||||||
|   | |||||||
| @@ -677,10 +677,10 @@ convert_samba_sd (security_descriptor &sd_ret) | |||||||
| 		if (gid < UNIX_POSIX_OFFSET && (grp = internal_getgrgid (gid))) | 		if (gid < UNIX_POSIX_OFFSET && (grp = internal_getgrgid (gid))) | ||||||
| 		  ace_sid.getfromgr (grp); | 		  ace_sid.getfromgr (grp); | ||||||
| 	      } | 	      } | ||||||
| 	    if (!add_access_allowed_ace (acl, ace->Mask, ace_sid, acl_len, |  | ||||||
| 					 ace->Header.AceFlags)) |  | ||||||
| 	      return; |  | ||||||
| 	  } | 	  } | ||||||
|  | 	if (!add_access_allowed_ace (acl, ace->Mask, ace_sid, acl_len, | ||||||
|  | 				     ace->Header.AceFlags)) | ||||||
|  | 	  return; | ||||||
|       } |       } | ||||||
|   acl->AclSize = acl_len; |   acl->AclSize = acl_len; | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user