r22798: Add the "apply group policy" access bit (as seen in type 0x05 ALLOWED OBJECT

ACEs).

Guenther
(This used to be commit e138cbc876e50ae25cb15c5109a42bc8b800c1ba)

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 4912b7d068139dd1fa8fd2f558e6f9bf4d8971a0..8396040a9b1a1184439d15e55305605df9855405 100644 (file)
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -38,6 +38,7 @@
 #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_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_APPLY_GROUP_POLICY  SEC_RIGHTS_EXTENDED

 #define SEC_RIGHTS_FULL_CTRL           0xf01ff
 
 #define SEC_ACE_OBJECT_PRESENT           0x00000001 /* thanks for Jim McDonough <jmcd@us.ibm.com> */
 #define SEC_RIGHTS_FULL_CTRL           0xf01ff
 
 #define SEC_ACE_OBJECT_PRESENT           0x00000001 /* thanks for Jim McDonough <jmcd@us.ibm.com> */

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index a768ba08f3e60b15c9650bf04477dcef2b00e2b5..1e62eb8551734b3d369d7a3765799b4be3fcb5e2 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -46,6 +46,9 @@ static struct perm_mask_str {
 
        {SEC_RIGHTS_CHANGE_PASSWD,      "[Change Password]"},   
        {SEC_RIGHTS_RESET_PASSWD,       "[Reset Password]"},
 
        {SEC_RIGHTS_CHANGE_PASSWD,      "[Change Password]"},   
        {SEC_RIGHTS_RESET_PASSWD,       "[Reset Password]"},

+
+       {SEC_RIGHTS_APPLY_GROUP_POLICY, "[Apply Group Policy]"},
+

        {0,                             0}
 };
 
        {0,                             0}
 };
 


@@ -66,7 +69,7 @@ static void ads_disp_perms(uint32 type)
                if (type & (1 << i)) {
                        for (j = 1; perms[j].str; j ++) {
                                if (perms[j].mask == (((unsigned) 1) << i)) {
                if (type & (1 << i)) {
                        for (j = 1; perms[j].str; j ++) {
                                if (perms[j].mask == (((unsigned) 1) << i)) {

-                                       printf("\n\t%s", perms[j].str);
+                                       printf("\n\t%s (0x%08x)", perms[j].str, perms[j].mask);

                                }       
                        }
                        type &= ~(1 << i);
                                }       
                        }
                        type &= ~(1 << i);