[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-1000-g87d8a63

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  87d8a63ce4e6dd91ea3193d0a2574520a5857be2 (commit)
       via  36740f4959194cfaa98b1e37eed08f22edbda1e4 (commit)
       via  7a57c2da1a6cc0fcea0b4d949c696219f1822694 (commit)
      from  825f78d9f12b5b3e835bd91961e00402cab0bf60 (commit)

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


- Log -----------------------------------------------------------------
commit 87d8a63ce4e6dd91ea3193d0a2574520a5857be2
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sat Apr 19 16:56:44 2008 +0200

    Fix bug 5400
    
    Thanks to Jason Mader!
    
    Volker

commit 36740f4959194cfaa98b1e37eed08f22edbda1e4
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sat Apr 19 16:54:26 2008 +0200

    Fix bug 5399
    
    Thanks to Jason Mader!
    
    Volker

commit 7a57c2da1a6cc0fcea0b4d949c696219f1822694
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Sat Apr 19 13:08:14 2008 +0200

    Fix bug 5398
    
    Thanks to Jason Mader for sending the compiler output :-)
    
    Volker

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

Summary of changes:
 source/lib/talloc/talloc.c   |    4 ++--
 source/libsmb/clireadwrite.c |    5 -----
 source/smbd/chgpasswd.c      |    6 +++---
 3 files changed, 5 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c
index 9dcd8a2..d535c3d 100644
--- a/source/lib/talloc/talloc.c
+++ b/source/lib/talloc/talloc.c
@@ -85,8 +85,8 @@
 #define likely(x)   __builtin_expect(!!(x), 1)
 #define unlikely(x) __builtin_expect(!!(x), 0)
 #else
-#define likely(x) x
-#define unlikely(x) x
+#define likely(x) (x)
+#define unlikely(x) (x)
 #endif
 
 /* this null_context is only used if talloc_enable_leak_report() or
diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index e79fd90..12ba4b7 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -150,11 +150,6 @@ NTSTATUS cli_read_andx_recv(struct async_req *req, ssize_t 
*received,
                return NT_STATUS_UNEXPECTED_IO_ERROR;
        }
 
-       if (size < 0) {
-               DEBUG(5,("read return < 0!\n"));
-               return NT_STATUS_UNEXPECTED_IO_ERROR;
-       }
-
        *rcvbuf = (uint8_t *)
                (smb_base(cli_req->inbuf) + SVAL(cli_req->inbuf, smb_vwv6));
        *received = size;
diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index b2b0823..2596e73 100644
--- a/source/smbd/chgpasswd.c
+++ b/source/smbd/chgpasswd.c
@@ -249,6 +249,7 @@ static int expect(int master, char *issue, char *expected)
        bool match = False;
 
        for (attempts = 0; attempts < 2; attempts++) {
+               NTSTATUS status;
                if (!strequal(issue, ".")) {
                        if (lp_passwd_chat_debug())
                                DEBUG(100, ("expect: sending [%s]\n", issue));
@@ -269,7 +270,6 @@ static int expect(int master, char *issue, char *expected)
                buffer[nread] = 0;
 
                while (True) {
-                       NTSTATUS status;
                        status = read_socket_with_timeout(
                                master, buffer + nread, 1,
                                sizeof(buffer) - nread - 1,
@@ -305,8 +305,8 @@ static int expect(int master, char *issue, char *expected)
                if (match)
                        break;
 
-               if (len < 0) {
-                       DEBUG(2, ("expect: %s\n", strerror(errno)));
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(2, ("expect: %s\n", nt_errstr(status)));
                        return False;
                }
        }


-- 
Samba Shared Repository