From: Noel Power Date: Sat, 21 Oct 2023 10:17:46 +0000 (+0100) Subject: s3/winbindd: rename canonicalize_username to canonicalize_username_fstr X-Git-Tag: talloc-2.4.2~1175 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e1f210b9afbe76a3825cb606e7ef2be4044bcad;p=thirdparty%2Fsamba.git s3/winbindd: rename canonicalize_username to canonicalize_username_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 f18a1d25f88..6227171712a 100644 --- a/source3/winbindd/winbindd_ccache_access.c +++ b/source3/winbindd/winbindd_ccache_access.c @@ -199,7 +199,8 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) /* Parse domain and username */ - ok = canonicalize_username(state->request->data.ccache_ntlm_auth.user, + ok = canonicalize_username_fstr( + state->request->data.ccache_ntlm_auth.user, name_namespace, name_domain, name_user); @@ -328,7 +329,7 @@ bool winbindd_ccache_save(struct winbindd_cli_state *state) /* Parse domain and username */ - ok = canonicalize_username(state->request->data.ccache_save.user, + ok = canonicalize_username_fstr(state->request->data.ccache_save.user, name_namespace, name_domain, name_user); diff --git a/source3/winbindd/winbindd_pam_auth.c b/source3/winbindd/winbindd_pam_auth.c index a59f33ef631..9493eee3cfa 100644 --- a/source3/winbindd/winbindd_pam_auth.c +++ b/source3/winbindd/winbindd_pam_auth.c @@ -118,7 +118,7 @@ struct tevent_req *winbindd_pam_auth_send(TALLOC_CTX *mem_ctx, fstrcpy(request->data.auth.user, mapped); } - ok = canonicalize_username(request->data.auth.user, + ok = canonicalize_username_fstr(request->data.auth.user, state->name_namespace, state->name_domain, state->name_user); diff --git a/source3/winbindd/winbindd_pam_chauthtok.c b/source3/winbindd/winbindd_pam_chauthtok.c index 45769a19723..e86f73cf5f3 100644 --- a/source3/winbindd/winbindd_pam_chauthtok.c +++ b/source3/winbindd/winbindd_pam_chauthtok.c @@ -79,7 +79,7 @@ struct tevent_req *winbindd_pam_chauthtok_send( fstrcpy(request->data.chauthtok.user, mapped_user); } - ok = canonicalize_username(request->data.chauthtok.user, + ok = canonicalize_username_fstr(request->data.chauthtok.user, namespace, domain, user); diff --git a/source3/winbindd/winbindd_pam_logoff.c b/source3/winbindd/winbindd_pam_logoff.c index 7a3b1b68343..b4c1e62b5b7 100644 --- a/source3/winbindd/winbindd_pam_logoff.c +++ b/source3/winbindd/winbindd_pam_logoff.c @@ -63,7 +63,7 @@ struct tevent_req *winbindd_pam_logoff_send(TALLOC_CTX *mem_ctx, goto failed; } - ok = canonicalize_username(request->data.logoff.user, + ok = canonicalize_username_fstr(request->data.logoff.user, name_namespace, name_domain, user); diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 9b10f2c061a..9becd891267 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -520,7 +520,7 @@ bool parse_domain_user(const char *domuser, fstring namespace, fstring domain, fstring user); -bool canonicalize_username(fstring username_inout, +bool canonicalize_username_fstr(fstring username_inout, fstring namespace, fstring domain, fstring user); diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index b66adcb9569..9a6d9cdaa36 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -1599,7 +1599,7 @@ bool parse_domain_user(const char *domuser, really should be changed to use this instead of doing things by hand. JRA. */ -bool canonicalize_username(fstring username_inout, +bool canonicalize_username_fstr(fstring username_inout, fstring namespace, fstring domain, fstring user)