sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

s3:lib s3:lib move get_global_sam_name to util_names.c

Browse Source 
This doesn't really belong in util_sid.c, and has much more in common
with the other functions in util_names.c

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2010-05-26 11:11:08 +10:00 committed by Stefan Metzmacher
parent 539ef13bfe
commit d266f8fdf1
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -1131,6 +1131,7 @@ bool set_global_myname(const char *myname);
const char *global_myname(void);
bool set_global_myworkgroup(const char *myworkgroup);
const char *lp_workgroup(void);
const char *get_global_sam_name(void);
/* The following definitions come from lib/util.c */
@ -1357,7 +1358,6 @@ bool is_setuid_root(void) ;
const char *sid_type_lookup(uint32 sid_type) ;
NT_USER_TOKEN *get_system_token(void) ;
const char *get_global_sam_name(void) ;
char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid);
char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
char *sid_string_dbg(const struct dom_sid *sid);

13
source3/lib/util_names.c
View File

@ -65,6 +65,19 @@ const char *lp_workgroup(void)
return smb_myworkgroup;
}
/******************************************************************
get the default domain/netbios name to be used when dealing
with our passdb list of accounts
******************************************************************/
const char *get_global_sam_name(void)
{
if (IS_DC) {
return lp_workgroup();
}
return global_myname();
}
void gfree_netbios_names(void)
{
SAFE_FREE( smb_myname );

13
source3/lib/util_sid.c
View File

@ -155,19 +155,6 @@ NT_USER_TOKEN *get_system_token(void)
return &system_token;
}
/******************************************************************
get the default domain/netbios name to be used when dealing
with our passdb list of accounts
******************************************************************/
const char *get_global_sam_name(void)
{
if (IS_DC) {
return lp_workgroup();
}
return global_myname();
}
/*****************************************************************
Convert a SID to an ascii string.
*****************************************************************/