s3:libsmb: get rid of cli_state_remote_name

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

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 570b7ae8495d278e97b7bd00fa0d9e2cc144e3a9..f9a7599bdbb4e05a0d2f4ce956bc8ac20683ce61 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -32,6 +32,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "libcli/security/security.h"
 #include "libsmb/nmblib.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /* 
  * Check a server for being alive and well.
@@ -293,7 +294,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                 if (!cli_state_has_tcon(srv->cli)) {
                         /* Ensure we have accurate auth info */
                        SMBC_call_auth_fn(ctx, context,
-                                         cli_state_remote_name(srv->cli),
+                                         smbXcli_conn_remote_name(srv->cli->conn),
                                          srv->cli->share,
                                           pp_workgroup,
                                           pp_username,
@@ -371,7 +372,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                          */
                         if (srv) {
                                const char *remote_name =
-                                       cli_state_remote_name(srv->cli);
+                                       smbXcli_conn_remote_name(srv->cli->conn);
 
                                srv->dev = (dev_t)(str_checksum(remote_name) ^
                                                    str_checksum(srv->cli->share));
@@ -420,7 +421,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                /*
                 * Try 139 first for IPC$
                 */
-               status = cli_connect_nb(server_n, NULL, 139, 0x20,
+               status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
                                        smbc_getNetbiosName(context),
                                        SMB_SIGNING_DEFAULT, flags, &c);
        }
@@ -697,7 +698,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
        if (!srv) {
                return NULL;
        }
-       server = cli_state_remote_name(srv->cli);
+       server = smbXcli_conn_remote_name(srv->cli->conn);
        share = srv->cli->share;
 
         /*