[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  fad0629... s3-builtin: Add missing builtin groups.
       via  d05a1bd... s3: Re-run make samba3-idl.
       via  18d1821... security.idl: Add missing builtin groups.
      from  77de233... librpc/rpc: fix dcerpc_errstr() to handle all nca_s_* status codes and fallback to WERROR codes

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


- Log -----------------------------------------------------------------
commit fad0629e78c8672ea9b4eeb709b1d21c43abac06
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 23 14:53:49 2010 +0100

    s3-builtin: Add missing builtin groups.
    
    Karolin

commit d05a1bd01359d73f2d6a6448a0272acef929ada0
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 23 15:24:25 2010 +0100

    s3: Re-run make samba3-idl.
    
    Karolin

commit 18d1821490a9793dc7df123c5d3f212857239b29
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 23 14:26:51 2010 +0100

    security.idl: Add missing builtin groups.
    
    Karolin

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

Summary of changes:
 librpc/gen_ndr/security.h     |    4 ++++
 librpc/idl/security.idl       |    4 ++++
 source3/include/rpc_misc.h    |    4 ++++
 source3/passdb/util_builtin.c |    8 ++++++++
 4 files changed, 20 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 58ab075..6cf6cf5 100644
--- a/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
@@ -133,6 +133,10 @@
 #define SID_BUILTIN_REMOTE_DESKTOP_USERS	( "S-1-5-32-555" )
 #define SID_BUILTIN_NETWORK_CONF_OPERATORS	( "S-1-5-32-556" )
 #define SID_BUILTIN_INCOMING_FOREST_TRUST	( "S-1-5-32-557" )
+#define SID_BUILTIN_PERFMON_USERS	( "S-1-5-32-558" )
+#define SID_BUILTIN_PERFLOG_USERS	( "S-1-5-32-559" )
+#define SID_BUILTIN_AUTH_ACCESS	( "S-1-5-32-560" )
+#define SID_BUILTIN_TS_LICENSE_SERVERS	( "S-1-5-32-561" )
 #define NAME_NT_SERVICE	( "NT SERVICE" )
 #define SID_NT_NT_SERVICE	( "S-1-5-80" )
 #define SID_NT_TRUSTED_INSTALLER	( "S-1-5-80-956008885-3418522649-1831038044-1853292631-2271478464" )
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index d1c13f1..5dfbb40 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -263,6 +263,10 @@ interface security
 	const string SID_BUILTIN_REMOTE_DESKTOP_USERS   = "S-1-5-32-555";
 	const string SID_BUILTIN_NETWORK_CONF_OPERATORS = "S-1-5-32-556";
 	const string SID_BUILTIN_INCOMING_FOREST_TRUST  = "S-1-5-32-557";
+	const string SID_BUILTIN_PERFMON_USERS		= "S-1-5-32-558";
+	const string SID_BUILTIN_PERFLOG_USERS		= "S-1-5-32-559";
+	const string SID_BUILTIN_AUTH_ACCESS 		= "S-1-5-32-560";
+	const string SID_BUILTIN_TS_LICENSE_SERVERS	= "S-1-5-32-561";
 
 	/* SECURITY_NT_SERVICE */
 	const string NAME_NT_SERVICE            = "NT SERVICE";
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 5108c40..ccf7d6a 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -67,6 +67,10 @@
 #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)
 
 
 
diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index 98f86d6..b009d76 100644
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -43,6 +43,14 @@ static const struct rid_name_map builtin_aliases[] = {
 		"Network Configuration Operators" },
 	{ BUILTIN_ALIAS_RID_INCOMING_FOREST_TRUST,
 		"Incoming Forest Trust Builders" },
+	{ BUILTIN_ALIAS_RID_PERFMON_USERS,
+		"Performance Monitor Users" },
+	{ BUILTIN_ALIAS_RID_PERFLOG_USERS,
+		"Performance Log Users" },
+	{ BUILTIN_ALIAS_RID_AUTH_ACCESS,
+		"Windows Authorization Access Group" },
+	{ BUILTIN_ALIAS_RID_TS_LICENSE_SERVERS,
+		"Terminal Server License Servers" },
 	{  0, NULL}};
 
 /*******************************************************************


-- 
Samba Shared Repository