Changeset 745 for trunk/server/source3/libads/disp_sec.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/libads/disp_sec.c (modified) (5 diffs)

trunk/server/source3/libads/disp_sec.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "ads.h"
+#include "libads/ldap_schema.h"
+#include "../libcli/security/secace.h"
+#include "../librpc/ndr/libndr.h"
+
+/* for ADS */
+#define SEC_RIGHTS_FULL_CTRL            0xf01ff
 
 #ifdef HAVE_LDAP
@@ -28 +35 @@
         {SEC_RIGHTS_FULL_CTRL,          "[Full Control]"},
 
-        {SEC_RIGHTS_LIST_CONTENTS,      "[List Contents]"},
-        {SEC_RIGHTS_LIST_OBJECT,        "[List Object]"},
-
-        {SEC_RIGHTS_READ_ALL_PROP,      "[Read All Properties]"},       
-        {SEC_RIGHTS_READ_PERMS,         "[Read Permissions]"},  
-
-        {SEC_RIGHTS_WRITE_ALL_VALID,    "[All validate writes]"},
-        {SEC_RIGHTS_WRITE_ALL_PROP,     "[Write All Properties]"},
-
-        {SEC_RIGHTS_MODIFY_PERMS,       "[Modify Permissions]"},
-        {SEC_RIGHTS_MODIFY_OWNER,       "[Modify Owner]"},
-
-        {SEC_RIGHTS_CREATE_CHILD,       "[Create All Child Objects]"},
-
-        {SEC_RIGHTS_DELETE,             "[Delete]"},
-        {SEC_RIGHTS_DELETE_SUBTREE,     "[Delete Subtree]"},
-        {SEC_RIGHTS_DELETE_CHILD,       "[Delete All Child Objects]"},
-
-        {SEC_RIGHTS_CHANGE_PASSWD,      "[Change Password]"},   
-        {SEC_RIGHTS_RESET_PASSWD,       "[Reset Password]"},
+        {SEC_ADS_LIST,                  "[List Contents]"},
+        {SEC_ADS_LIST_OBJECT,           "[List Object]"},
+
+        {SEC_ADS_READ_PROP,             "[Read All Properties]"},
+        {SEC_STD_READ_CONTROL,          "[Read Permissions]"},
+
+        {SEC_ADS_SELF_WRITE,            "[All validate writes]"},
+        {SEC_ADS_WRITE_PROP,            "[Write All Properties]"},
+
+        {SEC_STD_WRITE_DAC,             "[Modify Permissions]"},
+        {SEC_STD_WRITE_OWNER,           "[Modify Owner]"},
+
+        {SEC_ADS_CREATE_CHILD,          "[Create All Child Objects]"},
+
+        {SEC_STD_DELETE,                "[Delete]"},
+        {SEC_ADS_DELETE_TREE,           "[Delete Subtree]"},
+        {SEC_ADS_DELETE_CHILD,          "[Delete All Child Objects]"},
+
+        {SEC_ADS_CONTROL_ACCESS,        "[Change Password]"},
+        {SEC_ADS_CONTROL_ACCESS,        "[Reset Password]"},
 
         {0,                             0}
@@ -130 +137 @@
 
 /* display ACE */
-static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, SEC_ACE *sec_ace)
+static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_ace *sec_ace)
 {
         const char *access_type = "UNKNOWN";
@@ -174 +181 @@
 
 /* display ACL */
-static void ads_disp_acl(SEC_ACL *sec_acl, const char *type)
+static void ads_disp_acl(struct security_acl *sec_acl, const char *type)
 {
         if (!sec_acl)
@@ -188 +195 @@
 
 /* display SD */
-void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, SEC_DESC *sd)
+void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_descriptor *sd)
 {
         int i;