s3/winbindd: rename canonicalize_username to canonicalize_username_fstr

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index f18a1d25f88310b9dda8999f5e2a372f01a4ee3a..6227171712a5e484a684326253db097cf185573b 100644 (file)
--- 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 a59f33ef631aa02a6bcae1c08da8b36aae5c0ad7..9493eee3cfa2d8d8717d458a7641f4daa8a4e513 100644 (file)
--- 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 45769a19723222defb416bc5325d30c00339b21b..e86f73cf5f3d7e3b617d09a1ac719c475b4c3d91 100644 (file)
--- 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 7a3b1b68343ace44444f43ba3b886561d84327b6..b4c1e62b5b7da20f284b96ba0af992de5890588a 100644 (file)
--- 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 9b10f2c061a53618a1d773fcaa18e2cb6b512b1c..9becd891267e733c2966b47004ddabb9091e7e06 100644 (file)
--- 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 b66adcb9569e2979b3ab7ea012609ad3e7a45a2e..9a6d9cdaa36c2784e74977b239e78ec0cad78a3f 100644 (file)
--- 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)