s3/winbindd: remove canonicalize_username_fstr
authorNoel Power <noel.power@suse.com>
Sat, 21 Oct 2023 11:41:39 +0000 (12:41 +0100)
committerNoel Power <npower@samba.org>
Tue, 24 Oct 2023 12:43:37 +0000 (12:43 +0000)
not longer any callers to canonicalize_username_fstr so it
can be removed

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
source3/winbindd/winbindd_proto.h
source3/winbindd/winbindd_util.c

index bf96566edc23aea461780a32626c2eec7dd4abf8..5446aabd32f706c141a3c1aa93c47819634cb9f8 100644 (file)
@@ -547,10 +547,6 @@ bool canonicalize_username(TALLOC_CTX *mem_ctx,
                           char **namespace,
                           char **domain,
                           char **user);
-bool canonicalize_username_fstr(fstring username_inout,
-                          fstring namespace,
-                          fstring domain,
-                          fstring user);
 char *fill_domain_username_talloc(TALLOC_CTX *ctx,
                                  const char *domain,
                                  const char *user,
index 4988011199902f1122e844f78f90b82a696353d3..10e6a3c695843532196c448d4b871b7eae053cc4 100644 (file)
@@ -1650,33 +1650,6 @@ fail:
        return false;
 }
 
-
-/* Ensure an incoming username from NSS is fully qualified. Replace the
-   incoming fstring with DOMAIN <separator> user. Returns the same
-   values as parse_domain_user() but also replaces the incoming username.
-   Used to ensure all names are fully qualified within winbindd.
-   Used by the NSS protocols of auth, chauthtok, logoff and ccache_ntlm_auth.
-   The protocol definitions of auth_crap, chng_pswd_auth_crap
-   really should be changed to use this instead of doing things
-   by hand. JRA. */
-
-bool canonicalize_username_fstr(fstring username_inout,
-                          fstring namespace,
-                          fstring domain,
-                          fstring user)
-{
-       bool ok;
-
-       ok = parse_domain_user(username_inout, namespace, domain, user);
-       if (!ok) {
-               return False;
-       }
-       slprintf(username_inout, sizeof(fstring) - 1, "%s%c%s",
-                domain, *lp_winbind_separator(),
-                user);
-       return True;
-}
-
 /*
     Fill DOMAIN\\USERNAME entry accounting 'winbind use default domain' and
     'winbind separator' options.