Finish removal of iconv_convenience in public API's.

[amitay/samba.git] / source4 / libcli / dgram / browse.c

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index 18ab398c796c860131dafe4b722bfa61108c726f..ab831df8ccb96f4991de29a3dceef7cf6d7531a8 100644 (file)
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -26,6 +25,7 @@
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
 
 NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
                                    struct nbt_name *dest_name,
@@ -34,14 +34,15 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
                                    struct nbt_browse_packet *request)
 {
        NTSTATUS status;
+       enum ndr_err_code ndr_err;
        DATA_BLOB blob;
        TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-       status = ndr_push_struct_blob(&blob, tmp_ctx, request, 
+       ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
                                      (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
-       if (!NT_STATUS_IS_OK(status)) {
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                talloc_free(tmp_ctx);
-               return status;
+               return ndr_map_error2ntstatus(ndr_err);
        }
 
        status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE, 
@@ -55,22 +56,24 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
 NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
                                     struct nbt_dgram_packet *request,
                                     const char *mailslot_name,
+                                    const char *my_netbios_name,
                                     struct nbt_browse_packet *reply)
 {
        NTSTATUS status;
+       enum ndr_err_code ndr_err;
        DATA_BLOB blob;
        TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
        struct nbt_name myname;
        struct socket_address *dest;
 
-       status = ndr_push_struct_blob(&blob, tmp_ctx, reply, 
+       ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, reply,
                                      (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
-       if (!NT_STATUS_IS_OK(status)) {
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                talloc_free(tmp_ctx);
-               return status;
+               return ndr_map_error2ntstatus(ndr_err);
        }
 
-       make_nbt_name_client(&myname, lp_netbios_name());
+       make_nbt_name_client(&myname, my_netbios_name);
 
        dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, 
                                           request->src_addr, request->src_port);
@@ -94,16 +97,18 @@ NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot,
                                     struct nbt_browse_packet *pkt)
 {
        DATA_BLOB data = dgram_mailslot_data(dgram);
-       NTSTATUS status;
+       enum ndr_err_code ndr_err;
 
-       status = ndr_pull_struct_blob(&data, mem_ctx, pkt, 
+       ndr_err = ndr_pull_struct_blob(&data, mem_ctx, pkt,
                                      (ndr_pull_flags_fn_t)ndr_pull_nbt_browse_packet);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to parse browse packet of length %d\n", 
-                        (int)data.length));
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("Failed to parse browse packet of length %d: %s\n",
+                        (int)data.length, nt_errstr(status)));
                if (DEBUGLVL(10)) {
                        file_save("browse.dat", data.data, data.length);
                }
+               return status;
        }
-       return status;
+       return NT_STATUS_OK;
 }