Make cli_negprot return NTSTATUS instead of bool

[samba.git] / source3 / libsmb / libsmb_server.c

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index aeec2553500add9ddeeec13088ba25b176209ab0..f4714346d1d98c0027fc87f8ca7599877e6dc223 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -248,7 +248,7 @@ SMBC_server(TALLOC_CTX *ctx,
         const char *username_used;
        NTSTATUS status;
 
-       zero_addr(&ss);
+       zero_sockaddr(&ss);
        ZERO_STRUCT(c);
 
        if (server[0] == 0) {
@@ -348,7 +348,7 @@ SMBC_server(TALLOC_CTX *ctx,
 
 again:
 
-       zero_addr(&ss);
+       zero_sockaddr(&ss);
 
        /* have to open a new connection */
        if ((c = cli_initialise()) == NULL) {
@@ -433,7 +433,9 @@ again:
 
        DEBUG(4,(" session request ok\n"));
 
-       if (!cli_negprot(c)) {
+       status = cli_negprot(c);
+
+       if (!NT_STATUS_IS_OK(status)) {
                cli_shutdown(c);
                errno = ETIMEDOUT;
                return NULL;
@@ -595,7 +597,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                         flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
                 }
 
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
                                                global_myname(), server,
                                                &ss, 0, "IPC$", "?????",