diff options
| author | Volker Lendecke <vl@samba.org> | 2017-08-21 11:34:45 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-09-16 08:36:17 +0200 |
| commit | 7f09c0865ea35eb8d5f90264a27ee523e5df0e38 (patch) | |
| tree | 1b5c7dc669cca94d3406d4832e73afa5e625913f /libcli | |
| parent | f08a04c18400371b1951a24c45fcae146bb7ea33 (diff) | |
| download | samba-7f09c0865ea35eb8d5f90264a27ee523e5df0e38.tar.gz | |
netlogon_creds_cli: Simplify netlogon_creds_cli_context_common
IMHO a full talloc_stackframe is overkill for the one allocation that is left
here.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/auth/netlogon_creds_cli.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c index b85a7e03b60..d6e20889b3a 100644 --- a/libcli/auth/netlogon_creds_cli.c +++ b/libcli/auth/netlogon_creds_cli.c @@ -111,7 +111,6 @@ static NTSTATUS netlogon_creds_cli_context_common( struct netlogon_creds_cli_context **_context) { struct netlogon_creds_cli_context *context = NULL; - TALLOC_CTX *frame = talloc_stackframe(); char *_key_name = NULL; size_t server_netbios_name_len; char *p = NULL; @@ -120,21 +119,18 @@ static NTSTATUS netlogon_creds_cli_context_common( context = talloc_zero(mem_ctx, struct netlogon_creds_cli_context); if (context == NULL) { - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->client.computer = talloc_strdup(context, client_computer); if (context->client.computer == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->client.account = talloc_strdup(context, client_account); if (context->client.account == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } @@ -146,21 +142,18 @@ static NTSTATUS netlogon_creds_cli_context_common( context->server.computer = talloc_strdup(context, server_computer); if (context->server.computer == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->server.netbios_domain = talloc_strdup(context, server_netbios_domain); if (context->server.netbios_domain == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->server.dns_domain = talloc_strdup(context, server_dns_domain); if (context->server.dns_domain == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } @@ -180,7 +173,7 @@ static NTSTATUS netlogon_creds_cli_context_common( server_netbios_name_len = strlen(server_computer); } - _key_name = talloc_asprintf(frame, "CLI[%s/%s]/SRV[%.*s/%s]", + _key_name = talloc_asprintf(context, "CLI[%s/%s]/SRV[%.*s/%s]", client_computer, client_account, (int)server_netbios_name_len, @@ -188,21 +181,19 @@ static NTSTATUS netlogon_creds_cli_context_common( server_netbios_domain); if (_key_name == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->db.key_name = talloc_strdup_upper(context, _key_name); + TALLOC_FREE(_key_name); if (context->db.key_name == NULL) { TALLOC_FREE(context); - TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } context->db.key_data = string_term_tdb_data(context->db.key_name); *_context = context; - TALLOC_FREE(frame); return NT_STATUS_OK; } |