sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-23 11:33:16 +03:00
Code Activity

s3:libsmb: replace cli_initialise[_ex]() by cli_state_create()

Browse Source 
This makes sure cli_state->src_ss and cli_state->dest_ss are always
initialized.

metze
This commit is contained in:
Stefan Metzmacher
2011-07-21 21:47:36 +02:00
parent 04b740d18b
commit ebe258dd40
4 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source3/libsmb/cliconnect.c
View File

@@ -2849,8 +2849,6 @@ NTSTATUS cli_connect_nb(const char *host, struct sockaddr_storage *pss,
int fd = -1;
char *desthost;
char *p;
socklen_t length;
int ret;
desthost = talloc_strdup(talloc_tos(), host);
if (desthost == NULL) {
@@ -2866,34 +2864,14 @@ NTSTATUS cli_connect_nb(const char *host, struct sockaddr_storage *pss,
}
}
cli = cli_initialise_ex(signing_state);
if (cli == NULL) {
goto fail;
}
cli->desthost = talloc_move(cli, &desthost);
status = cli_connect_sock(host, name_type, pss, myname, port, 20, &fd,
&port);
if (!NT_STATUS_IS_OK(status)) {
cli_shutdown(cli);
goto fail;
}
cli->fd = fd;
length = sizeof(cli->src_ss);
ret = getsockname(fd, (struct sockaddr *)(void *)&cli->src_ss,
&length);
if (ret == -1) {
status = map_nt_error_from_unix(errno);
cli_shutdown(cli);
goto fail;
}
length = sizeof(cli->dest_ss);
ret = getpeername(fd, (struct sockaddr *)(void *)&cli->dest_ss,
&length);
if (ret == -1) {
status = map_nt_error_from_unix(errno);
cli_shutdown(cli);
cli = cli_state_create(NULL, fd, desthost, signing_state);
if (cli == NULL) {
goto fail;
}