diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-04-09 11:46:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:33 -0500 |
| commit | 83e11ba86c2401ece3c845fd10c22b84e6be7811 (patch) | |
| tree | 4441dcc906c860effaadcf6e730245ef10626103 /source3/passdb | |
| parent | 16167208cfb5d8f995126a4af98911240d58e007 (diff) | |
| download | samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.gz samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.bz2 samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.zip | |
r6263: Get rid of generate_wellknown_sids, they are const static and initializable
statically.
Volker
(This used to be commit 3493d9f383567d286e69c0e60c0708ed400a04d9)
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/machine_sid.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 | ||||
| -rw-r--r-- | source3/passdb/util_sam_sid.c | 10 |
3 files changed, 1 insertions, 13 deletions
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c index ae0b16273f..ecc7d291f6 100644 --- a/source3/passdb/machine_sid.c +++ b/source3/passdb/machine_sid.c @@ -86,8 +86,6 @@ static DOM_SID *pdb_generate_sam_sid(void) if(!(sam_sid=SMB_MALLOC_P(DOM_SID))) return NULL; - generate_wellknown_sids(); - switch (lp_server_role()) { case ROLE_DOMAIN_PDC: case ROLE_DOMAIN_BDC: diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 090621666f..3899949058 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -45,8 +45,6 @@ #include "includes.h" -extern DOM_SID global_sid_NULL; - #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/util_sam_sid.c b/source3/passdb/util_sam_sid.c index 1fddfc7925..a9e1921e0d 100644 --- a/source3/passdb/util_sam_sid.c +++ b/source3/passdb/util_sam_sid.c @@ -32,17 +32,11 @@ typedef struct _known_sid_users { static struct sid_name_map_info { - DOM_SID *sid; + const DOM_SID *sid; const char *name; const known_sid_users *known_users; } sid_name_map[MAX_SID_NAMES]; -extern DOM_SID global_sid_Builtin; /* Local well-known domain */ -extern DOM_SID global_sid_World_Domain; /* Everyone domain */ -extern DOM_SID global_sid_Creator_Owner_Domain; /* Creator Owner domain */ -extern DOM_SID global_sid_NT_Authority; /* NT Authority */ - - static BOOL sid_name_map_initialized = False; /* static known_sid_users no_users[] = {{0, 0, NULL}}; */ @@ -99,8 +93,6 @@ static void init_sid_name_map (void) if (sid_name_map_initialized) return; - generate_wellknown_sids(); - if ((lp_security() == SEC_USER) && lp_domain_logons()) { sid_name_map[i].sid = get_global_sam_sid(); /* This is not lp_workgroup() for good reason: |