*/
#include "includes.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "msdfs.h"
+#include "trans2.h"
+#include "libsmb/nmblib.h"
/********************************************************************
Important point.
Return a connection to a server.
********************************************************************/
-static struct cli_state *do_connect(TALLOC_CTX *ctx,
+static NTSTATUS do_connect(TALLOC_CTX *ctx,
const char *server,
const char *share,
const struct user_auth_info *auth_info,
bool force_encrypt,
int max_protocol,
int port,
- int name_type)
+ int name_type,
+ struct cli_state **pcli)
{
struct cli_state *c = NULL;
- struct nmb_name called, calling;
- const char *called_str;
- const char *server_n;
- struct sockaddr_storage ss;
char *servicename;
char *sharename;
char *newserver, *newshare;
/* make a copy so we don't modify the global string 'service' */
servicename = talloc_strdup(ctx,share);
if (!servicename) {
- return NULL;
+ return NT_STATUS_NO_MEMORY;
}
sharename = servicename;
if (*sharename == '\\') {
sharename += 2;
- called_str = sharename;
if (server == NULL) {
server = sharename;
}
sharename = strchr_m(sharename,'\\');
if (!sharename) {
- return NULL;
+ return NT_STATUS_NO_MEMORY;
}
*sharename = 0;
sharename++;
- } else {
- called_str = server;
}
-
- server_n = server;
-
- zero_sockaddr(&ss);
-
- make_nmb_name(&calling, global_myname(), 0x0);
- make_nmb_name(&called , called_str, name_type);
-
- again:
- zero_sockaddr(&ss);
-
- /* have to open a new connection */
- if (!(c=cli_initialise_ex(get_cmdline_auth_info_signing_state(auth_info)))) {
- d_printf("Connection to %s failed\n", server_n);
- if (c) {
- cli_shutdown(c);
- }
- return NULL;
- }
- if (port) {
- cli_set_port(c, port);
+ if (server == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
}
- status = cli_connect(c, server_n, &ss);
+ status = cli_connect_nb(
+ server, NULL, port, name_type, NULL,
+ get_cmdline_auth_info_signing_state(auth_info), &c);
+
if (!NT_STATUS_IS_OK(status)) {
d_printf("Connection to %s failed (Error %s)\n",
- server_n,
+ server,
nt_errstr(status));
- cli_shutdown(c);
- return NULL;
+ return status;
}
if (max_protocol == 0) {
c->use_kerberos = get_cmdline_auth_info_use_kerberos(auth_info);
c->fallback_after_kerberos =
get_cmdline_auth_info_fallback_after_kerberos(auth_info);
-
- if (!cli_session_request(c, &calling, &called)) {
- char *p;
- d_printf("session request to %s failed (%s)\n",
- called.name, cli_errstr(c));
- cli_shutdown(c);
- c = NULL;
- if ((p=strchr_m(called.name, '.'))) {
- *p = 0;
- goto again;
- }
- if (strcmp(called.name, "*SMBSERVER")) {
- make_nmb_name(&called , "*SMBSERVER", 0x20);
- goto again;
- }
- return NULL;
- }
+ c->use_ccache = get_cmdline_auth_info_use_ccache(auth_info);
DEBUG(4,(" session request ok\n"));
d_printf("protocol negotiation failed: %s\n",
nt_errstr(status));
cli_shutdown(c);
- return NULL;
+ return status;
}
username = get_cmdline_auth_info_username(auth_info);
password = get_cmdline_auth_info_password(auth_info);
- if (!NT_STATUS_IS_OK(cli_session_setup(c, username,
- password, strlen(password),
- password, strlen(password),
- lp_workgroup()))) {
+ status = cli_session_setup(c, username,
+ password, strlen(password),
+ password, strlen(password),
+ lp_workgroup());
+ if (!NT_STATUS_IS_OK(status)) {
/* If a password was not supplied then
* try again with a null username. */
if (password[0] || !username[0] ||
get_cmdline_auth_info_use_kerberos(auth_info) ||
- !NT_STATUS_IS_OK(cli_session_setup(c, "",
+ !NT_STATUS_IS_OK(status = cli_session_setup(c, "",
"", 0,
"", 0,
lp_workgroup()))) {
- d_printf("session setup failed: %s\n", cli_errstr(c));
+ d_printf("session setup failed: %s\n",
+ nt_errstr(status));
if (NT_STATUS_V(cli_nt_error(c)) ==
NT_STATUS_V(NT_STATUS_MORE_PROCESSING_REQUIRED))
d_printf("did you forget to run kinit?\n");
cli_shutdown(c);
- return NULL;
+ return status;
}
d_printf("Anonymous login successful\n");
status = cli_init_creds(c, "", lp_workgroup(), "");
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10,("cli_init_creds() failed: %s\n", nt_errstr(status)));
cli_shutdown(c);
- return NULL;
+ return status;
}
if ( show_sessetup ) {
here before trying to connect to the original share.
cli_check_msdfs_proxy() will fail if it is a normal share. */
- if ((c->capabilities & CAP_DFS) &&
+ if ((cli_state_capabilities(c) & CAP_DFS) &&
cli_check_msdfs_proxy(ctx, c, sharename,
&newserver, &newshare,
force_encrypt,
return do_connect(ctx, newserver,
newshare, auth_info, false,
force_encrypt, max_protocol,
- port, name_type);
+ port, name_type, pcli);
}
/* must be a normal share */
if (!NT_STATUS_IS_OK(status)) {
d_printf("tree connect failed: %s\n", nt_errstr(status));
cli_shutdown(c);
- return NULL;
+ return status;
}
if (force_encrypt) {
sharename);
if (!NT_STATUS_IS_OK(status)) {
cli_shutdown(c);
- return NULL;
+ return status;
}
}
DEBUG(4,(" tconx ok\n"));
- return c;
+ *pcli = c;
+ return NT_STATUS_OK;
}
/****************************************************************************
referring_cli == NULL means a new initial connection.
********************************************************************/
-static struct cli_state *cli_cm_connect(TALLOC_CTX *ctx,
- struct cli_state *referring_cli,
- const char *server,
- const char *share,
- const struct user_auth_info *auth_info,
- bool show_hdr,
- bool force_encrypt,
- int max_protocol,
- int port,
- int name_type)
+static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx,
+ struct cli_state *referring_cli,
+ const char *server,
+ const char *share,
+ const struct user_auth_info *auth_info,
+ bool show_hdr,
+ bool force_encrypt,
+ int max_protocol,
+ int port,
+ int name_type,
+ struct cli_state **pcli)
{
struct cli_state *cli;
+ NTSTATUS status;
- cli = do_connect(ctx, server, share,
+ status = do_connect(ctx, server, share,
auth_info,
show_hdr, force_encrypt, max_protocol,
- port, name_type);
+ port, name_type, &cli);
- if (!cli ) {
- return NULL;
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
/* Enter into the list. */
DLIST_ADD_END(referring_cli, cli, struct cli_state *);
}
- if (referring_cli && referring_cli->posix_capabilities) {
+ if (referring_cli && referring_cli->requested_posix_capabilities) {
uint16 major, minor;
uint32 caplow, caphigh;
- if (cli_unix_extensions_version(cli, &major,
- &minor, &caplow, &caphigh)) {
+ status = cli_unix_extensions_version(cli, &major, &minor,
+ &caplow, &caphigh);
+ if (NT_STATUS_IS_OK(status)) {
cli_set_unix_extensions_capabilities(cli,
major, minor,
caplow, caphigh);
}
}
- return cli;
+ *pcli = cli;
+ return NT_STATUS_OK;
}
/********************************************************************
}
/* Search to the start of the list. */
- for (p = cli; p; p = p->prev) {
- if (strequal(server, p->desthost) &&
+ for (p = cli; p; p = DLIST_PREV(p)) {
+ const char *remote_name =
+ cli_state_remote_name(p);
+
+ if (strequal(server, remote_name) &&
strequal(share,p->share)) {
return p;
}
/* Search to the end of the list. */
for (p = cli->next; p; p = p->next) {
- if (strequal(server, p->desthost) &&
+ const char *remote_name =
+ cli_state_remote_name(p);
+
+ if (strequal(server, remote_name) &&
strequal(share,p->share)) {
return p;
}
Open a client connection to a \\server\share.
****************************************************************************/
-struct cli_state *cli_cm_open(TALLOC_CTX *ctx,
+NTSTATUS cli_cm_open(TALLOC_CTX *ctx,
struct cli_state *referring_cli,
const char *server,
const char *share,
bool force_encrypt,
int max_protocol,
int port,
- int name_type)
+ int name_type,
+ struct cli_state **pcli)
{
/* Try to reuse an existing connection in this list. */
struct cli_state *c = cli_cm_find(referring_cli, server, share);
+ NTSTATUS status;
if (c) {
- return c;
+ *pcli = c;
+ return NT_STATUS_OK;
}
if (auth_info == NULL) {
d_printf("cli_cm_open() Unable to open connection [\\%s\\%s] "
"without auth info\n",
server, share );
- return NULL;
+ return NT_STATUS_INVALID_PARAMETER;
}
- return cli_cm_connect(ctx,
+ status = cli_cm_connect(ctx,
referring_cli,
server,
share,
force_encrypt,
max_protocol,
port,
- name_type);
+ name_type,
+ &c);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+ *pcli = c;
+ return NT_STATUS_OK;
}
/****************************************************************************
****************************************************************************/
-void cli_cm_display(const struct cli_state *cli)
+void cli_cm_display(struct cli_state *cli)
{
int i;
for (i=0; cli; cli = cli->next,i++ ) {
d_printf("%d:\tserver=%s, share=%s\n",
- i, cli->desthost, cli->share );
+ i, cli_state_remote_name(cli), cli->share);
}
}
split a dfs path into the server, share name, and extrapath components
**********************************************************************/
-static void split_dfs_path(TALLOC_CTX *ctx,
+static bool split_dfs_path(TALLOC_CTX *ctx,
const char *nodepath,
char **pp_server,
char **pp_share,
path = talloc_strdup(ctx, nodepath);
if (!path) {
- return;
+ goto fail;
}
if ( path[0] != '\\' ) {
- return;
+ goto fail;
}
p = strchr_m( path + 1, '\\' );
if ( !p ) {
- return;
+ goto fail;
}
*p = '\0';
} else {
*pp_extrapath = talloc_strdup(ctx, "");
}
+ if (*pp_extrapath == NULL) {
+ goto fail;
+ }
*pp_share = talloc_strdup(ctx, p);
+ if (*pp_share == NULL) {
+ goto fail;
+ }
+
*pp_server = talloc_strdup(ctx, &path[1]);
+ if (*pp_server == NULL) {
+ goto fail;
+ }
+
+ TALLOC_FREE(path);
+ return true;
+
+fail:
+ TALLOC_FREE(*pp_share);
+ TALLOC_FREE(*pp_extrapath);
+ TALLOC_FREE(path);
+ return false;
}
/****************************************************************************
dir++;
}
- if (cli->posix_capabilities & CIFS_UNIX_POSIX_PATHNAMES_CAP) {
+ if (cli->requested_posix_capabilities & CIFS_UNIX_POSIX_PATHNAMES_CAP) {
path_sep = '/';
}
return talloc_asprintf(ctx, "%c%s%c%s%c%s",
path_sep,
- cli->desthost,
+ cli_state_remote_name(cli),
path_sep,
cli->share,
path_sep,
check for dfs referral
********************************************************************/
-static bool cli_dfs_check_error( struct cli_state *cli, NTSTATUS status )
+static bool cli_dfs_check_error(struct cli_state *cli, NTSTATUS expected,
+ NTSTATUS status)
{
- uint32 flgs2 = SVAL(cli->inbuf,smb_flg2);
-
/* only deal with DS when we negotiated NT_STATUS codes and UNICODE */
- if (!((flgs2&FLAGS2_32_BIT_ERROR_CODES) &&
- (flgs2&FLAGS2_UNICODE_STRINGS)))
+ if (!(cli_state_capabilities(cli) & CAP_UNICODE)) {
return false;
-
- if (NT_STATUS_EQUAL(status, NT_STATUS(IVAL(cli->inbuf,smb_rcls))))
+ }
+ if (!(cli_state_capabilities(cli) & CAP_STATUS32)) {
+ return false;
+ }
+ if (NT_STATUS_EQUAL(status, expected)) {
return true;
-
+ }
return false;
}
Get the dfs referral link.
********************************************************************/
-bool cli_dfs_get_referral(TALLOC_CTX *ctx,
+NTSTATUS cli_dfs_get_referral(TALLOC_CTX *ctx,
struct cli_state *cli,
const char *path,
- CLIENT_DFS_REFERRAL**refs,
+ struct client_dfs_referral **refs,
size_t *num_refs,
size_t *consumed)
{
unsigned int data_len = 0;
unsigned int param_len = 0;
- uint16 setup = TRANSACT2_GET_DFS_REFERRAL;
- char *param = NULL;
- char *rparam=NULL, *rdata=NULL;
+ uint16_t setup[1];
+ uint16_t recv_flags2;
+ uint8_t *param = NULL;
+ uint8_t *rdata = NULL;
char *p;
char *endp;
- size_t pathlen = 2*(strlen(path)+1);
smb_ucs2_t *path_ucs;
char *consumed_path = NULL;
uint16_t consumed_ucs;
uint16 num_referrals;
- CLIENT_DFS_REFERRAL *referrals = NULL;
- bool ret = false;
+ struct client_dfs_referral *referrals = NULL;
+ NTSTATUS status;
+ TALLOC_CTX *frame = talloc_stackframe();
*num_refs = 0;
*refs = NULL;
- param = SMB_MALLOC_ARRAY(char, 2+pathlen+2);
+ SSVAL(setup, 0, TRANSACT2_GET_DFS_REFERRAL);
+
+ param = talloc_array(talloc_tos(), uint8_t, 2);
if (!param) {
+ status = NT_STATUS_NO_MEMORY;
goto out;
}
SSVAL(param, 0, 0x03); /* max referral level */
- p = ¶m[2];
-
- path_ucs = (smb_ucs2_t *)p;
- p += clistr_push(cli, p, path, pathlen, STR_TERMINATE);
- param_len = PTR_DIFF(p, param);
-
- if (!cli_send_trans(cli, SMBtrans2,
- NULL, /* name */
- -1, 0, /* fid, flags */
- &setup, 1, 0, /* setup, length, max */
- param, param_len, 2, /* param, length, max */
- NULL, 0, cli->max_xmit /* data, length, max */
- )) {
- goto out;
- }
- if (!cli_receive_trans(cli, SMBtrans2,
- &rparam, ¶m_len,
- &rdata, &data_len)) {
+ param = trans2_bytes_push_str(param, cli_ucs2(cli),
+ path, strlen(path)+1,
+ NULL);
+ if (!param) {
+ status = NT_STATUS_NO_MEMORY;
goto out;
}
-
- if (data_len < 4) {
+ param_len = talloc_get_size(param);
+ path_ucs = (smb_ucs2_t *)¶m[2];
+
+ status = cli_trans(talloc_tos(), cli, SMBtrans2,
+ NULL, 0xffff, 0, 0,
+ setup, 1, 0,
+ param, param_len, 2,
+ NULL, 0, CLI_BUFFER_SIZE,
+ &recv_flags2,
+ NULL, 0, NULL, /* rsetup */
+ NULL, 0, NULL,
+ &rdata, 4, &data_len);
+ if (!NT_STATUS_IS_OK(status)) {
goto out;
}
- endp = rdata + data_len;
+ endp = (char *)rdata + data_len;
consumed_ucs = SVAL(rdata, 0);
num_referrals = SVAL(rdata, 2);
* to get the number of bytes consumed from
* the incoming path. */
+ errno = 0;
if (pull_string_talloc(talloc_tos(),
NULL,
0,
path_ucs,
consumed_ucs,
STR_UNICODE) == 0) {
+ if (errno != 0) {
+ status = map_nt_error_from_unix(errno);
+ } else {
+ status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+ }
goto out;
}
if (consumed_path == NULL) {
+ status = map_nt_error_from_unix(errno);
goto out;
}
*consumed = strlen(consumed_path);
int i;
uint16 node_offset;
- referrals = TALLOC_ARRAY(ctx, CLIENT_DFS_REFERRAL,
- num_referrals);
+ referrals = talloc_array(ctx, struct client_dfs_referral,
+ num_referrals);
if (!referrals) {
+ status = NT_STATUS_NO_MEMORY;
goto out;
}
/* start at the referrals array */
- p = rdata+8;
+ p = (char *)rdata+8;
for (i=0; i<num_referrals && p < endp; i++) {
if (p + 18 > endp) {
goto out;
referrals[i].ttl = SVAL(p, 10);
if (p + node_offset > endp) {
+ status = NT_STATUS_INVALID_NETWORK_RESPONSE;
goto out;
}
- clistr_pull_talloc(ctx, cli->inbuf,
+ clistr_pull_talloc(referrals,
+ (const char *)rdata,
+ recv_flags2,
&referrals[i].dfspath,
- p+node_offset, -1,
+ p+node_offset,
+ PTR_DIFF(endp, p+node_offset),
STR_TERMINATE|STR_UNICODE);
if (!referrals[i].dfspath) {
+ status = map_nt_error_from_unix(errno);
goto out;
}
p += ref_size;
}
if (i < num_referrals) {
+ status = NT_STATUS_INVALID_NETWORK_RESPONSE;
goto out;
}
}
- ret = true;
-
*num_refs = num_referrals;
*refs = referrals;
out:
- TALLOC_FREE(consumed_path);
- SAFE_FREE(param);
- SAFE_FREE(rdata);
- SAFE_FREE(rparam);
- return ret;
+ TALLOC_FREE(frame);
+ return status;
}
/********************************************************************
********************************************************************/
-bool cli_resolve_path(TALLOC_CTX *ctx,
- const char *mountpt,
- const struct user_auth_info *dfs_auth_info,
- struct cli_state *rootcli,
- const char *path,
- struct cli_state **targetcli,
- char **pp_targetpath)
+NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
+ const char *mountpt,
+ const struct user_auth_info *dfs_auth_info,
+ struct cli_state *rootcli,
+ const char *path,
+ struct cli_state **targetcli,
+ char **pp_targetpath)
{
- CLIENT_DFS_REFERRAL *refs = NULL;
+ struct client_dfs_referral *refs = NULL;
size_t num_refs = 0;
size_t consumed = 0;
struct cli_state *cli_ipc = NULL;
char *ppath = NULL;
SMB_STRUCT_STAT sbuf;
uint32 attributes;
+ NTSTATUS status;
if ( !rootcli || !path || !targetcli ) {
- return false;
+ return NT_STATUS_INVALID_PARAMETER;
}
/* Don't do anything if this is not a DFS root. */
*targetcli = rootcli;
*pp_targetpath = talloc_strdup(ctx, path);
if (!*pp_targetpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
- return true;
+ return NT_STATUS_OK;
}
*targetcli = NULL;
cleanpath = clean_path(ctx, path);
if (!cleanpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
dfs_path = cli_dfs_make_full_path(ctx, rootcli, cleanpath);
if (!dfs_path) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
- if (cli_qpathinfo_basic( rootcli, dfs_path, &sbuf, &attributes)) {
+ status = cli_qpathinfo_basic( rootcli, dfs_path, &sbuf, &attributes);
+ if (NT_STATUS_IS_OK(status)) {
/* This is an ordinary path, just return it. */
*targetcli = rootcli;
*pp_targetpath = talloc_strdup(ctx, path);
if (!*pp_targetpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
goto done;
}
/* Special case where client asked for a path that does not exist */
- if (cli_dfs_check_error(rootcli, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+ if (cli_dfs_check_error(rootcli, NT_STATUS_OBJECT_NAME_NOT_FOUND,
+ status)) {
*targetcli = rootcli;
*pp_targetpath = talloc_strdup(ctx, path);
if (!*pp_targetpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
goto done;
}
/* We got an error, check for DFS referral. */
- if (!cli_dfs_check_error(rootcli, NT_STATUS_PATH_NOT_COVERED)) {
- return false;
+ if (!cli_dfs_check_error(rootcli, NT_STATUS_PATH_NOT_COVERED,
+ status)) {
+ return status;
}
/* Check for the referral. */
- if (!(cli_ipc = cli_cm_open(ctx,
- rootcli,
- rootcli->desthost,
- "IPC$",
- dfs_auth_info,
- false,
- (rootcli->trans_enc_state != NULL),
- rootcli->protocol,
- 0,
- 0x20))) {
- return false;
+ status = cli_cm_open(ctx,
+ rootcli,
+ cli_state_remote_name(rootcli),
+ "IPC$",
+ dfs_auth_info,
+ false,
+ cli_state_encryption_on(rootcli),
+ cli_state_protocol(rootcli),
+ 0,
+ 0x20,
+ &cli_ipc);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
- if (!cli_dfs_get_referral(ctx, cli_ipc, dfs_path, &refs,
- &num_refs, &consumed) || !num_refs) {
- return false;
+ status = cli_dfs_get_referral(ctx, cli_ipc, dfs_path, &refs,
+ &num_refs, &consumed);
+ if (!NT_STATUS_IS_OK(status) || !num_refs) {
+ return status;
}
/* Just store the first referral for now. */
if (!refs[0].dfspath) {
- return false;
+ return NT_STATUS_NOT_FOUND;
}
- split_dfs_path(ctx, refs[0].dfspath, &server, &share, &extrapath );
-
- if (!server || !share) {
- return false;
+ if (!split_dfs_path(ctx, refs[0].dfspath, &server, &share,
+ &extrapath)) {
+ return NT_STATUS_NOT_FOUND;
}
/* Make sure to recreate the original string including any wildcards. */
dfs_path = cli_dfs_make_full_path(ctx, rootcli, path);
if (!dfs_path) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
pathlen = strlen(dfs_path);
consumed = MIN(pathlen, consumed);
*pp_targetpath = talloc_strdup(ctx, &dfs_path[consumed]);
if (!*pp_targetpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
dfs_path[consumed] = '\0';
*/
/* Open the connection to the target server & share */
- if ((*targetcli = cli_cm_open(ctx, rootcli,
- server,
- share,
- dfs_auth_info,
- false,
- (rootcli->trans_enc_state != NULL),
- rootcli->protocol,
- 0,
- 0x20)) == NULL) {
+ status = cli_cm_open(ctx, rootcli,
+ server,
+ share,
+ dfs_auth_info,
+ false,
+ cli_state_encryption_on(rootcli),
+ cli_state_protocol(rootcli),
+ 0,
+ 0x20,
+ targetcli);
+ if (!NT_STATUS_IS_OK(status)) {
d_printf("Unable to follow dfs referral [\\%s\\%s]\n",
server, share );
- return false;
+ return status;
}
if (extrapath && strlen(extrapath) > 0) {
- *pp_targetpath = talloc_asprintf(ctx,
- "%s%s",
- extrapath,
- *pp_targetpath);
+ /* EMC Celerra NAS version 5.6.50 (at least) doesn't appear to */
+ /* put the trailing \ on the path, so to be save we put one in if needed */
+ if (extrapath[strlen(extrapath)-1] != '\\' && **pp_targetpath != '\\') {
+ *pp_targetpath = talloc_asprintf(ctx,
+ "%s\\%s",
+ extrapath,
+ *pp_targetpath);
+ } else {
+ *pp_targetpath = talloc_asprintf(ctx,
+ "%s%s",
+ extrapath,
+ *pp_targetpath);
+ }
if (!*pp_targetpath) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
}
d_printf("cli_resolve_path: "
"dfs_path (%s) not in correct format.\n",
dfs_path );
- return false;
+ return NT_STATUS_NOT_FOUND;
}
ppath++; /* Now pointing at start of server name. */
if ((ppath = strchr_m( dfs_path, '\\' )) == NULL) {
- return false;
+ return NT_STATUS_NOT_FOUND;
}
ppath++; /* Now pointing at start of share name. */
if ((ppath = strchr_m( ppath+1, '\\' )) == NULL) {
- return false;
+ return NT_STATUS_NOT_FOUND;
}
ppath++; /* Now pointing at path component. */
newmount = talloc_asprintf(ctx, "%s\\%s", mountpt, ppath );
if (!newmount) {
- return false;
+ return NT_STATUS_NOT_FOUND;
}
cli_set_mntpoint(*targetcli, newmount);
checking for loops here. */
if (!strequal(*pp_targetpath, "\\") && !strequal(*pp_targetpath, "/")) {
- if (cli_resolve_path(ctx,
- newmount,
- dfs_auth_info,
- *targetcli,
- *pp_targetpath,
- &newcli,
- &newpath)) {
+ status = cli_resolve_path(ctx,
+ newmount,
+ dfs_auth_info,
+ *targetcli,
+ *pp_targetpath,
+ &newcli,
+ &newpath);
+ if (NT_STATUS_IS_OK(status)) {
/*
* When cli_resolve_path returns true here it's always
* returning the complete path in newpath, so we're done
*/
*targetcli = newcli;
*pp_targetpath = newpath;
- return true;
+ return status;
}
}
if ((*targetcli)->dfsroot) {
dfs_path = talloc_strdup(ctx, *pp_targetpath);
if (!dfs_path) {
- return false;
+ return NT_STATUS_NO_MEMORY;
}
*pp_targetpath = cli_dfs_make_full_path(ctx, *targetcli, dfs_path);
+ if (*pp_targetpath == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
}
- return true;
+ return NT_STATUS_OK;
}
/********************************************************************
const char *password,
const char *domain)
{
- CLIENT_DFS_REFERRAL *refs = NULL;
+ struct client_dfs_referral *refs = NULL;
size_t num_refs = 0;
size_t consumed = 0;
char *fullpath = NULL;
bool res;
uint16 cnum;
char *newextrapath = NULL;
+ NTSTATUS status;
+ const char *remote_name;
if (!cli || !sharename) {
return false;
}
- cnum = cli->cnum;
+ remote_name = cli_state_remote_name(cli);
+ cnum = cli_state_get_tid(cli);
/* special case. never check for a referral on the IPC$ share */
/* send a trans2_query_path_info to check for a referral */
- fullpath = talloc_asprintf(ctx, "\\%s\\%s", cli->desthost, sharename );
+ fullpath = talloc_asprintf(ctx, "\\%s\\%s", remote_name, sharename);
if (!fullpath) {
return false;
}
}
if (force_encrypt) {
- NTSTATUS status = cli_cm_force_encryption(cli,
+ status = cli_cm_force_encryption(cli,
username,
password,
lp_workgroup(),
}
}
- res = cli_dfs_get_referral(ctx, cli, fullpath, &refs, &num_refs, &consumed);
+ status = cli_dfs_get_referral(ctx, cli, fullpath, &refs,
+ &num_refs, &consumed);
+ res = NT_STATUS_IS_OK(status);
- if (!cli_tdis(cli)) {
+ status = cli_tdis(cli);
+ if (!NT_STATUS_IS_OK(status)) {
return false;
}
- cli->cnum = cnum;
+ cli_state_set_tid(cli, cnum);
if (!res || !num_refs) {
return false;
return false;
}
- split_dfs_path(ctx, refs[0].dfspath, pp_newserver,
- pp_newshare, &newextrapath );
-
- if ((*pp_newserver == NULL) || (*pp_newshare == NULL)) {
+ if (!split_dfs_path(ctx, refs[0].dfspath, pp_newserver,
+ pp_newshare, &newextrapath)) {
return false;
}
/* check that this is not a self-referral */
- if (strequal(cli->desthost, *pp_newserver) &&
+ if (strequal(remote_name, *pp_newserver) &&
strequal(sharename, *pp_newshare)) {
return false;
}
git.samba.org / metze / samba / wip.git / blobdiff