[SCM] Samba Shared Repository - branch master updated
Christian Ambach
ambi at samba.org
Wed Aug 31 03:23:02 MDT 2011
The branch, master has been updated
via 59e8db0 s3:modules make perfcount_test loadable again
via 4c2be3d s3:lib S-1-5-9 is "Enterprise Domain Controllers"
via 8ecdb55 s3:lib remove duplicate entry for "Anonymous Logon"
via d387041 s3:lib add S-1-5-17 to well-known SID list
via 0decdf8 s3:lib add some more well-known sids
via 7475144 s3:lib add new well-known SIDs for BUILTIN
via b43c69b security.idl add new well-known SIDs
from 80f4a93 tdb2: add full LGPL headers
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 59e8db0f060479be3a853ce718bcdf4f9ce0138d
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:48:53 2011 +0200
s3:modules make perfcount_test loadable again
use expected 'init_samba_module' name for initializer function
Autobuild-User: Christian Ambach <ambi at samba.org>
Autobuild-Date: Wed Aug 31 11:22:26 CEST 2011 on sn-devel-104
commit 4c2be3df0ef00ea1307fe022f8d156edeffb36a5
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:46:06 2011 +0200
s3:lib S-1-5-9 is "Enterprise Domain Controllers"
and not ServerLogon
commit 8ecdb5595728b153ffb6d4527de9f6abd7795a31
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:44:53 2011 +0200
s3:lib remove duplicate entry for "Anonymous Logon"
commit d3870413d10bea9aeca5d0c9d08d19b708070ed2
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:42:45 2011 +0200
s3:lib add S-1-5-17 to well-known SID list
http://support.microsoft.com/kb/243330/en-us says the name is
"This organization", but Windows 2008 says IUSR
Picking the Windows 2008 variant as 'This Organization' would
be duplicate to S-1-5-15
commit 0decdf8ace467f5df939db8291a4516a7dbb019a
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:40:18 2011 +0200
s3:lib add some more well-known sids
add S-1-3-2/Creator Owner Server, S-1-3-3/Creator Group Server and
S-1-3-4/Owner Rights to the well-known SID list
commit 74751446a2a7dc323682d8eee23fddef9d353e16
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:36:25 2011 +0200
s3:lib add new well-known SIDs for BUILTIN
Distributed COM Users, Cryptographic Operators, Event Log Readers
and Certificate Service DCOM Access were missing from the BUILTIN
well-known SID list
commit b43c69bedfc519e4e53d2c9b0ba2693bdaa1d67e
Author: Christian Ambach <ambi at samba.org>
Date: Mon Aug 29 17:34:57 2011 +0200
security.idl add new well-known SIDs
http://support.microsoft.com/kb/243330/en-us lists some new
well-known SIDS in the BUILTIN domain
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/security.idl | 8 ++++++++
source3/lib/util_builtin.c | 8 ++++++++
source3/lib/util_wellknown.c | 7 +++++--
source3/modules/perfcount_test.c | 2 +-
4 files changed, 22 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 5760337..2b6efc5 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -269,6 +269,10 @@ interface security
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";
+ const string SID_BUILTIN_DISTRIBUTED_COM_USERS = "S-1-5-32-562";
+ const string SID_BUILTIN_CRYPTO_OPERATORS = "S-1-5-32-569";
+ const string SID_BUILTIN_EVENT_LOG_READERS = "S-1-5-32-573";
+ const string SID_BUILTIN_CERT_SERV_DCOM_ACCESS = "S-1-5-32-574";
/* SECURITY_NT_SERVICE */
const string NAME_NT_SERVICE = "NT SERVICE";
@@ -316,6 +320,10 @@ interface security
const int BUILTIN_RID_PERFLOG_USERS = 559;
const int BUILTIN_RID_AUTH_ACCESS = 560;
const int BUILTIN_RID_TS_LICENSE_SERVERS = 561;
+ const int BUILTIN_RID_DISTRIBUTED_COM_USERS = 562;
+ const int BUILTIN_RID_CRYPTO_OPERATORS = 569;
+ const int BUILTIN_RID_EVENT_LOG_READERS = 573;
+ const int BUILTIN_RID_CERT_SERV_DCOM_ACCESS = 574;
/********************************************************************
This is a list of privileges reported by a WIndows 2008 R2 DC
diff --git a/source3/lib/util_builtin.c b/source3/lib/util_builtin.c
index b370a76..3aae509 100644
--- a/source3/lib/util_builtin.c
+++ b/source3/lib/util_builtin.c
@@ -52,6 +52,14 @@ static const struct rid_name_map builtin_aliases[] = {
"Windows Authorization Access Group" },
{ BUILTIN_RID_TS_LICENSE_SERVERS,
"Terminal Server License Servers" },
+ { BUILTIN_RID_DISTRIBUTED_COM_USERS,
+ "Distributed COM Users" },
+ { BUILTIN_RID_CRYPTO_OPERATORS,
+ "Cryptographic Operators" },
+ { BUILTIN_RID_EVENT_LOG_READERS,
+ "Event Log Readers" },
+ { BUILTIN_RID_CERT_SERV_DCOM_ACCESS,
+ "Certificate Service DCOM Access" },
{ 0, NULL}};
/*******************************************************************
diff --git a/source3/lib/util_wellknown.c b/source3/lib/util_wellknown.c
index f2f99af..19ac7ce 100644
--- a/source3/lib/util_wellknown.c
+++ b/source3/lib/util_wellknown.c
@@ -42,6 +42,9 @@ static const struct rid_name_map everyone_users[] = {
static const struct rid_name_map creator_owner_users[] = {
{ 0, "Creator Owner" },
{ 1, "Creator Group" },
+ { 2, "Creator Owner Server" },
+ { 3, "Creator Group Server" },
+ { 4, "Owner Rights" },
{ 0, NULL}};
static const struct rid_name_map nt_authority_users[] = {
@@ -50,16 +53,16 @@ static const struct rid_name_map nt_authority_users[] = {
{ 3, "Batch"},
{ 4, "Interactive"},
{ 6, "Service"},
- { 7, "AnonymousLogon"},
{ 7, "Anonymous Logon"},
{ 8, "Proxy"},
- { 9, "ServerLogon"},
+ { 9, "Enterprise Domain Controllers"},
{ 10, "Self"},
{ 11, "Authenticated Users"},
{ 12, "Restricted"},
{ 13, "Terminal Server User"},
{ 14, "Remote Interactive Logon"},
{ 15, "This Organization"},
+ { 17, "IUSR"},
{ 18, "SYSTEM"},
{ 19, "Local Service"},
{ 20, "Network Service"},
diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c
index c0b5336..99904ac 100644
--- a/source3/modules/perfcount_test.c
+++ b/source3/modules/perfcount_test.c
@@ -381,7 +381,7 @@ static struct smb_perfcount_handlers perfcount_test_handlers = {
perfcount_test_end
};
-NTSTATUS perfcount_test_init(void)
+NTSTATUS init_samba_module(void)
{
return smb_register_perfcounter(SMB_PERFCOUNTER_INTERFACE_VERSION,
"pc_test", &perfcount_test_handlers);
--
Samba Shared Repository
More information about the samba-cvs
mailing list