Changeset 224 for branches/samba-3.3.x/source/librpc

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

Location:

branches/samba-3.3.x/source/librpc

Files:

• gen_ndr/ndr_samr.c (modified) (1 diff)
• gen_ndr/samr.h (modified) (2 diffs)
• idl/samr.idl (modified) (2 diffs)
• idl/security.idl (modified) (1 diff)

branches/samba-3.3.x/source/librpc/gen_ndr/ndr_samr.c

@@ -70 +70 @@
         ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_CREATE_DOMAIN", SAMR_ACCESS_CREATE_DOMAIN, r);
         ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_ENUM_DOMAINS", SAMR_ACCESS_ENUM_DOMAINS, r);
-        ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_OPEN_DOMAIN", SAMR_ACCESS_OPEN_DOMAIN, r);
+        ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_LOOKUP_DOMAIN", SAMR_ACCESS_LOOKUP_DOMAIN, r);
         ndr->depth--;
 }

branches/samba-3.3.x/source/librpc/gen_ndr/samr.h

@@ -13 +13 @@
 #define GENERIC_RIGHTS_SAM_READ ( (STANDARD_RIGHTS_READ_ACCESS|SAMR_ACCESS_ENUM_DOMAINS) )
 #define GENERIC_RIGHTS_SAM_WRITE        ( (STANDARD_RIGHTS_WRITE_ACCESS|SAMR_ACCESS_CREATE_DOMAIN|SAMR_ACCESS_INITIALIZE_SERVER|SAMR_ACCESS_SHUTDOWN_SERVER) )
-#define GENERIC_RIGHTS_SAM_EXECUTE      ( (STANDARD_RIGHTS_EXECUTE_ACCESS|SAMR_ACCESS_OPEN_DOMAIN|SAMR_ACCESS_CONNECT_TO_SERVER) )
+#define GENERIC_RIGHTS_SAM_EXECUTE      ( (STANDARD_RIGHTS_EXECUTE_ACCESS|SAMR_ACCESS_LOOKUP_DOMAIN|SAMR_ACCESS_CONNECT_TO_SERVER) )
 #define SAMR_USER_ACCESS_ALL_ACCESS     ( 0x000007FF )
 #define GENERIC_RIGHTS_USER_ALL_ACCESS  ( (STANDARD_RIGHTS_REQUIRED_ACCESS|SAMR_USER_ACCESS_ALL_ACCESS) )
@@ -66 +66 @@
 #define SAMR_ACCESS_CREATE_DOMAIN ( 0x00000008 )
 #define SAMR_ACCESS_ENUM_DOMAINS ( 0x00000010 )
-#define SAMR_ACCESS_OPEN_DOMAIN ( 0x00000020 )
+#define SAMR_ACCESS_LOOKUP_DOMAIN ( 0x00000020 )
 
 /* bitmap samr_UserAccessMask */

branches/samba-3.3.x/source/librpc/idl/samr.idl

@@ -49 +49 @@
                 SAMR_ACCESS_CREATE_DOMAIN       = 0x00000008,
                 SAMR_ACCESS_ENUM_DOMAINS        = 0x00000010,
-                SAMR_ACCESS_OPEN_DOMAIN         = 0x00000020
+                SAMR_ACCESS_LOOKUP_DOMAIN       = 0x00000020
         } samr_ConnectAccessMask;
 
@@ -70 +70 @@
         const int GENERIC_RIGHTS_SAM_EXECUTE =
                 (STANDARD_RIGHTS_EXECUTE_ACCESS         |
-                 SAMR_ACCESS_OPEN_DOMAIN                |
+                 SAMR_ACCESS_LOOKUP_DOMAIN              |
                  SAMR_ACCESS_CONNECT_TO_SERVER);
 

branches/samba-3.3.x/source/librpc/idl/security.idl

@@ -136 +136 @@
         /* combinations of standard masks. */
         const int STANDARD_RIGHTS_ALL_ACCESS            = SEC_STD_ALL; /* 0x001f0000 */
-        const int STANDARD_RIGHTS_MODIFY_ACCESS         = SEC_STD_READ_CONTROLS; /* 0x00020000 */
-        const int STANDARD_RIGHTS_EXECUTE_ACCESS        = SEC_STD_READ_CONTROLS; /* 0x00020000 */
-        const int STANDARD_RIGHTS_READ_ACCESS           = SEC_STD_READ_CONTROLS; /* 0x00020000 */
+        const int STANDARD_RIGHTS_MODIFY_ACCESS         = SEC_STD_READ_CONTROL; /* 0x00020000 */
+        const int STANDARD_RIGHTS_EXECUTE_ACCESS        = SEC_STD_READ_CONTROL; /* 0x00020000 */
+        const int STANDARD_RIGHTS_READ_ACCESS           = SEC_STD_READ_CONTROL; /* 0x00020000 */
         const int STANDARD_RIGHTS_WRITE_ACCESS =
                 (SEC_STD_WRITE_OWNER            |