r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture

tests on this as it's very late NY time (just wanted to get this work
into the tree). I'll test this over the weekend....
Jerry - in looking at the difference between the two trees there
seem to be some printing/ntprinting.c and registry changes we might
want to examine to try keep in sync.
Jeremy.
(This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)

1 files changed, 51 insertions, 38 deletions

diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 6c7faa4c05..951c192e39 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -4,6 +4,7 @@
    Copyright (C) Andrew Tridgell 1992-1998
    Copyright (C) Luke Kenneth Casson Leighton 1996-1998
    Copyright (C) Paul Ashton  1997-1998.
+   Copyright (C) Jeremy Allison 2005.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,11 +34,11 @@
 extern struct pipe_id_info pipe_names[];
 
 /****************************************************************************
-  reply to an open and X on a named pipe
-
-  This code is basically stolen from reply_open_and_X with some
-  wrinkles to handle pipes.
+ Reply to an open and X on a named pipe.
+ This code is basically stolen from reply_open_and_X with some
+ wrinkles to handle pipes.
 ****************************************************************************/
+
 int reply_open_pipe_and_X(connection_struct *conn,
 			  char *inbuf,char *outbuf,int length,int bufsize)
 {
@@ -45,7 +46,6 @@ int reply_open_pipe_and_X(connection_struct *conn,
 	pstring pipe_name;
 	uint16 vuid = SVAL(inbuf, smb_uid);
 	smb_np_struct *p;
-	int smb_ofun = SVAL(inbuf,smb_vwv8);
 	int size=0,fmode=0,mtime=0,rmode=0;
 	int i;
 
@@ -55,23 +55,26 @@ int reply_open_pipe_and_X(connection_struct *conn,
 	/* If the name doesn't start \PIPE\ then this is directed */
 	/* at a mailslot or something we really, really don't understand, */
 	/* not just something we really don't understand. */
-	if ( strncmp(pipe_name,PIPE,PIPELEN) != 0 )
+	if ( strncmp(pipe_name,PIPE,PIPELEN) != 0 ) {
 		return(ERROR_DOS(ERRSRV,ERRaccess));
+	}
 
 	DEBUG(4,("Opening pipe %s.\n", pipe_name));
 
 	/* See if it is one we want to handle. */
-	for( i = 0; pipe_names[i].client_pipe ; i++ )
-		if( strequal(pipe_name,pipe_names[i].client_pipe) )
+	for( i = 0; pipe_names[i].client_pipe ; i++ ) {
+		if( strequal(pipe_name,pipe_names[i].client_pipe)) {
 			break;
+		}
+	}
 
-	if (pipe_names[i].client_pipe == NULL)
+	if (pipe_names[i].client_pipe == NULL) {
 		return(ERROR_BOTH(NT_STATUS_OBJECT_NAME_NOT_FOUND,ERRDOS,ERRbadpipe));
+	}
 
 	/* Strip \PIPE\ off the name. */
 	pstrcpy(fname, pipe_name + PIPELEN);
 
-
 #if 0
 	/*
 	 * Hack for NT printers... JRA.
@@ -83,10 +86,11 @@ int reply_open_pipe_and_X(connection_struct *conn,
 	/* Known pipes arrive with DIR attribs. Remove it so a regular file */
 	/* can be opened and add it in after the open. */
 	DEBUG(3,("Known pipe %s opening.\n",fname));
-	smb_ofun |= FILE_CREATE_IF_NOT_EXIST;
 
 	p = open_rpc_pipe_p(fname, conn, vuid);
-	if (!p) return(ERROR_DOS(ERRSRV,ERRnofids));
+	if (!p) {
+		return(ERROR_DOS(ERRSRV,ERRnofids));
+	}
 
 	/* Prepare the reply */
 	set_message(outbuf,15,0,True);
@@ -111,8 +115,9 @@ int reply_open_pipe_and_X(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a write on a pipe
+ Reply to a write on a pipe.
 ****************************************************************************/
+
 int reply_pipe_write(char *inbuf,char *outbuf,int length,int dum_bufsize)
 {
 	smb_np_struct *p = get_rpc_pipe_p(inbuf,smb_vwv0);
@@ -121,25 +126,27 @@ int reply_pipe_write(char *inbuf,char *outbuf,int length,int dum_bufsize)
 	int outsize;
 	char *data;
 
-	if (!p)
+	if (!p) {
 		return(ERROR_DOS(ERRDOS,ERRbadfid));
+	}
 
 	data = smb_buf(inbuf) + 3;
 
-	if (numtowrite == 0)
+	if (numtowrite == 0) {
 		nwritten = 0;
-	else
+	} else {
 		nwritten = write_to_pipe(p, data, numtowrite);
+	}
 
-	if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0))
+	if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0)) {
 		return (UNIXERROR(ERRDOS,ERRnoaccess));
+	}
   
 	outsize = set_message(outbuf,1,0,True);
 
 	SSVAL(outbuf,smb_vwv0,nwritten);
   
-	DEBUG(3,("write-IPC pnum=%04x nwritten=%d\n",
-		 p->pnum, nwritten));
+	DEBUG(3,("write-IPC pnum=%04x nwritten=%d\n", p->pnum, nwritten));
 
 	return(outsize);
 }
