[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  ef83c97... s3-builtin: Add some builtin groups.
      from  9f84d72... idl:drsblobs add code to interpret msDS-TrustForestTrustInfo

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


- Log -----------------------------------------------------------------
commit ef83c970ca66bf02d684c6fb913a6caa2b25e39c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 23 11:39:05 2010 +0100

    s3-builtin: Add some builtin groups.
    
    Karolin

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

Summary of changes:
 source3/include/rpc_misc.h    |    3 +++
 source3/passdb/util_builtin.c |    9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index e86c47f..5108c40 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -64,6 +64,9 @@
 #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)
 
 
 
diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index dbddddd..98f86d6 100644
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -35,7 +35,14 @@ static const struct rid_name_map builtin_aliases[] = {
 	{ 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,	"Pre-Windows 2000 Compatible Access" },
+	{ BUILTIN_ALIAS_RID_PRE_2K_ACCESS,
+		"Pre-Windows 2000 Compatible Access" },
+	{ BUILTIN_ALIAS_RID_REMOTE_DESKTOP_USERS,
+		"Remote Desktop Users" },
+	{ BUILTIN_ALIAS_RID_NETWORK_CONF_OPERATORS,
+		"Network Configuration Operators" },
+	{ BUILTIN_ALIAS_RID_INCOMING_FOREST_TRUST,
+		"Incoming Forest Trust Builders" },
 	{  0, NULL}};
 
 /*******************************************************************


-- 
Samba Shared Repository