diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-02 17:37:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:09 -0500 |
| commit | 6c6fed5e656d64df9c9c12d7909f2c2289208bf7 (patch) | |
| tree | e3a6407fa256f6d94265afe91ac173f6220b298b /source3/smbd/reply.c | |
| parent | d2900ddf1121f777ec8b28620fa93637b58e2a59 (diff) | |
| download | samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.gz samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.bz2 samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.zip | |
r24130: Explicitly pass flags2 to srvstr_push
This is in preparation of the trans2 conversion: srvstr_push should not
look at inbuf directly.
(This used to be commit 5fd7e6a3821bea26d352e3edc23b7a216b1200e5)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index cebb905a9e..4fbf179797 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -715,9 +715,13 @@ int reply_ioctl(connection_struct *conn, return(UNIXERROR(ERRDOS,ERRbadfid)); } SSVAL(p,0,fsp->rap_print_jobid); /* Job number */ - srvstr_push(outbuf, p+2, global_myname(), 15, STR_TERMINATE|STR_ASCII); + srvstr_push(outbuf, SVAL(outbuf, smb_flg2), p+2, + global_myname(), 15, + STR_TERMINATE|STR_ASCII); if (conn) { - srvstr_push(outbuf, p+18, lp_servicename(SNUM(conn)), 13, STR_TERMINATE|STR_ASCII); + srvstr_push(outbuf, SVAL(outbuf, smb_flg2), + p+18, lp_servicename(SNUM(conn)), + 13, STR_TERMINATE|STR_ASCII); } break; } @@ -1909,7 +1913,8 @@ int reply_ctemp(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, thing in the byte section. JRA */ SSVALS(p, 0, -1); /* what is this? not in spec */ #endif - namelen = srvstr_push(outbuf, p, s, -1, STR_ASCII|STR_TERMINATE); + namelen = srvstr_push(outbuf, SVAL(outbuf, smb_flg2), p, s, -1, + STR_ASCII|STR_TERMINATE); p += namelen; outsize = set_message_end(inbuf,outbuf, p); @@ -3903,7 +3908,8 @@ int reply_printqueue(connection_struct *conn, SSVAL(p,5, queue[i].job); SIVAL(p,7,queue[i].size); SCVAL(p,11,0); - srvstr_push(outbuf, p+12, queue[i].fs_user, 16, STR_ASCII); + srvstr_push(outbuf, SVAL(outbuf, smb_flg2), p+12, + queue[i].fs_user, 16, STR_ASCII); p += 28; } |