diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-17 20:50:07 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-17 20:50:07 +0000 |
| commit | 768761820e8d7481c586c4e0ab4ac7cb36d18c4b (patch) | |
| tree | 675f36b6854bfccca433842e68e0df4b86cda575 /source3/rpc_server | |
| parent | bb5bea4e195eaf5776284c027d667812b7365b56 (diff) | |
| download | samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.tar.gz samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.tar.bz2 samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.zip | |
Added the same open()/fopen()/creat()/mmap() -> sys_XXX calls.
Tidied up some of the mess (no other word for it). Still doesn't
compile cleanly. There are calls with incorrect parameters that
don't seem to be doing the right thing.
This code still needs surgery :-(.
Jeremy.
(This used to be commit 18ff93a9abbf68ee8c59c0af3e57c63e4a015dac)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/srv_sid.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 68c51a860a..7b970d27d2 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -807,12 +807,11 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u, else if (sid_equal(&dom_sid, &usr_sid)) { DOMAIN_GRP *mem_grp = NULL; - BOOL ret; DEBUG(5,("lookup on Domain SID\n")); become_root(True); - ret = getusergroupsnam(sam_pass->smb_name, &mem_grp, &num_rids); + getusergroupsnam(sam_pass->smb_name, &mem_grp, &num_rids); unbecome_root(True); num_rids = MIN(num_rids, MAX_SAM_ENTRIES); @@ -1370,10 +1369,9 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u, if (status == 0x0) { DOMAIN_GRP *mem_grp = NULL; - BOOL ret; become_root(True); - ret = getusergroupsnam(sam_pass->smb_name, &mem_grp, &num_groups); + getusergroupsnam(sam_pass->smb_name, &mem_grp, &num_groups); unbecome_root(True); gids = NULL; diff --git a/source3/rpc_server/srv_sid.c b/source3/rpc_server/srv_sid.c index 29cc1c936c..6428e965f7 100644 --- a/source3/rpc_server/srv_sid.c +++ b/source3/rpc_server/srv_sid.c @@ -69,7 +69,7 @@ DOM_SID global_sid_S_1_3_1; /* Creator group */ DOM_SID global_sid_S_1_3_2; /* Creator owner server */ DOM_SID global_sid_S_1_3_3; /* Creator group server */ -extern pstring global_myworkgroup; +extern fstring global_myworkgroup; /* extern fstring global_member_dom_name; */ static struct sid_name_map_info @@ -254,7 +254,7 @@ BOOL generate_sam_sid(void) pstrcat(sid_file, "MACHINE.SID"); - if ((fd = open(sid_file, O_RDWR | O_CREAT, 0644)) == -1) { + if ((fd = sys_open(sid_file, O_RDWR | O_CREAT, 0644)) == -1) { DEBUG(0,("unable to open or create file %s. Error was %s\n", sid_file, strerror(errno) )); return False; |