@@ -158,24 +165,25 @@ int reply_pipe_write_and_X(char *inbuf,char *outbuf,int length,int bufsize)
 	int nwritten = -1;
 	int smb_doff = SVAL(inbuf, smb_vwv11);
 	BOOL pipe_start_message_raw = ((SVAL(inbuf, smb_vwv7) & (PIPE_START_MESSAGE|PIPE_RAW_MODE)) ==
-									(PIPE_START_MESSAGE|PIPE_RAW_MODE));
+								(PIPE_START_MESSAGE|PIPE_RAW_MODE));
 	char *data;
 
-	if (!p)
+	if (!p) {
 		return(ERROR_DOS(ERRDOS,ERRbadfid));
+	}
 
 	data = smb_base(inbuf) + smb_doff;
 
-	if (numtowrite == 0)
+	if (numtowrite == 0) {
 		nwritten = 0;
-	else {
+	} else {
 		if(pipe_start_message_raw) {
 			/*
 			 * For the start of a message in named pipe byte mode,
 			 * the first two bytes are a length-of-pdu field. Ignore
-			 * them (we don't trust the client. JRA.
+			 * them (we don't trust the client). JRA.
 			 */
-	        if(numtowrite < 2) {
+	 	       if(numtowrite < 2) {
 				DEBUG(0,("reply_pipe_write_and_X: start of message set and not enough data sent.(%u)\n",
 					(unsigned int)numtowrite ));
 				return (UNIXERROR(ERRDOS,ERRnoaccess));
@@ -183,30 +191,30 @@ int reply_pipe_write_and_X(char *inbuf,char *outbuf,int length,int bufsize)
 
 			data += 2;
 			numtowrite -= 2;
-    	}                        
+		}                        
 		nwritten = write_to_pipe(p, data, numtowrite);
 	}
 
-	if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0))
+	if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0)) {
 		return (UNIXERROR(ERRDOS,ERRnoaccess));
+	}
   
 	set_message(outbuf,6,0,True);
 
 	nwritten = (pipe_start_message_raw ? nwritten + 2 : nwritten);
 	SSVAL(outbuf,smb_vwv2,nwritten);
   
-	DEBUG(3,("writeX-IPC pnum=%04x nwritten=%d\n",
-		 p->pnum, nwritten));
+	DEBUG(3,("writeX-IPC pnum=%04x nwritten=%d\n", p->pnum, nwritten));
 
 	return chain_reply(inbuf,outbuf,length,bufsize);
 }
 
 /****************************************************************************
-  reply to a read and X
-
-  This code is basically stolen from reply_read_and_X with some
-  wrinkles to handle pipes.
+ Reply to a read and X.
+ This code is basically stolen from reply_read_and_X with some
+ wrinkles to handle pipes.
 ****************************************************************************/
+
 int reply_pipe_read_and_X(char *inbuf,char *outbuf,int length,int bufsize)
 {
 	smb_np_struct *p = get_rpc_pipe_p(inbuf,smb_vwv2);
@@ -223,16 +231,18 @@ int reply_pipe_read_and_X(char *inbuf,char *outbuf,int length,int bufsize)
 	uint32 smb_offs = IVAL(inbuf,smb_vwv3);
 #endif
 
-	if (!p)
+	if (!p) {
 		return(ERROR_DOS(ERRDOS,ERRbadfid));
+	}
 
 	set_message(outbuf,12,0,True);
 	data = smb_buf(outbuf);
 
 	nread = read_from_pipe(p, data, smb_maxcnt, &unused);
 
-	if (nread < 0)
+	if (nread < 0) {
 		return(UNIXERROR(ERRDOS,ERRnoaccess));
+	}
   
 	SSVAL(outbuf,smb_vwv5,nread);
 	SSVAL(outbuf,smb_vwv6,smb_offset(data,outbuf));
@@ -247,20 +257,23 @@ int reply_pipe_read_and_X(char *inbuf,char *outbuf,int length,int bufsize)
 }
 
 /****************************************************************************
-  reply to a close
+ Reply to a close.
 ****************************************************************************/
+
 int reply_pipe_close(connection_struct *conn, char *inbuf,char *outbuf)
 {
 	smb_np_struct *p = get_rpc_pipe_p(inbuf,smb_vwv0);
 	int outsize = set_message(outbuf,0,0,True);
 
-	if (!p)
+	if (!p) {
 		return(ERROR_DOS(ERRDOS,ERRbadfid));
+	}
 
 	DEBUG(5,("reply_pipe_close: pnum:%x\n", p->pnum));
 
-	if (!close_rpc_pipe_hnd(p))
+	if (!close_rpc_pipe_hnd(p)) {
 		return ERROR_DOS(ERRDOS,ERRbadfid);
+	}
 
 	return(outsize);
 }