Changeset 135 for branches/samba-3.0/source

Timestamp:

May 29, 2008, 11:30:31 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.30

Location:

branches/samba-3.0/source

Files:

• VERSION (modified) (1 diff)
• client/client.c (modified) (1 diff)
• client/smbctool.c (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib/util_sock.c (modified) (4 diffs)
• libsmb/clientgen.c (modified) (3 diffs)
• smbd/process.c (modified) (1 diff)
• utils/smbfilter.c (modified) (2 diffs)

branches/samba-3.0/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=29
+SAMBA_VERSION_RELEASE=30
 
 ########################################################

branches/samba-3.0/source/client/client.c

@@ -3627 +3627 @@
         */
         if (FD_ISSET(cli->fd,&fds)) {
-                if (!receive_smb(cli->fd,cli->inbuf,0)) {
+                if (!receive_smb(cli->fd,cli->inbuf,cli->bufsize,0)) {
                         DEBUG(0, ("Read from server failed, maybe it closed the "
                                 "connection\n"));

branches/samba-3.0/source/client/smbctool.c

@@ -3305 +3305 @@
         */
         if (FD_ISSET(cli->fd,&fds)) {
-                receive_smb(cli->fd,cli->inbuf,0);
+                receive_smb(cli->fd,cli->inbuf,cli->bufsize,0);
                 goto again;
         }

branches/samba-3.0/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 0
-#define SAMBA_VERSION_RELEASE 29
-#define SAMBA_VERSION_OFFICIAL_STRING "3.0.29"
+#define SAMBA_VERSION_RELEASE 30
+#define SAMBA_VERSION_OFFICIAL_STRING "3.0.30"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.0/source/lib/util_sock.c

@@ -697 +697 @@
 
 /****************************************************************************
- Read an smb from a fd. Note that the buffer *MUST* be of size
- BUFFER_SIZE+SAFETY_MARGIN.
+ Read an smb from a fd. 
  The timeout is in milliseconds. 
  This function will return on receipt of a session keepalive packet.
@@ -704 +703 @@
 ****************************************************************************/
 
-BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
+BOOL receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout)
 {
         ssize_t len,ret;
@@ -725 +724 @@
         }
 
-        /*
-         * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
-         * of header. Don't print the error if this fits.... JRA.
-         */
-
-        if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
+        if (len > buflen) {
                 DEBUG(0,("Invalid packet length! (%lu bytes).\n",(unsigned long)len));
-                if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-
-                        /*
-                         * Correct fix. smb_read_error may have already been
-                         * set. Only set it here if not already set. Global
-                         * variables still suck :-). JRA.
-                         */
-
-                        if (smb_read_error == 0)
-                                smb_read_error = READ_ERROR;
-                        return False;
-                }
+
+                /*
+                 * smb_read_error may have already been
+                 * set. Only set it here if not already set. Global
+                 * variables still suck :-). JRA.
+                 */
+
+                if (smb_read_error == 0)
+                        smb_read_error = READ_ERROR;
+                return False;
         }
 
@@ -773 +765 @@
 ****************************************************************************/
 
-BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
-{
-        if (!receive_smb_raw(fd, buffer, timeout)) {
+BOOL receive_smb(int fd, char *buffer, size_t buflen, unsigned int timeout)
+{
+        if (!receive_smb_raw(fd, buffer, buflen, timeout)) {
                 return False;
         }

branches/samba-3.0/source/libsmb/clientgen.c

@@ -45 +45 @@
 
 /****************************************************************************
- Read an smb from a fd ignoring all keepalive packets. Note that the buffer 
- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
+ Read an smb from a fd ignoring all keepalive packets.
  The timeout is in milliseconds
 
@@ -55 +54 @@
 ****************************************************************************/
 
-static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout)
+static BOOL client_receive_smb(int fd,char *buffer, size_t bufsize, unsigned int timeout)
 {
         BOOL ret;
 
         for(;;) {
-                ret = receive_smb_raw(fd, buffer, timeout);
+                ret = receive_smb_raw(fd, buffer, bufsize, timeout);
 
                 if (!ret) {
@@ -89 +88 @@
 
  again:
-        ret = client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
+        ret = client_receive_smb(cli->fd,cli->inbuf, cli->bufsize, cli->timeout);
         
         if (ret) {

branches/samba-3.0/source/smbd/process.c

@@ -522 +522 @@
         }
 
-        return receive_smb(smbd_server_fd(), buffer, 0);
+        return receive_smb(smbd_server_fd(), buffer,
+                        BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE, 0);
 }
 

branches/samba-3.0/source/utils/smbfilter.c

@@ -141 +141 @@
                 
                 if (c != -1 && FD_ISSET(c, &fds)) {
-                        if (!receive_smb(c, packet, 0)) {
+                        if (!receive_smb(c, packet, BUFFER_SIZE, 0)) {
                                 d_printf("client closed connection\n");
                                 exit(0);
@@ -152 +152 @@
                 }
                 if (s != -1 && FD_ISSET(s, &fds)) {
-                        if (!receive_smb(s, packet, 0)) {
+                        if (!receive_smb(s, packet, BUFFER_SIZE, 0)) {
                                 d_printf("server closed connection\n");
                                 exit(0);