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/util_sam_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/util_sam_sid.c')
| -rw-r--r-- | source3/passdb/util_sam_sid.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/passdb/util_sam_sid.c b/source3/passdb/util_sam_sid.c index 60998003f6..0881531db8 100644 --- a/source3/passdb/util_sam_sid.c +++ b/source3/passdb/util_sam_sid.c @@ -22,9 +22,6 @@ #include "includes.h" -extern pstring global_myname; -extern fstring global_myworkgroup; - #define MAX_SID_NAMES 7 typedef struct _known_sid_users { @@ -98,16 +95,16 @@ static void init_sid_name_map (void) /* This is not lp_workgroup() for good reason: it must stay around longer than the lp_*() strings do */ - sid_name_map[i].name = global_myworkgroup; + sid_name_map[i].name = strdup(lp_workgroup()); sid_name_map[i].known_users = NULL; i++; sid_name_map[i].sid = get_global_sam_sid(); - sid_name_map[i].name = global_myname; + sid_name_map[i].name = strdup(global_myname()); sid_name_map[i].known_users = NULL; i++; } else { sid_name_map[i].sid = get_global_sam_sid(); - sid_name_map[i].name = global_myname; + sid_name_map[i].name = strdup(global_myname()); sid_name_map[i].known_users = NULL; i++; } @@ -224,7 +221,7 @@ BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain) } if (nt_domain[0] == 0) { - fstrcpy(nt_domain, global_myname); + fstrcpy(nt_domain, global_myname()); DEBUG(5,("map_domain_name_to_sid: overriding blank name to %s\n", nt_domain)); sid_copy(sid, get_global_sam_sid()); return True; |