summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-03-11 23:20:26 +0000
committerJeremy Allison <jra@samba.org>1998-03-11 23:20:26 +0000
commite13f143ec6c46a1a540339d0a48940c6312ae8d9 (patch)
tree2f78d9ac3c9229d61b44956beb8cefcd1c95a273
parentfdeea341ed1bae670382e45eb731db1b5838ad21 (diff)
downloadsamba-e13f143ec6c46a1a540339d0a48940c6312ae8d9.tar.gz
samba-e13f143ec6c46a1a540339d0a48940c6312ae8d9.tar.bz2
samba-e13f143ec6c46a1a540339d0a48940c6312ae8d9.zip
Missed fixes in NTDOM branch for doing readX via pipe IPC$.
Allows long share lists to be browsed. Browsing *into* a long share name still fails, though. (Luke - you may need to look into this). Jeremy. (This used to be commit 5299d1b49f2bfd6cf84a687548904206f4a18a41)
-rw-r--r--source3/smbd/reply.c4
-rw-r--r--source3/smbd/server.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 74cfd797c3..1415d95522 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1954,6 +1954,10 @@ int reply_read_and_X(char *inbuf,char *outbuf,int length,int bufsize)
cnum = SVAL(inbuf,smb_tid);
+ /* If it's an IPC, pass off the pipe handler. */
+ if (IS_IPC(cnum))
+ return reply_pipe_read_and_X(inbuf,outbuf,length,bufsize);
+
CHECK_FNUM(fnum,cnum);
CHECK_READ(fnum);
CHECK_ERROR(fnum);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 774e5c10b9..86b76454e4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -4684,7 +4684,7 @@ struct smb_message_struct
{SMBmove,"SMBmove",NULL,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
{SMBopenX,"SMBopenX",reply_open_and_X,AS_USER | CAN_IPC | QUEUE_IN_OPLOCK },
- {SMBreadX,"SMBreadX",reply_read_and_X,AS_USER},
+ {SMBreadX,"SMBreadX",reply_read_and_X,AS_USER | CAN_IPC },
{SMBwriteX,"SMBwriteX",reply_write_and_X,AS_USER},
{SMBlockingX,"SMBlockingX",reply_lockingX,AS_USER},