[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1082-g3a62a17

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  3a62a177ba758b325ab98e9d77d302bc382e0df8 (commit)
       via  25a0084af5978cc11cf4e83a641bc57e0e64eb89 (commit)
      from  7d9d2de39072b3291b95ac3965df0d19f83792b9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 3a62a177ba758b325ab98e9d77d302bc382e0df8
Merge: 25a0084af5978cc11cf4e83a641bc57e0e64eb89 
7d9d2de39072b3291b95ac3965df0d19f83792b9
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Fri Jan 4 13:24:41 2008 -0800

    Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into 
v3-2-test

commit 25a0084af5978cc11cf4e83a641bc57e0e64eb89
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Fri Jan 4 13:24:24 2008 -0800

    Fix the build.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/utils/smbfilter.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c
index fb01e7f..8db9697 100644
--- a/source/utils/smbfilter.c
+++ b/source/utils/smbfilter.c
@@ -169,7 +169,7 @@ static void filter_child(int c, struct sockaddr_storage 
*dest_ss)
                if (num <= 0) continue;
                
                if (c != -1 && FD_ISSET(c, &fds)) {
-                       if (!receive_smb_raw(c, packet, 0, NULL)) {
+                       if (!receive_smb_raw(c, packet, 0, 0, NULL)) {
                                d_printf("client closed connection\n");
                                exit(0);
                        }
@@ -180,7 +180,7 @@ static void filter_child(int c, struct sockaddr_storage 
*dest_ss)
                        }                       
                }
                if (s != -1 && FD_ISSET(s, &fds)) {
-                       if (!receive_smb_raw(s, packet, 0, NULL)) {
+                       if (!receive_smb_raw(s, packet, 0, 0, NULL)) {
                                d_printf("server closed connection\n");
                                exit(0);
                        }


-- 
Samba Shared Repository