sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libcli/auth: use unique key_name values in netlogon_creds_cli_context_common()

Browse Source 
Until all callers are fixed to pass the same 'server_computer'
value, we try to calculate a server_netbios_name and use this
as unique identifier for a specific domain controller.

Otherwise winbind would use 'hostname.example.com'
while 'net rpc testjoin' would use 'HOSTNAME',
which leads to 2 records in netlogon_creds_cli.tdb
for the same domain controller.

Once all callers are fixed we can think about reverting this
commit.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-12-13 17:31:45 +01:00
parent 6e6d9f9f12
commit dc96b1ddcc
1 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libcli/auth/netlogon_creds_cli.c
View File

@ -106,23 +106,30 @@ static NTSTATUS netlogon_creds_cli_context_common(
struct netlogon_creds_cli_context **_context) struct netlogon_creds_cli_context **_context)
{ {
struct netlogon_creds_cli_context *context = NULL; struct netlogon_creds_cli_context *context = NULL;
TALLOC_CTX *frame = talloc_stackframe();
char *_key_name = NULL;
char *server_netbios_name = NULL;
char *p = NULL;
*_context = NULL; *_context = NULL;
context = talloc_zero(mem_ctx, struct netlogon_creds_cli_context); context = talloc_zero(mem_ctx, struct netlogon_creds_cli_context);
if (context == NULL) { if (context == NULL) {
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
context->client.computer = talloc_strdup(context, client_computer); context->client.computer = talloc_strdup(context, client_computer);
if (context->client.computer == NULL) { if (context->client.computer == NULL) {
talloc_free(context); TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
context->client.account = talloc_strdup(context, client_account); context->client.account = talloc_strdup(context, client_account);
if (context->client.account == NULL) { if (context->client.account == NULL) {
talloc_free(context); TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
@ -133,29 +140,60 @@ static NTSTATUS netlogon_creds_cli_context_common(
context->server.computer = talloc_strdup(context, server_computer); context->server.computer = talloc_strdup(context, server_computer);
if (context->server.computer == NULL) { if (context->server.computer == NULL) {
talloc_free(context); TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
context->server.netbios_domain = talloc_strdup(context, server_netbios_domain); context->server.netbios_domain = talloc_strdup(context, server_netbios_domain);
if (context->server.netbios_domain == NULL) { if (context->server.netbios_domain == NULL) {
talloc_free(context); TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
context->db.key_name = talloc_asprintf(context, "CLI[%s/%s]/SRV[%s/%s]", /*
client_computer, * TODO:
client_account, * Force the callers to provide a unique
server_computer, * value for server_computer and use this directly.
server_netbios_domain); *
* For now we have to deal with
* "HOSTNAME" vs. "hostname.example.com".
*/
server_netbios_name = talloc_strdup(frame, server_computer);
if (server_netbios_name == NULL) {
TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
}
p = strchr(server_netbios_name, '.');
if (p != NULL) {
p[0] = '\0';
}
_key_name = talloc_asprintf(frame, "CLI[%s/%s]/SRV[%s/%s]",
client_computer,
client_account,
server_netbios_name,
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);
if (context->db.key_name == NULL) { if (context->db.key_name == NULL) {
talloc_free(context); TALLOC_FREE(context);
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
context->db.key_data = string_term_tdb_data(context->db.key_name); context->db.key_data = string_term_tdb_data(context->db.key_name);
*_context = context; *_context = context;
TALLOC_FREE(frame);
return NT_STATUS_OK; return NT_STATUS_OK;
} }