-/*
+/*
Unix SMB/Netbios implementation.
SMB client library implementation
Copyright (C) Andrew Tridgell 1998
Copyright (C) Richard Sharpe 2000, 2002
Copyright (C) John Terpstra 2000
- Copyright (C) Tom Jansen (Ninja ISD) 2002
+ Copyright (C) Tom Jansen (Ninja ISD) 2002
Copyright (C) Derrell Lipman 2003-2008
Copyright (C) Jeremy Allison 2007, 2008
Copyright (C) SATOH Fumiyasu <fumiyas@osstech.co.jp> 2009.
#include "libsmb/nmblib.h"
#include "../libcli/smb/smbXcli_base.h"
-/*
+/*
* Check a server for being alive and well.
- * returns 0 if the server is in shape. Returns 1 on error
- *
+ * returns 0 if the server is in shape. Returns 1 on error
+ *
* Also useable outside libsmbclient to enable external cache
* to do some checks too.
*/
int
SMBC_check_server(SMBCCTX * context,
- SMBCSRV * server)
+ SMBCSRV * server)
{
if (!cli_state_is_connected(server->cli)) {
return 1;
return 0;
}
-/*
+/*
* Remove a server from the cached server list it's unused.
* On success, 0 is returned. 1 is returned if the server could not be removed.
- *
+ *
* Also useable outside libsmbclient
*/
int
/****************************************************************
* Call the auth_fn with fixed size (fstring) buffers.
***************************************************************/
-void
+static void
SMBC_call_auth_fn(TALLOC_CTX *ctx,
SMBCCTX *context,
const char *server,
* servers in the cache
*/
if (smbc_getFunctionRemoveUnusedServer(context)(context,
- srv)) {
+ srv)) {
/*
* We could not remove the server completely,
* remove it from the cache so we will not get
SMBCCTX *context,
bool connect_if_not_found,
const char *server,
+ uint16_t port,
const char *share,
char **pp_workgroup,
char **pp_username,
NTSTATUS status;
char *newserver, *newshare;
int flags = 0;
+ struct smbXcli_tcon *tcon = NULL;
ZERO_STRUCT(c);
*in_cache = false;
* server...
*/
if (srv &&
- *share != '\0' &&
+ share != NULL && *share != '\0' &&
smbc_getOptionOneSharePerServer(context)) {
/*
flags |= CLI_FULL_CONNECTION_USE_CCACHE;
}
- if (share == NULL || *share == '\0' || is_ipc) {
- /*
- * Try 139 first for IPC$
- */
- status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
+ if (smbc_getOptionUseNTHash(context)) {
+ flags |= CLI_FULL_CONNECTION_USE_NT_HASH;
+ }
+
+ if (port == 0) {
+ if (share == NULL || *share == '\0' || is_ipc) {
+ /*
+ * Try 139 first for IPC$
+ */
+ status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
smbc_getNetbiosName(context),
SMB_SIGNING_DEFAULT, flags, &c);
+ }
}
if (!NT_STATUS_IS_OK(status)) {
/*
* No IPC$ or 139 did not work
*/
- status = cli_connect_nb(server_n, NULL, 0, 0x20,
+ status = cli_connect_nb(server_n, NULL, port, 0x20,
smbc_getNetbiosName(context),
SMB_SIGNING_DEFAULT, flags, &c);
}
cli_set_timeout(c, smbc_getTimeout(context));
- status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE,
- PROTOCOL_NT1);
-
+ status = smbXcli_negprot(c->conn, c->timeout,
+ lp_cli_minprotocol(),
+ lp_cli_maxprotocol());
if (!NT_STATUS_IS_OK(status)) {
cli_shutdown(c);
errno = ETIMEDOUT;
here before trying to connect to the original share.
cli_check_msdfs_proxy() will fail if it is a normal share. */
- if ((smb1cli_conn_capabilities(c->conn) & CAP_DFS) &&
+ if (smbXcli_conn_dfs_supported(c->conn) &&
cli_check_msdfs_proxy(ctx, c, share,
&newserver, &newshare,
/* FIXME: cli_check_msdfs_proxy() does
*pp_workgroup)) {
cli_shutdown(c);
srv = SMBC_server_internal(ctx, context, connect_if_not_found,
- newserver, newshare, pp_workgroup,
+ newserver, port, newshare, pp_workgroup,
pp_username, pp_password, in_cache);
TALLOC_FREE(newserver);
TALLOC_FREE(newshare);
DEBUG(4,(" tconx ok\n"));
+ if (smbXcli_conn_protocol(c->conn) >= PROTOCOL_SMB2_02) {
+ tcon = c->smb2.tcon;
+ } else {
+ tcon = c->smb1.tcon;
+ }
+
/* Determine if this share supports case sensitivity */
if (is_ipc) {
DEBUG(4, ("IPC$ so ignore case sensitivity\n"));
(fs_attrs & FILE_CASE_SENSITIVE_SEARCH
? "True"
: "False")));
- cli_set_case_sensitive(c,
- (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
- ? True
- : False));
+ smbXcli_tcon_set_fs_attributes(tcon, fs_attrs);
}
if (context->internal->smb_encryption_level) {
SMBCCTX *context,
bool connect_if_not_found,
const char *server,
+ uint16_t port,
const char *share,
char **pp_workgroup,
char **pp_username,
bool in_cache = false;
srv = SMBC_server_internal(ctx, context, connect_if_not_found,
- server, share, pp_workgroup,
+ server, port, share, pp_workgroup,
pp_username, pp_password, &in_cache);
if (!srv) {
SMBC_attr_server(TALLOC_CTX *ctx,
SMBCCTX *context,
const char *server,
+ uint16_t port,
const char *share,
char **pp_workgroup,
char **pp_username,
* i.e., a normal share or a referred share from
* 'msdfs proxy' share.
*/
- srv = SMBC_server(ctx, context, true, server, share,
+ srv = SMBC_server(ctx, context, true, server, port, share,
pp_workgroup, pp_username, pp_password);
if (!srv) {
return NULL;
ipc_srv->cli = ipc_cli;
nt_status = cli_rpc_pipe_open_noauth(
- ipc_srv->cli, &ndr_table_lsarpc.syntax_id, &pipe_hnd);
+ ipc_srv->cli, &ndr_table_lsarpc, &pipe_hnd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(1, ("cli_nt_session_open fail!\n"));
errno = ENOTSUP;
if (!NT_STATUS_IS_OK(nt_status)) {
errno = SMBC_errno(context, ipc_srv->cli);
cli_shutdown(ipc_srv->cli);
+ free(ipc_srv);
return NULL;
}