Changeset 745 for trunk/server/source3/modules/onefs_acl.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/onefs_acl.c (modified) (27 diffs)

trunk/server/source3/modules/onefs_acl.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
@@ -39 +40 @@
  */
 static bool
-onefs_sid_to_identity(const DOM_SID *sid, struct ifs_identity *id,
+onefs_sid_to_identity(const struct dom_sid *sid, struct ifs_identity *id,
     bool is_group)
 {
@@ -81 +82 @@
  */
 static bool
-onefs_identity_to_sid(struct ifs_identity *id, DOM_SID *sid)
+onefs_identity_to_sid(struct ifs_identity *id, struct dom_sid *sid)
 {
         if (!id || !sid)
@@ -117 +118 @@
 
 static bool
-onefs_og_to_identity(DOM_SID *sid, struct ifs_identity * ident,
+onefs_og_to_identity(struct dom_sid *sid, struct ifs_identity * ident,
     bool is_group, int snum)
 {
-        const DOM_SID *b_admin_sid = &global_sid_Builtin_Administrators;
+        const struct dom_sid *b_admin_sid = &global_sid_Builtin_Administrators;
 
         if (!onefs_sid_to_identity(sid, ident, is_group)) {
@@ -141 +142 @@
 
 static bool
-sid_in_ignore_list(DOM_SID * sid, int snum)
+sid_in_ignore_list(struct dom_sid * sid, int snum)
 {
         const char ** sid_list = NULL;
-        DOM_SID match;
+        struct dom_sid match;
 
         sid_list = lp_parm_string_list(snum, PARM_ONEFS_TYPE,
@@ -168 +169 @@
  */
 static bool
-onefs_samba_ace_to_ace(SEC_ACE * samba_ace, struct ifs_ace * ace,
+onefs_samba_ace_to_ace(struct security_ace * samba_ace, struct ifs_ace * ace,
     bool *mapped, int snum)
 {
@@ -233 +234 @@
 
 /**
- * Convert a SEC_ACL to a struct ifs_security_acl
+ * Convert a struct security_acl to a struct ifs_security_acl
  */
 static bool
-onefs_samba_acl_to_acl(SEC_ACL *samba_acl, struct ifs_security_acl **acl,
+onefs_samba_acl_to_acl(struct security_acl *samba_acl, struct ifs_security_acl **acl,
     bool * ignore_aces, int snum)
 {
         int num_aces = 0;
         struct ifs_ace *aces = NULL;
-        SEC_ACE *samba_aces;
+        struct security_ace *samba_aces;
         bool mapped;
         int i, j;
@@ -288 +289 @@
 
 /**
- * Convert a struct ifs_security_acl to a SEC_ACL
+ * Convert a struct ifs_security_acl to a struct security_acl
  */
 static bool
-onefs_acl_to_samba_acl(struct ifs_security_acl *acl, SEC_ACL **samba_acl)
-{
-        SEC_ACE *samba_aces = NULL;
-        SEC_ACL *tmp_samba_acl = NULL;
+onefs_acl_to_samba_acl(struct ifs_security_acl *acl, struct security_acl **samba_acl)
+{
+        struct security_ace *samba_aces = NULL;
+        struct security_acl *tmp_samba_acl = NULL;
         int i, num_aces = 0;
 
@@ -314 +315 @@
         /* Allocate the ace list. */
         if (num_aces > 0) {
-                if ((samba_aces = SMB_MALLOC_ARRAY(SEC_ACE, num_aces)) == NULL)
+                if ((samba_aces = SMB_MALLOC_ARRAY(struct security_ace, num_aces)) == NULL)
                 {
                         DEBUG(0, ("Unable to malloc space for %d aces.\n",
@@ -320 +321 @@
                         return false;
                 }
-                memset(samba_aces, '\0', (num_aces) * sizeof(SEC_ACE));
+                memset(samba_aces, '\0', (num_aces) * sizeof(struct security_ace));
         }
 
         for (i = 0; i < num_aces; i++) {
-                DOM_SID sid;
+                struct dom_sid sid;
 
                 if (!onefs_identity_to_sid(&acl->aces[i].trustee, &sid))
@@ -554 +555 @@
                 /* Use existing samba logic to derive the mode bits. */
                 file_mode = unix_mode(fsp->conn, 0, fsp->fsp_name, NULL);
-                dir_mode = unix_mode(fsp->conn, aDIR, fsp->fsp_name, NULL);
+                dir_mode = unix_mode(fsp->conn, FILE_ATTRIBUTE_DIRECTORY, fsp->fsp_name, NULL);
 
                 /* Initialize ACEs. */
@@ -605 +606 @@
 NTSTATUS
 onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                  uint32 security_info, SEC_DESC **ppdesc)
+                  uint32 security_info, struct security_descriptor **ppdesc)
 {
         int error;
@@ -611 +612 @@
         size_t size = 0;
         struct ifs_security_descriptor *sd = NULL;
-        DOM_SID owner_sid, group_sid;
-        DOM_SID *ownerp, *groupp;
-        SEC_ACL *dacl, *sacl;
-        SEC_DESC *pdesc;
+        struct dom_sid owner_sid, group_sid;
+        struct dom_sid *ownerp, *groupp;
+        struct security_acl *dacl, *sacl;
+        struct security_descriptor *pdesc;
         bool alloced = false;
         bool new_aces_alloced = false;
@@ -630 +631 @@
                 PARM_IGNORE_SACLS, PARM_IGNORE_SACLS_DEFAULT)) {
                 DEBUG(5, ("Ignoring SACL on %s.\n", fsp_str_dbg(fsp)));
-                security_info &= ~SACL_SECURITY_INFORMATION;
+                security_info &= ~SECINFO_SACL;
         }
 
@@ -706 +707 @@
 
         /* Copy owner into ppdesc */
-        if (security_info & OWNER_SECURITY_INFORMATION) {
+        if (security_info & SECINFO_OWNER) {
                 if (!onefs_identity_to_sid(sd->owner, &owner_sid)) {
                         status = NT_STATUS_INVALID_PARAMETER;
@@ -716 +717 @@
 
         /* Copy group into ppdesc */
-        if (security_info & GROUP_SECURITY_INFORMATION) {
+        if (security_info & SECINFO_GROUP) {
                 if (!onefs_identity_to_sid(sd->group, &group_sid)) {
                         status = NT_STATUS_INVALID_PARAMETER;
@@ -726 +727 @@
 
         /* Copy DACL into ppdesc */
-        if (security_info & DACL_SECURITY_INFORMATION) {
+        if (security_info & SECINFO_DACL) {
                 if (!onefs_acl_to_samba_acl(sd->dacl, &dacl)) {
                         status = NT_STATUS_INVALID_PARAMETER;
@@ -734 +735 @@
 
         /* Copy SACL into ppdesc */
-        if (security_info & SACL_SECURITY_INFORMATION) {
+        if (security_info & SECINFO_SACL) {
                 if (!onefs_acl_to_samba_acl(sd->sacl, &sacl)) {
                         status = NT_STATUS_INVALID_PARAMETER;
@@ -791 +792 @@
 NTSTATUS
 onefs_get_nt_acl(vfs_handle_struct *handle, const char* name,
-                 uint32 security_info, SEC_DESC **ppdesc)
+                 uint32 security_info, struct security_descriptor **ppdesc)
 {
         files_struct finfo;
@@ -818 +819 @@
 /**
  * Isilon-specific function for setting up an ifs_security_descriptor, given a
- * samba SEC_DESC.
+ * samba struct security_descriptor
  *
  * @param[out] sd ifs_security_descriptor to fill in
@@ -824 +825 @@
  * @return NTSTATUS_OK if successful
  */
-NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, const SEC_DESC *psd,
+NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent,
+                              const struct security_descriptor *psd,
                               struct ifs_security_descriptor *sd, int snum,
                               uint32_t *security_info_effective)
@@ -840 +842 @@
 
         /* Setup owner */
-        if (security_info_sent & OWNER_SECURITY_INFORMATION) {
+        if (security_info_sent & SECINFO_OWNER) {
                 if (!onefs_og_to_identity(psd->owner_sid, &owner, false, snum))
                         return NT_STATUS_ACCESS_DENIED;
@@ -850 +852 @@
 
         /* Setup group */
-        if (security_info_sent & GROUP_SECURITY_INFORMATION) {
+        if (security_info_sent & SECINFO_GROUP) {
                 if (!onefs_og_to_identity(psd->group_sid, &group, true, snum))
                         return NT_STATUS_ACCESS_DENIED;
@@ -860 +862 @@
 
         /* Setup DACL */
-        if ((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl)) {
+        if ((security_info_sent & SECINFO_DACL) && (psd->dacl)) {
                 if (!onefs_samba_acl_to_acl(psd->dacl, &daclp, &ignore_aces,
                         snum))
@@ -866 +868 @@
 
                 if (ignore_aces == true)
-                        *security_info_effective &= ~DACL_SECURITY_INFORMATION;
+                        *security_info_effective &= ~SECINFO_DACL;
         }
 
         /* Setup SACL */
-        if (security_info_sent & SACL_SECURITY_INFORMATION) {
+        if (security_info_sent & SECINFO_SACL) {
 
                 if (lp_parm_bool(snum, PARM_ONEFS_TYPE,
                             PARM_IGNORE_SACLS, PARM_IGNORE_SACLS_DEFAULT)) {
                         DEBUG(5, ("Ignoring SACL.\n"));
-                        *security_info_effective &= ~SACL_SECURITY_INFORMATION;
+                        *security_info_effective &= ~SECINFO_SACL;
                 } else {
                         if (psd->sacl) {
@@ -884 +886 @@
                                 if (ignore_aces == true) {
                                         *security_info_effective &=
-                                            ~SACL_SECURITY_INFORMATION;
+                                            ~SECINFO_SACL;
                                 }
                         }
@@ -910 +912 @@
 NTSTATUS
 onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                  uint32_t sec_info_sent, const SEC_DESC *psd)
+                  uint32_t sec_info_sent, const struct security_descriptor *psd)
 {
         struct ifs_security_descriptor sd = {};