3 files changed, 7 insertions, 4 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index ad3f448c5e..3196b4f871 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -43,6 +43,7 @@
 #include "libsmb/clirap.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "passdb.h"
+#include "libcli/smb/smbXcli_base.h"
 
 static int net_mode_share;
 static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask);
@@ -3981,7 +3982,7 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
 
 	        /* open share source */
 		nt_status = connect_to_service(c, &cp_clistate.cli_share_src,
-					       cli_state_remote_sockaddr(cli),
+					       smbXcli_conn_remote_sockaddr(cli->conn),
 					       cli_state_remote_name(cli),
 					       info502.name, "A:");
 		if (!NT_STATUS_IS_OK(nt_status))
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 73ea3e0398..06a01c0608 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -31,6 +31,7 @@
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
 #include "libsmb/libsmb.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 
@@ -513,7 +514,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 
 	/* double-check, connection from scratch */
 	status = net_rpc_join_ok(c, domain, cli_state_remote_name(cli),
-				 cli_state_remote_sockaddr(cli));
+				 smbXcli_conn_remote_sockaddr(cli->conn));
 	retval = NT_STATUS_IS_OK(status) ? 0 : -1;
 
 done:
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 5c2c797b90..7348595c98 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -28,6 +28,7 @@
 #include "../libcli/security/security.h"
 #include "../libcli/registry/util_reg.h"
 #include "libsmb/libsmb.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {
@@ -1914,7 +1915,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 
 	/* open print$-share on the src server */
 	nt_status = connect_to_service(c, &cli_share_src,
-				       cli_state_remote_sockaddr(cli),
+				       smbXcli_conn_remote_sockaddr(cli->conn),
 				       cli_state_remote_name(cli),
 				       "print$", "A:");
 	if (!NT_STATUS_IS_OK(nt_status))
@@ -1925,7 +1926,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 
 	/* open print$-share on the dst server */
 	nt_status = connect_to_service(c, &cli_share_dst,
-				       cli_state_remote_sockaddr(cli_dst),
+				       smbXcli_conn_remote_sockaddr(cli_dst->conn),
 				       cli_state_remote_name(cli_dst),
 				       "print$", "A:");
 	if (!NT_STATUS_IS_OK(nt_status))