security: merge builtin rid tables.

Guenther

4 files changed, 39 insertions, 49 deletions

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 5dfbb40c3e..740a928d87 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -293,6 +293,25 @@ interface security
 	const int DOMAIN_RID_READONLY_DCS            = 521;
 	const int DOMAIN_RID_RAS_SERVERS             = 553;
 
+	/* well-known builtin RIDs */
+	const int BUILTIN_RID_ADMINISTRATORS		= 544;
+	const int BUILTIN_RID_USERS			= 545;
+	const int BUILTIN_RID_GUESTS			= 546;
+	const int BUILTIN_RID_POWER_USERS		= 547;
+	const int BUILTIN_RID_ACCOUNT_OPERATORS		= 548;
+	const int BUILTIN_RID_SERVER_OPERATORS		= 549;
+	const int BUILTIN_RID_PRINT_OPERATORS		= 550;
+	const int BUILTIN_RID_BACKUP_OPERATORS		= 551;
+	const int BUILTIN_RID_REPLICATOR		= 552;
+	const int BUILTIN_RID_RAS_SERVERS		= 553;
+	const int BUILTIN_RID_PRE_2K_ACCESS		= 554;
+	const int BUILTIN_RID_REMOTE_DESKTOP_USERS	= 555;
+	const int BUILTIN_RID_NETWORK_CONF_OPERATORS	= 556;
+	const int BUILTIN_RID_INCOMING_FOREST_TRUST	= 557;
+	const int BUILTIN_RID_PERFMON_USERS		= 558;
+	const int BUILTIN_RID_PERFLOG_USERS		= 559;
+	const int BUILTIN_RID_AUTH_ACCESS		= 560;
+	const int BUILTIN_RID_TS_LICENSE_SERVERS	= 561;
 
 	/*
 	  privilege IDs. Please keep the IDs below 64. If we get more
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index d60d929482..8e710fdd62 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -272,7 +272,7 @@ NTSTATUS create_builtin_users(const DOM_SID *dom_sid)
 	NTSTATUS status;
 	DOM_SID dom_users;
 
-	status = create_builtin(BUILTIN_ALIAS_RID_USERS);
+	status = create_builtin(BUILTIN_RID_USERS);
 	if ( !NT_STATUS_IS_OK(status) ) {
 		DEBUG(5,("create_builtin_users: Failed to create Users\n"));
 		return status;
@@ -301,7 +301,7 @@ NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid)
 	TALLOC_CTX *ctx;
 	bool ret;
 
-	status = create_builtin(BUILTIN_ALIAS_RID_ADMINS);
+	status = create_builtin(BUILTIN_RID_ADMINISTRATORS);
 	if ( !NT_STATUS_IS_OK(status) ) {
 		DEBUG(5,("create_builtin_administrators: Failed to create Administrators\n"));
 		return status;
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index d8814e3bc1..85dd1ce355 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -25,35 +25,6 @@
 
 #define SMB_RPC_INTERFACE_VERSION 1
 
-
-/********************************************************************** 
- * well-known RIDs - Relative IDs
- **********************************************************************/
-
-/* RIDs - well-known aliases ... */
-#define BUILTIN_ALIAS_RID_ADMINS        (0x00000220L)
-#define BUILTIN_ALIAS_RID_USERS         (0x00000221L)
-#define BUILTIN_ALIAS_RID_GUESTS        (0x00000222L)
-#define BUILTIN_ALIAS_RID_POWER_USERS   (0x00000223L)
-
-#define BUILTIN_ALIAS_RID_ACCOUNT_OPS   (0x00000224L)
-#define BUILTIN_ALIAS_RID_SYSTEM_OPS    (0x00000225L)
-#define BUILTIN_ALIAS_RID_PRINT_OPS     (0x00000226L)
-#define BUILTIN_ALIAS_RID_BACKUP_OPS    (0x00000227L)
-
-#define BUILTIN_ALIAS_RID_REPLICATOR    (0x00000228L)
-#define BUILTIN_ALIAS_RID_RAS_SERVERS   (0x00000229L)
-#define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x0000022aL)
-#define BUILTIN_ALIAS_RID_REMOTE_DESKTOP_USERS   (0x0000022bL)
-#define BUILTIN_ALIAS_RID_NETWORK_CONF_OPERATORS (0x0000022cL)
-#define BUILTIN_ALIAS_RID_INCOMING_FOREST_TRUST  (0x0000022dL)
-#define BUILTIN_ALIAS_RID_PERFMON_USERS	(0x0000022eL)
-#define BUILTIN_ALIAS_RID_PERFLOG_USERS	(0x0000022fL)
-#define BUILTIN_ALIAS_RID_AUTH_ACCESS	(0x00000230L)
-#define BUILTIN_ALIAS_RID_TS_LICENSE_SERVERS	(0x00000231L)
-
-
-
 /********************************************************************** 
  * RPC policy handle used pretty much everywhere
  **********************************************************************/
diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index dc0a54c598..2b8bb6e573 100644
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -25,31 +25,31 @@ struct rid_name_map {
 };
 
 static const struct rid_name_map builtin_aliases[] = {
-	{ BUILTIN_ALIAS_RID_ADMINS,		"Administrators" },
-	{ BUILTIN_ALIAS_RID_USERS,		"Users" },
-	{ BUILTIN_ALIAS_RID_GUESTS,		"Guests" },
-	{ BUILTIN_ALIAS_RID_POWER_USERS,	"Power Users" },
-	{ BUILTIN_ALIAS_RID_ACCOUNT_OPS,	"Account Operators" },
-	{ BUILTIN_ALIAS_RID_SYSTEM_OPS,		"Server Operators" },
-	{ BUILTIN_ALIAS_RID_PRINT_OPS,		"Print Operators" },
-	{ BUILTIN_ALIAS_RID_BACKUP_OPS,		"Backup Operators" },
-	{ BUILTIN_ALIAS_RID_REPLICATOR,		"Replicator" },
-	{ BUILTIN_ALIAS_RID_RAS_SERVERS,	"RAS Servers" },
-	{ BUILTIN_ALIAS_RID_PRE_2K_ACCESS,
+	{ BUILTIN_RID_ADMINISTRATORS,		"Administrators" },
+	{ BUILTIN_RID_USERS,		"Users" },
+	{ BUILTIN_RID_GUESTS,		"Guests" },
+	{ BUILTIN_RID_POWER_USERS,	"Power Users" },
+	{ BUILTIN_RID_ACCOUNT_OPERATORS,	"Account Operators" },
+	{ BUILTIN_RID_SERVER_OPERATORS,		"Server Operators" },
+	{ BUILTIN_RID_PRINT_OPERATORS,		"Print Operators" },
+	{ BUILTIN_RID_BACKUP_OPERATORS,		"Backup Operators" },
+	{ BUILTIN_RID_REPLICATOR,		"Replicator" },
+	{ BUILTIN_RID_RAS_SERVERS,		"RAS Servers" },
+	{ BUILTIN_RID_PRE_2K_ACCESS,
 		"Pre-Windows 2000 Compatible Access" },
-	{ BUILTIN_ALIAS_RID_REMOTE_DESKTOP_USERS,
+	{ BUILTIN_RID_REMOTE_DESKTOP_USERS,
 		"Remote Desktop Users" },
-	{ BUILTIN_ALIAS_RID_NETWORK_CONF_OPERATORS,
+	{ BUILTIN_RID_NETWORK_CONF_OPERATORS,
 		"Network Configuration Operators" },
-	{ BUILTIN_ALIAS_RID_INCOMING_FOREST_TRUST,
+	{ BUILTIN_RID_INCOMING_FOREST_TRUST,
 		"Incoming Forest Trust Builders" },
-	{ BUILTIN_ALIAS_RID_PERFMON_USERS,
+	{ BUILTIN_RID_PERFMON_USERS,
 		"Performance Monitor Users" },
-	{ BUILTIN_ALIAS_RID_PERFLOG_USERS,
+	{ BUILTIN_RID_PERFLOG_USERS,
 		"Performance Log Users" },
-	{ BUILTIN_ALIAS_RID_AUTH_ACCESS,
+	{ BUILTIN_RID_AUTH_ACCESS,
 		"Windows Authorization Access Group" },
-	{ BUILTIN_ALIAS_RID_TS_LICENSE_SERVERS,
+	{ BUILTIN_RID_TS_LICENSE_SERVERS,
 		"Terminal Server License Servers" },
 	{  0, NULL}};