This commit was manufactured by cvs2svn to create tagsamba-misc-tags/tng/release-alpha-2-5-3

'release-alpha-2-5-3'.

6 files changed, 8 insertions, 514 deletions

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
deleted file mode 100644
index 8012c02a8fc..00000000000
--- a/source/libsmb/clireadwrite.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   client file read/write routines
-   Copyright (C) Andrew Tridgell 1994-1998
-   
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-/****************************************************************************
-issue a single SMBread and don't wait for a reply
-****************************************************************************/
-static void cli_issue_read(struct cli_state *cli, int fnum, off_t offset, 
-			   size_t size, int i)
-{
-	memset(cli->outbuf,'\0',smb_size);
-	memset(cli->inbuf,'\0',smb_size);
-
-	set_message(cli->outbuf,10,0,True);
-		
-	CVAL(cli->outbuf,smb_com) = SMBreadX;
-	SSVAL(cli->outbuf,smb_tid,cli->cnum);
-	cli_setup_packet(cli);
-
-	CVAL(cli->outbuf,smb_vwv0) = 0xFF;
-	SSVAL(cli->outbuf,smb_vwv2,fnum);
-	SIVAL(cli->outbuf,smb_vwv3,offset);
-	SSVAL(cli->outbuf,smb_vwv5,size);
-	SSVAL(cli->outbuf,smb_vwv6,size);
-	SSVAL(cli->outbuf,smb_mid,cli->mid + i);
-
-	cli_send_smb(cli);
-}
-
-/****************************************************************************
-  read from a file
-****************************************************************************/
-size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size)
-{
-	char *p;
-	int total = -1;
-	int issued=0;
-	int received=0;
-/*
- * There is a problem in this code when mpx is more than one.
- * for some reason files can get corrupted when being read.
- * Until we understand this fully I am serializing reads (one
- * read/one reply) for now. JRA.
- */
-#if 0
-	int mpx = MAX(cli->max_mux-1, 1); 
-#else
-	int mpx = 1;
-#endif
-	int block = (cli->max_xmit - (smb_size+32)) & ~1023;
-	int mid;
-	int blocks = (size + (block-1)) / block;
-
-	if (size == 0) return 0;
-
-	while (received < blocks) {
-		int size2;
-
-		while (issued - received < mpx && issued < blocks) {
-			int size1 = MIN(block, size-issued*block);
-			cli_issue_read(cli, fnum, offset+issued*block, size1, issued);
-			issued++;
-		}
-
-		if (!cli_receive_smb(cli)) {
-			return total;
-		}
-
-		received++;
-		mid = SVAL(cli->inbuf, smb_mid) - cli->mid;
-		size2 = SVAL(cli->inbuf, smb_vwv5);
-
-		if (CVAL(cli->inbuf,smb_rcls) != 0) {
-			blocks = MIN(blocks, mid-1);
-			continue;
-		}
-
-		if (size2 <= 0) {
-			blocks = MIN(blocks, mid-1);
-			/* this distinguishes EOF from an error */
-			total = MAX(total, 0);
-			continue;
-		}
-
-		if (size2 > block) {
-			DEBUG(0,("server returned more than we wanted!\n"));
-			return -1;
-		}
-		if (mid >= issued) {
-			DEBUG(0,("invalid mid from server!\n"));
-			return -1;
-		}
-		p = smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_vwv6);
-
-		memcpy(buf+mid*block, p, size2);
-
-		total = MAX(total, mid*block + size2);
-	}
-
-	while (received < issued) {
-		cli_receive_smb(cli);
-		received++;
-	}
-	
-	return total;
-}
-
-
-/****************************************************************************
-issue a single SMBwrite and don't wait for a reply
-****************************************************************************/
-static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint16 mode, char *buf,
-			    size_t size, int i)
-{
-	char *p;
-
-	memset(cli->outbuf,'\0',smb_size);
-	memset(cli->inbuf,'\0',smb_size);
-
-	set_message(cli->outbuf,12,size,True);
-	
-	CVAL(cli->outbuf,smb_com) = SMBwriteX;
-	SSVAL(cli->outbuf,smb_tid,cli->cnum);
-	cli_setup_packet(cli);
-	
-	CVAL(cli->outbuf,smb_vwv0) = 0xFF;
-	SSVAL(cli->outbuf,smb_vwv2,fnum);
-
-	SIVAL(cli->outbuf,smb_vwv3,offset);
-	SIVAL(cli->outbuf,smb_vwv5,IS_BITS_SET_ALL(mode, 0x0008) ? 0xFFFFFFFF : 0);
-	SSVAL(cli->outbuf,smb_vwv7,mode);
-
-	SSVAL(cli->outbuf,smb_vwv8,IS_BITS_SET_ALL(mode, 0x0008) ? size : 0);
-	SSVAL(cli->outbuf,smb_vwv10,size);
-	SSVAL(cli->outbuf,smb_vwv11,
-	      smb_buf(cli->outbuf) - smb_base(cli->outbuf));
-	
-	p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11);
-	memcpy(p, buf, size);
-
-	SSVAL(cli->outbuf,smb_mid,cli->mid + i);
-	
-	show_msg(cli->outbuf);
-	cli_send_smb(cli);
-}
-
-/****************************************************************************
-  write to a file
-  write_mode: 0x0001 disallow write cacheing
-              0x0002 return bytes remaining
-              0x0004 use raw named pipe protocol
-              0x0008 start of message mode named pipe protocol
-****************************************************************************/
-ssize_t cli_write(struct cli_state *cli,
-		  int fnum, uint16 write_mode,
-		  char *buf, off_t offset, size_t size)
-{
-	int bwritten = 0;
-	int issued = 0;
-	int received = 0;
-	int mpx = MAX(cli->max_mux-1, 1);
-	int block = (cli->max_xmit - (smb_size+32)) & ~1023;
-	int blocks = (size + (block-1)) / block;
-
-	while (received < blocks) {
-
-		while ((issued - received < mpx) && (issued < blocks))
-		{
-			int bsent = issued * block;
-			int size1 = MIN(block, size - bsent);
-
-			cli_issue_write(cli, fnum, offset + bsent,
-			                write_mode,
-			                buf + bsent,
-					size1, issued);
-			issued++;
-		}
-
-		if (!cli_receive_smb(cli))
-		{
-			return bwritten;
-		}
-
-		received++;
-
-		if (CVAL(cli->inbuf,smb_rcls) != 0)
-		{
-			break;
-		}
-
-		bwritten += SVAL(cli->inbuf, smb_vwv2);
-	}
-
-	while (received < issued && cli_receive_smb(cli))
-	{
-		received++;
-	}
-	
-	return bwritten;
-}
-
-
-/****************************************************************************
-  write to a file using a SMBwrite and not bypassing 0 byte writes
-****************************************************************************/
-ssize_t cli_smbwrite(struct cli_state *cli,
-		     int fnum, char *buf, off_t offset, size_t size1)
-{
-	char *p;
-	ssize_t total = 0;
-
-	do {
-		size_t size = MIN(size1, cli->max_xmit - 48);
-		
-		memset(cli->outbuf,'\0',smb_size);
-		memset(cli->inbuf,'\0',smb_size);
-
-		set_message(cli->outbuf,5, 3 + size,True);
-
-		CVAL(cli->outbuf,smb_com) = SMBwrite;
-		SSVAL(cli->outbuf,smb_tid,cli->cnum);
-		cli_setup_packet(cli);
-		
-		SSVAL(cli->outbuf,smb_vwv0,fnum);
-		SSVAL(cli->outbuf,smb_vwv1,size);
-		SIVAL(cli->outbuf,smb_vwv2,offset);
-		SSVAL(cli->outbuf,smb_vwv4,0);
-		
-		p = smb_buf(cli->outbuf);
-		*p++ = 1;
-		SSVAL(p, 0, size);
-		memcpy(p+2, buf, size);
-		
-		cli_send_smb(cli);
-		if (!cli_receive_smb(cli)) {
-			return -1;
-		}
-		
-		if (CVAL(cli->inbuf,smb_rcls) != 0) {
-			return -1;
-		}
-
-		size = SVAL(cli->inbuf,smb_vwv0);
-		if (size == 0) break;
-
-		size1 -= size;
-		total += size;
-	} while (size1);
-
-	return total;
-}
-
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
deleted file mode 100644
index 76758a0dd63..00000000000
--- a/source/libsmb/clitrans.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   client transaction calls
-   Copyright (C) Andrew Tridgell 1994-1998
-   
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-
-/****************************************************************************
-  send a SMB trans or trans2 request
-  ****************************************************************************/
-BOOL cli_send_trans(struct cli_state *cli, int trans, 
-		    char *name, int pipe_name_len, 
-		    int fid, int flags,
-		    uint16 *setup, int lsetup, int msetup,
-		    char *param, int lparam, int mparam,
-		    char *data, int ldata, int mdata)
-{
-	int i;
-	int this_ldata,this_lparam;
-	int tot_data=0,tot_param=0;
-	char *outdata,*outparam;
-	char *p;
-
-	this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */
-	this_ldata = MIN(ldata,cli->max_xmit - (500+lsetup*2+this_lparam));
-
-	memset(cli->outbuf,'\0',smb_size);
-	set_message(cli->outbuf,14+lsetup,0,True);
-	CVAL(cli->outbuf,smb_com) = trans;
-	SSVAL(cli->outbuf,smb_tid, cli->cnum);
-	cli_setup_packet(cli);
-
-	outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len+1 : 3);
-	outdata = outparam+this_lparam;
-
-	/* primary request */
-	SSVAL(cli->outbuf,smb_tpscnt,lparam);	/* tpscnt */
-	SSVAL(cli->outbuf,smb_tdscnt,ldata);	/* tdscnt */
-	SSVAL(cli->outbuf,smb_mprcnt,mparam);	/* mprcnt */
-	SSVAL(cli->outbuf,smb_mdrcnt,mdata);	/* mdrcnt */
-	SCVAL(cli->outbuf,smb_msrcnt,msetup);	/* msrcnt */
-	SSVAL(cli->outbuf,smb_flags,flags);	/* flags */
-	SIVAL(cli->outbuf,smb_timeout,0);		/* timeout */
-	SSVAL(cli->outbuf,smb_pscnt,this_lparam);	/* pscnt */
-	SSVAL(cli->outbuf,smb_psoff,smb_offset(outparam,cli->outbuf)); /* psoff */
-	SSVAL(cli->outbuf,smb_dscnt,this_ldata);	/* dscnt */
-	SSVAL(cli->outbuf,smb_dsoff,smb_offset(outdata,cli->outbuf)); /* dsoff */
-	SCVAL(cli->outbuf,smb_suwcnt,lsetup);	/* suwcnt */
-	for (i=0;i<lsetup;i++)		/* setup[] */
-		SSVAL(cli->outbuf,smb_setup+i*2,setup[i]);
-	p = smb_buf(cli->outbuf);
-	if (trans==SMBtrans) {
-		memcpy(p,name, pipe_name_len + 1);  /* name[] */
-	} else {
-		*p++ = 0;  /* put in a null smb_name */
-		*p++ = 'D'; *p++ = ' ';	/* observed in OS/2 */
-	}
-	if (this_lparam)			/* param[] */
-		memcpy(outparam,param,this_lparam);
-	if (this_ldata)			/* data[] */
-		memcpy(outdata,data,this_ldata);
-	set_message(cli->outbuf,14+lsetup,		/* wcnt, bcc */
-		    PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
-
-	show_msg(cli->outbuf);
-	cli_send_smb(cli);
-
-	if (this_ldata < ldata || this_lparam < lparam) {
-		/* receive interim response */
-		if (!cli_receive_smb(cli) || 
-		    CVAL(cli->inbuf,smb_rcls) != 0) {
-			return(False);
-		}      
-
-		tot_data = this_ldata;
-		tot_param = this_lparam;
-		
-		while (tot_data < ldata || tot_param < lparam)  {
-			this_lparam = MIN(lparam-tot_param,cli->max_xmit - 500); /* hack */
-			this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
-
-			set_message(cli->outbuf,trans==SMBtrans?8:9,0,True);
-			CVAL(cli->outbuf,smb_com) = trans==SMBtrans ? SMBtranss : SMBtranss2;
-			
-			outparam = smb_buf(cli->outbuf);
-			outdata = outparam+this_lparam;
-			
-			/* secondary request */
-			SSVAL(cli->outbuf,smb_tpscnt,lparam);	/* tpscnt */
-			SSVAL(cli->outbuf,smb_tdscnt,ldata);	/* tdscnt */
-			SSVAL(cli->outbuf,smb_spscnt,this_lparam);	/* pscnt */
-			SSVAL(cli->outbuf,smb_spsoff,smb_offset(outparam,cli->outbuf)); /* psoff */
-			SSVAL(cli->outbuf,smb_spsdisp,tot_param);	/* psdisp */
-			SSVAL(cli->outbuf,smb_sdscnt,this_ldata);	/* dscnt */
-			SSVAL(cli->outbuf,smb_sdsoff,smb_offset(outdata,cli->outbuf)); /* dsoff */
-			SSVAL(cli->outbuf,smb_sdsdisp,tot_data);	/* dsdisp */
-			if (trans==SMBtrans2)
-				SSVALS(cli->outbuf,smb_sfid,fid);		/* fid */
-			if (this_lparam)			/* param[] */
-				memcpy(outparam,param+tot_param,this_lparam);
-			if (this_ldata)			/* data[] */
-				memcpy(outdata,data+tot_data,this_ldata);
-			set_message(cli->outbuf,trans==SMBtrans?8:9, /* wcnt, bcc */
-				    PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
-			
-			show_msg(cli->outbuf);
-			cli_send_smb(cli);
-			
-			tot_data += this_ldata;
-			tot_param += this_lparam;
-		}
-	}
-
-	return(True);
-}
-
-
-/****************************************************************************
-  receive a SMB trans or trans2 response allocating the necessary memory
-  ****************************************************************************/
-BOOL cli_receive_trans(struct cli_state *cli,int trans,
-                              char **param, int *param_len,
-                              char **data, int *data_len)
-{
-	int total_data=0;
-	int total_param=0;
-	int this_data,this_param;
-	uint8 eclass;
-	uint32 ecode;
-
-	*data_len = *param_len = 0;
-
-	if (!cli_receive_smb(cli))
-		return False;
-
-	show_msg(cli->inbuf);
-	
-	/* sanity check */
-	if (CVAL(cli->inbuf,smb_com) != trans) {
-		DEBUG(0,("Expected %s response, got command 0x%02x\n",
-			 trans==SMBtrans?"SMBtrans":"SMBtrans2", 
-			 CVAL(cli->inbuf,smb_com)));
-		return(False);
-	}
-
-	/*
-	 * An NT RPC pipe call can return ERRDOS, ERRmoredata
-	 * to a trans call. This is not an error and should not
-	 * be treated as such.
-	 */
-
-	if (cli_error(cli, &eclass, &ecode, NULL))
-	{
-        if(cli->nt_pipe_fnum == 0 || !(eclass == ERRDOS && ecode == ERRmoredata))
-			return(False);
-	}
-
-	/* parse out the lengths */
-	total_data = SVAL(cli->inbuf,smb_tdrcnt);
-	total_param = SVAL(cli->inbuf,smb_tprcnt);
-
-	/* allocate it */
-	*data = Realloc(*data,total_data);
-	*param = Realloc(*param,total_param);
-
-	while (1)  {
-		this_data = SVAL(cli->inbuf,smb_drcnt);
-		this_param = SVAL(cli->inbuf,smb_prcnt);
-
-		if (this_data + *data_len > total_data ||
-		    this_param + *param_len > total_param) {
-			DEBUG(1,("Data overflow in cli_receive_trans\n"));
-			return False;
-		}
-
-		if (this_data)
-			memcpy(*data + SVAL(cli->inbuf,smb_drdisp),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_droff),
-			       this_data);
-		if (this_param)
-			memcpy(*param + SVAL(cli->inbuf,smb_prdisp),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_proff),
-			       this_param);
-		*data_len += this_data;
-		*param_len += this_param;
-
-		/* parse out the total lengths again - they can shrink! */
-		total_data = SVAL(cli->inbuf,smb_tdrcnt);
-		total_param = SVAL(cli->inbuf,smb_tprcnt);
-		
-		if (total_data <= *data_len && total_param <= *param_len)
-			break;
-		
-		if (!cli_receive_smb(cli))
-			return False;
-
-		show_msg(cli->inbuf);
-		
-		/* sanity check */
-		if (CVAL(cli->inbuf,smb_com) != trans) {
-			DEBUG(0,("Expected %s response, got command 0x%02x\n",
-				 trans==SMBtrans?"SMBtrans":"SMBtrans2", 
-				 CVAL(cli->inbuf,smb_com)));
-			return(False);
-		}
-		if (cli_error(cli, &eclass, &ecode, NULL))
-		{
-        	if(cli->nt_pipe_fnum == 0 || !(eclass == ERRDOS && ecode == ERRmoredata))
-				return(False);
-		}
-	}
-	
-	return(True);
-}
diff --git a/source/tests/fcntl_lock.c b/source/tests/fcntl_lock.c
index 0362fce8641..32aecb87439 100644
--- a/source/tests/fcntl_lock.c
+++ b/source/tests/fcntl_lock.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	int fd, ret, status=1;
 	pid_t pid;
 
