summaryrefslogtreecommitdiffstats
path: root/source/smbd/groupname.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/smbd/groupname.c')
-rw-r--r--source/smbd/groupname.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/smbd/groupname.c b/source/smbd/groupname.c
index 5147ae4b95e..2c7440d75a7 100644
--- a/source/smbd/groupname.c
+++ b/source/smbd/groupname.c
@@ -1,5 +1,6 @@
/*
- Unix SMB/CIFS implementation.
+ Unix SMB/Netbios implementation.
+ Version 1.9.
Groupname handling
Copyright (C) Jeremy Allison 1998.
@@ -21,6 +22,8 @@
#ifdef USING_GROUPNAME_MAP
#include "includes.h"
+extern DOM_SID global_sam_sid;
+
/**************************************************************************
Groupname map functionality. The code loads a groupname map file and
@@ -119,7 +122,7 @@ void load_groupname_map(void)
DEBUG(10,("load_groupname_map: Read line |%s|\n", s));
- if (!*s || strchr_m("#;",*s))
+ if (!*s || strchr("#;",*s))
continue;
if(!next_token(&s,unixname, "\t\n\r=", sizeof(unixname)))
@@ -159,7 +162,7 @@ Error was %s.\n", unixname, strerror(errno) ));
* It's not a well known name, convert the UNIX gid_t
* to a rid within this domain SID.
*/
- sid_copy(&tmp_sid,get_global_sam_sid());
+ tmp_sid = global_sam_sid;
tmp_sid.sub_auths[tmp_sid.num_auths++] =
pdb_gid_to_group_rid(gid);
}
@@ -227,7 +230,7 @@ void map_gid_to_sid( gid_t gid, DOM_SID *psid)
* If there's no map, convert the UNIX gid_t
* to a rid within this domain SID.
*/
- sid_copy(psid,get_global_sam_sid());
+ *psid = global_sam_sid;
psid->sub_auths[psid->num_auths++] = pdb_gid_to_group_rid(gid);
return;