From: Noel Power Date: Sat, 21 Oct 2023 20:35:06 +0000 (+0100) Subject: s3/winbindd: rename parse_domain_user to parse_domain_user_fstr X-Git-Tag: talloc-2.4.2~1168 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87a919082b9981b6dfac1b99f8982c01a19931d5;p=thirdparty%2Fsamba.git s3/winbindd: rename parse_domain_user to parse_domain_user_fstr prepare to port parse_domain_user function to not use fstrings. rename function parse_domain_user (and all callers) to use parse_domain_user_fstr Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c index 1cce11b186d..3bd3cb36b2f 100644 --- a/source3/winbindd/winbindd_ccache_access.c +++ b/source3/winbindd/winbindd_ccache_access.c @@ -253,7 +253,7 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) TALLOC_FREE(name_domain); TALLOC_FREE(name_user); /* Parse domain and username */ - ok = parse_domain_user(state->request->data.ccache_ntlm_auth.user, + ok = parse_domain_user_fstr(state->request->data.ccache_ntlm_auth.user, f_name_namespace, f_name_domain, f_name_user); diff --git a/source3/winbindd/winbindd_getgrnam.c b/source3/winbindd/winbindd_getgrnam.c index 89a1ba83218..f0b4b30d0a2 100644 --- a/source3/winbindd/winbindd_getgrnam.c +++ b/source3/winbindd/winbindd_getgrnam.c @@ -73,7 +73,7 @@ struct tevent_req *winbindd_getgrnam_send(TALLOC_CTX *mem_ctx, /* Parse domain and groupname */ - ok = parse_domain_user(tmp, + ok = parse_domain_user_fstr(tmp, state->name_namespace, state->name_domain, state->name_group); diff --git a/source3/winbindd/winbindd_getgroups.c b/source3/winbindd/winbindd_getgroups.c index c2603cc7026..a5dadd91421 100644 --- a/source3/winbindd/winbindd_getgroups.c +++ b/source3/winbindd/winbindd_getgroups.c @@ -76,7 +76,7 @@ struct tevent_req *winbindd_getgroups_send(TALLOC_CTX *mem_ctx, domuser = mapped_user; } - ok = parse_domain_user(domuser, + ok = parse_domain_user_fstr(domuser, state->namespace, state->domname, state->username); diff --git a/source3/winbindd/winbindd_getpwnam.c b/source3/winbindd/winbindd_getpwnam.c index 6dd0d847595..0147154c8b7 100644 --- a/source3/winbindd/winbindd_getpwnam.c +++ b/source3/winbindd/winbindd_getpwnam.c @@ -72,7 +72,7 @@ struct tevent_req *winbindd_getpwnam_send(TALLOC_CTX *mem_ctx, domuser = mapped_user; } - ok = parse_domain_user(domuser, + ok = parse_domain_user_fstr(domuser, state->namespace, state->domname, state->username); diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 5f06465bc3e..282dcb37bb0 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -790,7 +790,10 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, /* 3rd step: * do kerberos auth and setup ccache as the user */ - ok = parse_domain_user(user, name_namespace, name_domain, name_user); + ok = parse_domain_user_fstr(user, + name_namespace, + name_domain, + name_user); if (!ok) { return NT_STATUS_INVALID_PARAMETER; } @@ -1142,7 +1145,10 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, /* Parse domain and username */ - ok = parse_domain_user(user, name_namespace, name_domain, name_user); + ok = parse_domain_user_fstr(user, + name_namespace, + name_domain, + name_user); if (!ok) { DBG_DEBUG("parse_domain_user failed\n"); result = NT_STATUS_NO_SUCH_USER; @@ -1452,7 +1458,7 @@ static NTSTATUS winbindd_dual_pam_auth_kerberos(struct winbindd_domain *domain, /* Parse domain and username */ - ok = parse_domain_user(user, + ok = parse_domain_user_fstr(user, name_namespace, name_domain, name_user); @@ -2040,7 +2046,10 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon( /* Parse domain and username */ - ok = parse_domain_user(user, name_namespace, name_domain, name_user); + ok = parse_domain_user_fstr(user, + name_namespace, + name_domain, + name_user); if (!ok) { return NT_STATUS_INVALID_PARAMETER; } @@ -2277,7 +2286,7 @@ NTSTATUS _wbint_PamAuth(struct pipes_struct *p, mapped_user = discard_const(r->in.info->username); } - ok = parse_domain_user(mapped_user, + ok = parse_domain_user_fstr(mapped_user, name_namespace, name_domain, name_user); @@ -2956,7 +2965,7 @@ NTSTATUS _wbint_PamAuthChangePassword(struct pipes_struct *p, DBG_NOTICE("[%"PRIu32"]: dual pam chauthtok %s\n", client_pid, r->in.user); - ok = parse_domain_user(r->in.user, + ok = parse_domain_user_fstr(r->in.user, namespace, domain, user); @@ -3260,7 +3269,7 @@ NTSTATUS _wbint_PamAuthCrapChangePassword(struct pipes_struct *p, } else { bool ok; - ok = parse_domain_user(r->in.user, + ok = parse_domain_user_fstr(r->in.user, namespace, domain, user); diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 5446aabd32f..4adc09b667a 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -516,7 +516,7 @@ struct winbindd_domain *find_our_domain(void); struct winbindd_domain *find_default_route_domain(void); struct winbindd_domain *find_lookup_domain_from_sid(const struct dom_sid *sid); struct winbindd_domain *find_lookup_domain_from_name(const char *domain_name); -bool parse_domain_user(const char *domuser, +bool parse_domain_user_fstr(const char *domuser, fstring namespace, fstring domain, fstring user); diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 10e6a3c6958..8592164a045 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -1547,7 +1547,7 @@ static bool assume_domain(const char *domain) } /* Parse a DOMAIN\user or UPN string into a domain, namespace and a user */ -bool parse_domain_user(const char *domuser, +bool parse_domain_user_fstr(const char *domuser, fstring namespace, fstring domain, fstring user) @@ -1611,7 +1611,7 @@ bool canonicalize_username(TALLOC_CTX *mem_ctx, fstrcpy(f_domain, *pdomain); fstrcpy(f_user, *puser); - ok = parse_domain_user(f_username_inout, + ok = parse_domain_user_fstr(f_username_inout, f_namespace, f_domain, f_user); if (!ok) { return False;