summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-26 11:11:08 +1000
committerStefan Metzmacher <metze@samba.org>2010-05-28 18:08:28 +0200
commitd266f8fdf17e5583d419c2b4bd9daf30acebfd6b (patch)
tree2df42ca769a29f5d8bdc79aa0b1763511967c475 /source3
parent539ef13bfe950c7c512a4bdafd9a846c04ba5be4 (diff)
downloadsamba-d266f8fdf17e5583d419c2b4bd9daf30acebfd6b.tar.gz
samba-d266f8fdf17e5583d419c2b4bd9daf30acebfd6b.tar.bz2
samba-d266f8fdf17e5583d419c2b4bd9daf30acebfd6b.zip
s3:lib s3:lib move get_global_sam_name to util_names.c
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>
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/lib/util_names.c13
-rw-r--r--source3/lib/util_sid.c13
3 files changed, 14 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 934697eda4..b018a452cc 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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);
diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c
index 1ad9cd317c..bd6e5c1202 100644
--- a/source3/lib/util_names.c
+++ b/source3/lib/util_names.c
@@ -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 );
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 4cc7bb401c..2a77be77dd 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -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.
*****************************************************************/