diff options
| author | Volker Lendecke <vl@samba.org> | 2007-12-29 22:16:31 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-12-29 23:12:51 +0100 |
| commit | a59280792cab616f5b269960ab68bc44ccc1fd38 (patch) | |
| tree | a2770e3303c0ca9e788f05d83663acc0c27fcc65 /source3/smbd | |
| parent | 99bd615a80e8f983d386e260e747db102ec38cf3 (diff) | |
| download | samba-a59280792cab616f5b269960ab68bc44ccc1fd38.tar.gz samba-a59280792cab616f5b269960ab68bc44ccc1fd38.tar.bz2 samba-a59280792cab616f5b269960ab68bc44ccc1fd38.zip | |
Remove tiny code duplication
sid_size did the same as ndr_size_dom_sid
(This used to be commit 8aec5d09ba023413bd8ecbdfbc7d23904df94389)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/nttrans.c | 3 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index cb98a8139c..eb29e65935 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -2174,7 +2174,8 @@ static void call_nt_transact_get_user_quota(connection_struct *conn, for (;((tmp_list!=NULL)&&((qt_len +40+SID_MAX_SIZE)<max_data_count)); tmp_list=tmp_list->next,entry+=entry_len,qt_len+=entry_len) { - sid_len = sid_size(&tmp_list->quotas->sid); + sid_len = ndr_size_dom_sid( + &tmp_list->quotas->sid, 0); entry_len = 40 + sid_len; /* nextoffset entry 4 bytes */ diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index b1f57a9b3e..21bde12056 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2897,8 +2897,8 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned */ for (i = 0, sid_bytes = 0; i < current_user.nt_user_token->num_sids; ++i) { - sid_bytes += - sid_size(¤t_user.nt_user_token->user_sids[i]); + sid_bytes += ndr_size_dom_sid( + ¤t_user.nt_user_token->user_sids[i], 0); } /* SID list byte count */ @@ -2918,8 +2918,8 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned /* SID list */ for (i = 0; i < current_user.nt_user_token->num_sids; ++i) { - int sid_len = - sid_size(¤t_user.nt_user_token->user_sids[i]); + int sid_len = ndr_size_dom_sid( + ¤t_user.nt_user_token->user_sids[i], 0); sid_linearize(pdata + data_len, sid_len, ¤t_user.nt_user_token->user_sids[i]); |