[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1642-g902d1d6

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  902d1d6709e47fbc8b538f28cb4364b006c431f8 (commit)
       via  21d126c56a633d2d72ffad08db7331ecc0ee3c0c (commit)
       via  8629a0e1c3da7c2d2b0c1d99224177c54bbae930 (commit)
      from  54ad97bd8364c393de2c9471a4c14ca5b880b318 (commit)

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


- Log -----------------------------------------------------------------
commit 902d1d6709e47fbc8b538f28cb4364b006c431f8
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 24 16:12:42 2008 +0100

    Fix Coverity ID 454

commit 21d126c56a633d2d72ffad08db7331ecc0ee3c0c
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 24 15:57:00 2008 +0100

    Fix Coverity ID 463

commit 8629a0e1c3da7c2d2b0c1d99224177c54bbae930
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Thu Jan 24 15:52:45 2008 +0100

    Fix Coverity ID 465

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

Summary of changes:
 source/client/clitar.c       |    4 +++-
 source/nmbd/nmbd.c           |    9 ++++++++-
 source/nmbd/nmbd_synclists.c |    2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/clitar.c b/source/client/clitar.c
index 816e7b1..04cc987 100644
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -1471,8 +1471,10 @@ int cmd_tar(void)
        }
 
        argl=toktocliplist(&argcl, NULL);
-       if (!tar_parseargs(argcl, argl, buf, 0))
+       if (!tar_parseargs(argcl, argl, buf, 0)) {
+               SAFE_FREE(argl);
                return 1;
+       }
 
        ret = process_tar();
        SAFE_FREE(argl);
diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 344831d..378b6f3 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -676,11 +676,18 @@ static bool open_sockets(bool isdaemon, int port)
                ClientNMB = 0;
        }
 
+       if (ClientNMB == -1) {
+               return false;
+       }
+
        ClientDGRAM = open_socket_in(SOCK_DGRAM, DGRAM_PORT,
                                           3, &ss,
                                           true);
 
-       if (ClientNMB == -1) {
+       if (ClientDGRAM == -1) {
+               if (ClientNMB != 0) {
+                       close(ClientNMB);
+               }
                return false;
        }
 
diff --git a/source/nmbd/nmbd_synclists.c b/source/nmbd/nmbd_synclists.c
index 147df68..5a2f5c4 100644
--- a/source/nmbd/nmbd_synclists.c
+++ b/source/nmbd/nmbd_synclists.c
@@ -81,12 +81,14 @@ static void sync_child(char *name, int nm_type,
        }
 
        if (!cli_set_port(cli, 139)) {
+               cli_shutdown(cli);
                return;
        }
 
        in_addr_to_sockaddr_storage(&ss, ip);
        status = cli_connect(cli, name, &ss);
        if (!NT_STATUS_IS_OK(status)) {
+               cli_shutdown(cli);
                return;
        }
 


-- 
Samba Shared Repository