[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  82e140c... s3: use shared security defines.
      from  fbb7814... s3: only use netlogon/nbt header when needed.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 82e140c04562c1480d8ae1d6cb68d510824a1a1c
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 28 03:31:52 2010 +0200

    s3: use shared security defines.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/rpc_secdes.h |   15 ---------------
 source3/libads/disp_sec.c    |   28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 74c22fc..e21767e 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -22,21 +22,6 @@
 #define _RPC_SECDES_H 
 
 /* for ADS */
-#define	SEC_RIGHTS_LIST_CONTENTS	0x4
-#define SEC_RIGHTS_LIST_OBJECT		0x80
-#define	SEC_RIGHTS_READ_ALL_PROP	0x10
-#define	SEC_RIGHTS_READ_PERMS		0x20000
-#define SEC_RIGHTS_WRITE_ALL_VALID	0x8
-#define	SEC_RIGHTS_WRITE_ALL_PROP	0x20     
-#define SEC_RIGHTS_MODIFY_OWNER		0x80000
-#define	SEC_RIGHTS_MODIFY_PERMS		0x40000
-#define	SEC_RIGHTS_CREATE_CHILD		0x1
-#define	SEC_RIGHTS_DELETE_CHILD		0x2
-#define SEC_RIGHTS_DELETE_SUBTREE	0x40
-#define SEC_RIGHTS_DELETE               0x10000 /* advanced/special/object/delete */
-#define SEC_RIGHTS_EXTENDED		0x100 /* change/reset password, receive/send as*/
-#define	SEC_RIGHTS_CHANGE_PASSWD	SEC_RIGHTS_EXTENDED
-#define	SEC_RIGHTS_RESET_PASSWD		SEC_RIGHTS_EXTENDED
 #define SEC_RIGHTS_FULL_CTRL		0xf01ff
 
 /*
diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index f8489e1..ad07ffc 100644
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -27,26 +27,26 @@ static struct perm_mask_str {
 } perms[] = {
 	{SEC_RIGHTS_FULL_CTRL,		"[Full Control]"},
 
-	{SEC_RIGHTS_LIST_CONTENTS,	"[List Contents]"},
-	{SEC_RIGHTS_LIST_OBJECT,	"[List Object]"},
+	{SEC_ADS_LIST,			"[List Contents]"},
+	{SEC_ADS_LIST_OBJECT,		"[List Object]"},
 
-	{SEC_RIGHTS_READ_ALL_PROP,	"[Read All Properties]"},	
-	{SEC_RIGHTS_READ_PERMS,		"[Read Permissions]"},	
+	{SEC_ADS_READ_PROP,		"[Read All Properties]"},
+	{SEC_STD_READ_CONTROL,		"[Read Permissions]"},
 
-	{SEC_RIGHTS_WRITE_ALL_VALID,	"[All validate writes]"},
-	{SEC_RIGHTS_WRITE_ALL_PROP,  	"[Write All Properties]"},
+	{SEC_ADS_SELF_WRITE,		"[All validate writes]"},
+	{SEC_ADS_WRITE_PROP,		"[Write All Properties]"},
 
-	{SEC_RIGHTS_MODIFY_PERMS,	"[Modify Permissions]"},
-	{SEC_RIGHTS_MODIFY_OWNER,	"[Modify Owner]"},
+	{SEC_STD_WRITE_DAC,		"[Modify Permissions]"},
+	{SEC_STD_WRITE_OWNER,		"[Modify Owner]"},
 
-	{SEC_RIGHTS_CREATE_CHILD,	"[Create All Child Objects]"},
+	{SEC_ADS_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_STD_DELETE,		"[Delete]"},
+	{SEC_ADS_DELETE_TREE,		"[Delete Subtree]"},
+	{SEC_ADS_DELETE_CHILD,		"[Delete All Child Objects]"},
 
-	{SEC_RIGHTS_CHANGE_PASSWD,	"[Change Password]"},	
-	{SEC_RIGHTS_RESET_PASSWD,	"[Reset Password]"},
+	{SEC_ADS_CONTROL_ACCESS,	"[Change Password]"},
+	{SEC_ADS_CONTROL_ACCESS,	"[Reset Password]"},
 
 	{0,				0}
 };


-- 
Samba Shared Repository