From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Aug 2012 10:54:24 +0000 (+1000)
Subject: s3-sysacls: Remove sys_acl_free_qualifier() as it is a no-op
X-Git-Tag: tevent-0.9.17~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24b11430680ebd20303168ec73142226543ad6de;p=thirdparty%2Fsamba.git

s3-sysacls: Remove sys_acl_free_qualifier() as it is a no-op

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Aug 15 05:23:18 CEST 2012 on sn-devel-104
---

diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h
index d4830bcaa91..750bbc666ae 100644
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -50,7 +50,6 @@ int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type);
 int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p);
 int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d);
 int sys_acl_free_text(char *text);
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
 int sys_acl_valid(SMB_ACL_T acl_d);
 SMB_ACL_T sys_acl_get_file(struct vfs_handle_struct *handle,
 			   const char *path_p, SMB_ACL_TYPE_T type);
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 3f4aeaed990..31966c6077e 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -354,11 +354,6 @@ int sys_acl_free_text(char *text)
 	return 0;
 }
 
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
-{
-	return 0;
-}
-
 int sys_acl_valid(SMB_ACL_T acl_d)
 {
 	errno = EINVAL;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 4efcb33a138..c45003defd1 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2667,7 +2667,6 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
 					unix_ug.type = ID_TYPE_UID;
 					unix_ug.id = *puid;
 					owner_type = UID_ACE;
-					sys_acl_free_qualifier((void *)puid,tagtype);
 					break;
 				}
 			case SMB_ACL_GROUP_OBJ:
@@ -2688,7 +2687,6 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
 					unix_ug.type = ID_TYPE_GID;
 					unix_ug.id = *pgid;
 					owner_type = GID_ACE;
-					sys_acl_free_qualifier((void *)pgid,tagtype);
 					break;
 				}
 			case SMB_ACL_MASK:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 679e3fa8287..b30478cb255 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3899,7 +3899,6 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
 						return False;
 					}
 					own_grp = (unsigned int)*puid;
-					sys_acl_free_qualifier((void*)puid,tagtype);
 					SCVAL(pdata,0,SMB_POSIX_ACL_USER);
 					SIVAL(pdata,2,own_grp);
 					SIVAL(pdata,6,0);
@@ -3919,7 +3918,6 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
 						return False;
 					}
 					own_grp = (unsigned int)*pgid;
-					sys_acl_free_qualifier((void *)pgid,tagtype);
 					SCVAL(pdata,0,SMB_POSIX_ACL_GROUP);
 					SIVAL(pdata,2,own_grp);
 					SIVAL(pdata,6,0);