s3-security: use shared SECINFO_DACL define.

[kai/samba.git] / source3 / smbd / open.c

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ce69157df5741063400a8d6dfafac21e9ded7750..4fc464d8abdb119c28ea55057b92cf706813d2f8 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
@@ -88,9 +89,9 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn,
        struct security_descriptor *sd = NULL;
 
        status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
-                       (OWNER_SECURITY_INFORMATION |
-                       GROUP_SECURITY_INFORMATION |
-                       DACL_SECURITY_INFORMATION),&sd);
+                       (SECINFO_OWNER |
+                       SECINFO_GROUP |
+                       SECINFO_DACL),&sd);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("smbd_check_open_rights: Could not get acl "
@@ -1412,9 +1413,9 @@ static NTSTATUS calculate_access_mask(connection_struct *conn,
                        uint32_t access_granted = 0;
 
                        status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
-                                       (OWNER_SECURITY_INFORMATION |
-                                       GROUP_SECURITY_INFORMATION |
-                                       DACL_SECURITY_INFORMATION),&sd);
+                                       (SECINFO_OWNER |
+                                       SECINFO_GROUP |
+                                       SECINFO_DACL),&sd);
 
                        if (!NT_STATUS_IS_OK(status)) {
                                DEBUG(10, ("calculate_access_mask: Could not get acl "
@@ -3208,10 +3209,10 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                security_acl_map_generic(sd->dacl, &file_generic_mapping);
                security_acl_map_generic(sd->sacl, &file_generic_mapping);
 
-               if (sec_info_sent & (OWNER_SECURITY_INFORMATION|
-                                       GROUP_SECURITY_INFORMATION|
-                                       DACL_SECURITY_INFORMATION|
-                                       SACL_SECURITY_INFORMATION)) {
+               if (sec_info_sent & (SECINFO_OWNER|
+                                       SECINFO_GROUP|
+                                       SECINFO_DACL|
+                                       SECINFO_SACL)) {
                        status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
                }