diff options
| author | Jeremy Allison <jra@samba.org> | 2002-11-12 23:15:52 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-11-12 23:15:52 +0000 |
| commit | 250c9801197ea1c949bd94c1c891f81ab118b130 (patch) | |
| tree | 3a0ec79c71a010961d78726e223a70e1bc75c73f /source3/passdb/machine_sid.c | |
| parent | 477025a6f628fd1a8d3bfacd30726e7a41819e50 (diff) | |
| download | samba-250c9801197ea1c949bd94c1c891f81ab118b130.tar.gz samba-250c9801197ea1c949bd94c1c891f81ab118b130.tar.bz2 samba-250c9801197ea1c949bd94c1c891f81ab118b130.zip | |
Removed global_myworkgroup, global_myname, global_myscope. Added liberal
dashes of const. This is a rather large check-in, some things may break.
It does compile though :-).
Jeremy.
(This used to be commit 82b8f749a36b42e22186297482aad2abb04fab8a)
Diffstat (limited to 'source3/passdb/machine_sid.c')
| -rw-r--r-- | source3/passdb/machine_sid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c index e1a1de83a6..071af50877 100644 --- a/source3/passdb/machine_sid.c +++ b/source3/passdb/machine_sid.c @@ -79,7 +79,6 @@ static void generate_random_sid(DOM_SID *sid) static BOOL pdb_generate_sam_sid(void) { char *fname = NULL; - extern pstring global_myname; BOOL is_dc = False; if(global_sam_sid==NULL) @@ -98,7 +97,7 @@ static BOOL pdb_generate_sam_sid(void) break; } - if (secrets_fetch_domain_sid(global_myname, global_sam_sid)) { + if (secrets_fetch_domain_sid(global_myname(), global_sam_sid)) { DOM_SID domain_sid; /* We got our sid. If not a pdc/bdc, we're done. */ @@ -137,7 +136,7 @@ static BOOL pdb_generate_sam_sid(void) if (read_sid_from_file(fname, global_sam_sid)) { /* remember it for future reference and unlink the old MACHINE.SID */ - if (!secrets_store_domain_sid(global_myname, global_sam_sid)) { + if (!secrets_store_domain_sid(global_myname(), global_sam_sid)) { DEBUG(0,("pdb_generate_sam_sid: Failed to store SID from file.\n")); SAFE_FREE(fname); return False; @@ -162,7 +161,7 @@ static BOOL pdb_generate_sam_sid(void) generate one and save it */ generate_random_sid(global_sam_sid); - if (!secrets_store_domain_sid(global_myname, global_sam_sid)) { + if (!secrets_store_domain_sid(global_myname(), global_sam_sid)) { DEBUG(0,("pdb_generate_sam_sid: Failed to store generated machine SID.\n")); return False; } |