sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3:winbind: Do not use domain's private data to store the ADS_STRUCT

Browse Source 
The ADS_STRUCT is not allocated using talloc and there are many places
casting this pointer directly so use a typed pointer.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15046

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 3cb256439e9ceece26c2de82293c43486543e0cb)
This commit is contained in:
Samuel Cabrero 2022-04-13 11:31:45 +02:00 committed by Jule Anger
parent be6712bd61
commit 12e6a16911
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/winbindd/winbindd.h
View File

@ -44,6 +44,7 @@
#define WB_REPLACE_CHAR '_'
struct winbind_internal_pipes;
struct ads_struct;
struct winbindd_cli_state {
struct winbindd_cli_state *prev, *next; /* Linked list pointers */
@ -161,6 +162,7 @@ struct winbindd_domain {
struct {
struct winbind_internal_pipes *samr_pipes;
struct ads_struct *ads_conn;
} backend_data;
/* A working DC */

10
source3/winbindd/winbindd_ads.c
View File

@ -269,10 +269,10 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
}
DEBUG(10,("ads_cached_connection\n"));
ads_cached_connection_reuse((ADS_STRUCT **)&domain->private_data);
ads_cached_connection_reuse(&domain->backend_data.ads_conn);
if (domain->private_data) {
return (ADS_STRUCT *)domain->private_data;
if (domain->backend_data.ads_conn != NULL) {
return domain->backend_data.ads_conn;
}
/* the machine acct password might have change - fetch it every time */
@ -303,7 +303,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
}
status = ads_cached_connection_connect(
(ADS_STRUCT **)&domain->private_data,
&domain->backend_data.ads_conn,
domain->alt_name,
domain->name, NULL,
password, realm,
@ -322,7 +322,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
return NULL;
}
return (ADS_STRUCT *)domain->private_data;
return domain->backend_data.ads_conn;
}
/* Query display info for a realm. This is the basic user list fn */

3
source3/winbindd/winbindd_ndr.c
View File

@ -147,6 +147,9 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr,
ndr_print_ptr(ndr,
"backend_data.samr_pipes",
r->backend_data.samr_pipes);
ndr_print_ptr(ndr,
"backend_data.ads_conn",
r->backend_data.ads_conn);
ndr_print_string(ndr, "dcname", r->dcname);
ndr_print_sockaddr_storage(ndr, "dcaddr", &r->dcaddr);
ndr_print_time_t(ndr, "last_seq_check", r->last_seq_check);

6
source3/winbindd/winbindd_pam.c
View File

@ -677,7 +677,6 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
fstring name_namespace, name_domain, name_user;
time_t ticket_lifetime = 0;
time_t renewal_until = 0;
ADS_STRUCT *ads;
time_t time_offset = 0;
const char *user_ccache_file;
struct PAC_LOGON_INFO *logon_info = NULL;
@ -716,9 +715,8 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
/* 2nd step:
* get kerberos properties */
if (domain->private_data) {
ads = (ADS_STRUCT *)domain->private_data;
time_offset = ads->auth.time_offset;
if (domain->backend_data.ads_conn != NULL) {
time_offset = domain->backend_data.ads_conn->auth.time_offset;
}