diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-10 15:31:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-10 15:31:05 -0800 |
| commit | 09fcb233a30e65b4b42f36ce38f70ddd0dfc4746 (patch) | |
| tree | e90c0b9bf7112dec10049116eddcbfa8b5e2a8b1 | |
| parent | 8596a1b60996eda7e51bfd30d625d3201881d2af (diff) | |
| download | samba-09fcb233a30e65b4b42f36ce38f70ddd0dfc4746.tar.gz samba-09fcb233a30e65b4b42f36ce38f70ddd0dfc4746.tar.bz2 samba-09fcb233a30e65b4b42f36ce38f70ddd0dfc4746.zip | |
Don't need an fstring here, we can talloc.
Jeremy.
(This used to be commit 3f6cc826378729c9157ea68e7cf5c7b584bbb585)
| -rw-r--r-- | source3/include/smb.h | 2 | ||||
| -rw-r--r-- | source3/smbd/ipc.c | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 763f9555f0..d58c124e6d 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -563,7 +563,7 @@ struct trans_state { uint8 cmd; /* SMBtrans or SMBtrans2 */ - fstring name; /* for trans requests */ + char *name; /* for trans requests */ uint16 call; /* for trans2 and nttrans requests */ bool close_on_completion; diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index eed293d50d..f28016ccb3 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -374,7 +374,7 @@ static void api_fd_reply(connection_struct *conn, uint16 vuid, static void named_pipe(connection_struct *conn, uint16 vuid, struct smb_request *req, - char *name, uint16 *setup, + const char *name, uint16 *setup, char *data, char *params, int suwcnt, int tdscnt,int tpscnt, int msrcnt, int mdrcnt, int mprcnt) @@ -452,7 +452,7 @@ static void handle_trans(connection_struct *conn, struct smb_request *req, reply_nterror(req, NT_STATUS_NOT_SUPPORTED); return; } - + name_offset += strlen("\\PIPE"); /* Win9x weirdness. When talking to a unicode server Win9x @@ -538,12 +538,11 @@ void reply_trans(connection_struct *conn, struct smb_request *req) state->close_on_completion = BITSETW(req->inbuf+smb_vwv5,0); state->one_way = BITSETW(req->inbuf+smb_vwv5,1); - memset(state->name, '\0',sizeof(state->name)); - srvstr_pull_buf(req->inbuf, req->flags2, state->name, - smb_buf(req->inbuf), sizeof(state->name), - STR_TERMINATE); - - if ((dscnt > state->total_data) || (pscnt > state->total_param)) + srvstr_pull_buf_talloc(state, req->inbuf, req->flags2, &state->name, + smb_buf(req->inbuf), STR_TERMINATE); + + if ((dscnt > state->total_data) || (pscnt > state->total_param) || + !state->name) goto bad_param; if (state->total_data) { @@ -557,7 +556,7 @@ void reply_trans(connection_struct *conn, struct smb_request *req) reply_nterror(req, NT_STATUS_NO_MEMORY); END_PROFILE(SMBtrans); return; - } + } /* null-terminate the slack space */ memset(&state->data[state->total_data], 0, 100); if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt)) |