-	if (!(pid=sys_fork())) {
+	if (!(pid=fork())) {
 		sleep(2);
 		fd = open(DATA, O_RDONLY);
 
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 		lock.l_whence = SEEK_SET;
 		lock.l_start = 0;
 		lock.l_len = 4;
-		lock.l_pid = sys_getpid();
+		lock.l_pid = getpid();
 		
 		lock.l_type = F_WRLCK;
 		
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 	lock.l_whence = SEEK_SET;
 	lock.l_start = 0;
 	lock.l_len = 4;
-	lock.l_pid = sys_getpid();
+	lock.l_pid = getpid();
 
 	/* set a 4 byte write lock */
 	fcntl(fd,F_SETLK,&lock);
diff --git a/source/tests/fcntl_lock64.c b/source/tests/fcntl_lock64.c
index 422c71b1ac2..e5ecd88fd04 100644
--- a/source/tests/fcntl_lock64.c
+++ b/source/tests/fcntl_lock64.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
 	int fd, ret, status=1;
 	pid_t pid;
 
-	if (!(pid=sys_fork())) {
+	if (!(pid=fork())) {
 		sleep(2);
 		fd = open64(DATA, O_RDONLY);
 
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 		lock.l_whence = SEEK_SET;
 		lock.l_start = 0;
 		lock.l_len = 4;
-		lock.l_pid = sys_getpid();
+		lock.l_pid = getpid();
 		
 		lock.l_type = F_WRLCK;
 		
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 	lock.l_start = 0x100000000;
 #endif
 	lock.l_len = 4;
-	lock.l_pid = sys_getpid();
+	lock.l_pid = getpid();
 
 	/* set a 4 byte write lock */
 	fcntl(fd,F_SETLK64,&lock);
diff --git a/source/tests/shared_mmap.c b/source/tests/shared_mmap.c
index aad5e2e3397..fcef75d0d61 100644
--- a/source/tests/shared_mmap.c
+++ b/source/tests/shared_mmap.c
@@ -30,7 +30,7 @@ main()
 
 	close(fd);
 
-	if (sys_fork() == 0) {
+	if (fork() == 0) {
 		fd = open(DATA,O_RDWR);
 		if (fd == -1) exit(1);
 
diff --git a/source/tests/sysv_ipc.c b/source/tests/sysv_ipc.c
index 965a7b4e326..9f0e20957a2 100644
--- a/source/tests/sysv_ipc.c
+++ b/source/tests/sysv_ipc.c
@@ -50,7 +50,7 @@ main()
 		if (shmctl(id, IPC_RMID, 0) != 0) exit(1);
 	}
 
-	if (sys_fork() == 0) {
+	if (fork() == 0) {
 		/* uggh - need locking */
 		sleep(2);