diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-10-21 22:36:26 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-10-21 22:36:26 +0000 |
| commit | eadc5b8c6ecdd6892647d391e1976b2c708d1ea0 (patch) | |
| tree | 8aa495516461fd94ddbafcb6a52e0a4825de1ae6 /source3/smbd | |
| parent | 21e107fd42eb953affac28239588458c6c0ee323 (diff) | |
| download | samba-eadc5b8c6ecdd6892647d391e1976b2c708d1ea0.tar.gz samba-eadc5b8c6ecdd6892647d391e1976b2c708d1ea0.tar.bz2 samba-eadc5b8c6ecdd6892647d391e1976b2c708d1ea0.zip | |
domain aliases added a bit better: does local aliases if you query
for sid S-1-5-20 and does (nothing at the moment) if you query for
your own sid.
(This used to be commit da40f26f4b2f7ce286076b4e39dffd76aa2ef8e6)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/groupname.c | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/groupname.c b/source3/smbd/groupname.c index 29236e2ca5..4afa9ece88 100644 --- a/source3/smbd/groupname.c +++ b/source3/smbd/groupname.c @@ -23,7 +23,7 @@ #include "includes.h" extern int DEBUGLEVEL; -extern DOM_SID global_machine_sid; +extern DOM_SID global_sam_sid; /************************************************************************** @@ -164,7 +164,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. */ - tmp_sid = global_machine_sid; + tmp_sid = global_sam_sid; tmp_sid.sub_auths[tmp_sid.num_auths++] = pdb_gid_to_group_rid((gid_t)gptr->gr_gid); } @@ -233,7 +233,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. */ - *psid = global_machine_sid; + *psid = global_sam_sid; psid->sub_auths[psid->num_auths++] = pdb_gid_to_group_rid(gid); return; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 62f2bcea9f..744320887b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -644,8 +644,8 @@ static void usage(char *pname) pstrcpy(global_myworkgroup, lp_workgroup()); - if(!pdb_generate_machine_sid()) { - DEBUG(0,("ERROR: Samba cannot get a machine SID.\n")); + if(!pdb_generate_sam_sid()) { + DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n")); exit(1); } |