diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-21 21:47:36 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-21 22:08:53 +0200 |
| commit | ebe258dd4091c00cf2ca3d6648cf4d60cb682ee1 (patch) | |
| tree | 489e2ef1d71b18fc3647b925087af92bfeb7fe5c /source3/libsmb/cliconnect.c | |
| parent | 04b740d18b5f7868bcded1b1bda504a95082425a (diff) | |
| download | samba-ebe258dd4091c00cf2ca3d6648cf4d60cb682ee1.tar.gz samba-ebe258dd4091c00cf2ca3d6648cf4d60cb682ee1.tar.bz2 samba-ebe258dd4091c00cf2ca3d6648cf4d60cb682ee1.zip | |
s3:libsmb: replace cli_initialise[_ex]() by cli_state_create()
This makes sure cli_state->src_ss and cli_state->dest_ss are always
initialized.
metze
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 5317c192bc..6a7931b786 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -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; } |