Rename internal setup functions in order to avoid naming conflicts.

svn path=/trunk/; revision=59068
This commit is contained in:
Eric Kohl 2013-05-23 09:07:12 +00:00
parent d9be0574d8
commit 09bc88e829

View file

@ -24,7 +24,7 @@ SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY};
/* FUNCTIONS ***************************************************************/
static BOOL
SampAddMemberToAlias(HKEY hDomainKey,
SampSetupAddMemberToAlias(HKEY hDomainKey,
ULONG AliasId,
PSID MemberSid)
{
@ -89,7 +89,7 @@ SampAddMemberToAlias(HKEY hDomainKey,
static BOOL
SampCreateAliasAccount(HKEY hDomainKey,
SampSetupCreateAliasAccount(HKEY hDomainKey,
LPCWSTR lpAccountName,
LPCWSTR lpDescription,
ULONG ulRelativeId)
@ -150,7 +150,7 @@ SampCreateAliasAccount(HKEY hDomainKey,
#if 0
static BOOL
SampCreateGroupAccount(HKEY hDomainKey,
SampSetupCreateGroupAccount(HKEY hDomainKey,
LPCWSTR lpAccountName,
ULONG ulRelativeId)
{
@ -161,7 +161,7 @@ SampCreateGroupAccount(HKEY hDomainKey,
static BOOL
SampCreateUserAccount(HKEY hDomainKey,
SampSetupCreateUserAccount(HKEY hDomainKey,
LPCWSTR lpAccountName,
LPCWSTR lpComment,
ULONG ulRelativeId,
@ -354,7 +354,7 @@ SampCreateUserAccount(HKEY hDomainKey,
static BOOL
SampCreateDomain(IN HKEY hDomainsKey,
SampSetupCreateDomain(IN HKEY hDomainsKey,
IN LPCWSTR lpKeyName,
IN LPCWSTR lpDomainName,
IN PSID lpDomainSid,
@ -634,7 +634,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80);
/* Create the Builtin domain */
if (SampCreateDomain(hDomainsKey,
if (SampSetupCreateDomain(hDomainsKey,
L"Builtin",
szName,
pBuiltinSid,
@ -643,7 +643,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey,
SampSetupCreateAliasAccount(hDomainKey,
szName,
szComment,
DOMAIN_ALIAS_RID_ADMINS);
@ -651,7 +651,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey,
SampSetupCreateAliasAccount(hDomainKey,
szName,
szComment,
DOMAIN_ALIAS_RID_USERS);
@ -659,7 +659,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey,
SampSetupCreateAliasAccount(hDomainKey,
szName,
szComment,
DOMAIN_ALIAS_RID_GUESTS);
@ -667,7 +667,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey,
SampSetupCreateAliasAccount(hDomainKey,
szName,
szComment,
DOMAIN_ALIAS_RID_POWER_USERS);
@ -677,7 +677,7 @@ SampInitializeSAM(VOID)
DOMAIN_USER_RID_ADMIN);
if (pSid != NULL)
{
SampAddMemberToAlias(hDomainKey,
SampSetupAddMemberToAlias(hDomainKey,
DOMAIN_ALIAS_RID_ADMINS,
pSid);
@ -689,7 +689,7 @@ SampInitializeSAM(VOID)
}
/* Create the Account domain */
if (SampCreateDomain(hDomainsKey,
if (SampSetupCreateDomain(hDomainsKey,
L"Account",
L"",
AccountDomainInfo->DomainSid,
@ -698,7 +698,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80);
SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256);
SampCreateUserAccount(hDomainKey,
SampSetupCreateUserAccount(hDomainKey,
szName,
szComment,
DOMAIN_USER_RID_ADMIN,
@ -707,7 +707,7 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80);
SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256);
SampCreateUserAccount(hDomainKey,
SampSetupCreateUserAccount(hDomainKey,
szName,
szComment,
DOMAIN_USER_RID_GUEST,