Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
#include "../libcli/security/security.h"
#include "passdb.h"
#include "libsmb/libsmb.h"
#include "../libcli/security/security.h"
#include "passdb.h"
#include "libsmb/libsmb.h"
+#include "../libcli/smb/smbXcli_base.h"
/****************************************************************
****************************************************************/
/****************************************************************
****************************************************************/
create_local_private_krb5_conf_for_domain(
r->out.dns_domain_name, r->out.netbios_domain_name,
create_local_private_krb5_conf_for_domain(
r->out.dns_domain_name, r->out.netbios_domain_name,
- NULL, cli_state_remote_sockaddr(cli),
+ NULL, smbXcli_conn_remote_sockaddr(cli->conn),
cli_state_remote_name(cli));
if (r->out.domain_is_ad && r->in.account_ou &&
cli_state_remote_name(cli));
if (r->out.domain_is_ad && r->in.account_ou &&
-const struct sockaddr_storage *cli_state_local_sockaddr(struct cli_state *cli)
-{
- return smbXcli_conn_local_sockaddr(cli->conn);
-}
-
-const struct sockaddr_storage *cli_state_remote_sockaddr(struct cli_state *cli)
-{
- return smbXcli_conn_remote_sockaddr(cli->conn);
-}
-
const char *cli_state_remote_name(struct cli_state *cli)
{
return smbXcli_conn_remote_name(cli->conn);
const char *cli_state_remote_name(struct cli_state *cli)
{
return smbXcli_conn_remote_name(cli->conn);
bool cli_state_encryption_on(struct cli_state *cli);
void cli_nt_pipes_close(struct cli_state *cli);
void cli_shutdown(struct cli_state *cli);
bool cli_state_encryption_on(struct cli_state *cli);
void cli_nt_pipes_close(struct cli_state *cli);
void cli_shutdown(struct cli_state *cli);
-const struct sockaddr_storage *cli_state_local_sockaddr(struct cli_state *cli);
-const struct sockaddr_storage *cli_state_remote_sockaddr(struct cli_state *cli);
const char *cli_state_remote_name(struct cli_state *cli);
const char *cli_state_remote_realm(struct cli_state *cli);
uint16_t cli_state_get_vc_num(struct cli_state *cli);
const char *cli_state_remote_name(struct cli_state *cli);
const char *cli_state_remote_realm(struct cli_state *cli);
uint16_t cli_state_get_vc_num(struct cli_state *cli);
- print_sockaddr(srv_ip, sizeof(srv_ip), cli_state_remote_sockaddr(cli));
+ print_sockaddr(srv_ip, sizeof(srv_ip), smbXcli_conn_remote_sockaddr(cli->conn));
tcon_share = talloc_asprintf(state, "\\\\%s\\%s",
srv_ip, share);
tcon_share = talloc_asprintf(state, "\\\\%s\\%s",
srv_ip, share);
#include "libsmb/clirap.h"
#include "nsswitch/libwbclient/wbclient.h"
#include "passdb.h"
#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);
static int net_mode_share;
static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask);
/* open share source */
nt_status = connect_to_service(c, &cp_clistate.cli_share_src,
/* 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))
cli_state_remote_name(cli),
info502.name, "A:");
if (!NT_STATUS_IS_OK(nt_status))
#include "secrets.h"
#include "rpc_client/init_lsa.h"
#include "libsmb/libsmb.h"
#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 */
/* Macro for checking RPC error codes to make things more readable */
/* double-check, connection from scratch */
status = net_rpc_join_ok(c, domain, cli_state_remote_name(cli),
/* 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:
retval = NT_STATUS_IS_OK(status) ? 0 : -1;
done:
#include "../libcli/security/security.h"
#include "../libcli/registry/util_reg.h"
#include "libsmb/libsmb.h"
#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[]= {
/* support itanium as well */
static const struct print_architecture_table_node archi_table[]= {
/* open print$-share on the src server */
nt_status = connect_to_service(c, &cli_share_src,
/* 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))
cli_state_remote_name(cli),
"print$", "A:");
if (!NT_STATUS_IS_OK(nt_status))
/* open print$-share on the dst server */
nt_status = connect_to_service(c, &cli_share_dst,
/* 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))
cli_state_remote_name(cli_dst),
"print$", "A:");
if (!NT_STATUS_IS_OK(nt_status))
#include "passdb.h"
#include "messages.h"
#include "auth/gensec/gensec.h"
#include "passdb.h"
#include "messages.h"
#include "auth/gensec/gensec.h"
+#include "../libcli/smb/smbXcli_base.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
}
print_sockaddr(addr, sizeof(addr),
}
print_sockaddr(addr, sizeof(addr),
- cli_state_remote_sockaddr(cli));
+ smbXcli_conn_remote_sockaddr(cli->conn));
key = current_dc_key(talloc_tos(), domain_name);
if (key == NULL) {
key = current_dc_key(talloc_tos(), domain_name);
if (key == NULL) {
}
print_sockaddr(sockaddr, sizeof(sockaddr),
}
print_sockaddr(sockaddr, sizeof(sockaddr),
- cli_state_local_sockaddr(domain->conn.cli));
+ smbXcli_conn_local_sockaddr(domain->conn.cli->conn));
if (strequal(sockaddr, addr)) {
cli_state_disconnect(domain->conn.cli);
if (strequal(sockaddr, addr)) {
cli_state_disconnect(domain->conn.cli);