]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:/winbindd: remove parse_domain_user_fstr
authorNoel Power <noel.power@suse.com>
Mon, 23 Oct 2023 14:12:39 +0000 (15:12 +0100)
committerNoel Power <npower@samba.org>
Tue, 24 Oct 2023 13:47:16 +0000 (13:47 +0000)
Last caller of parse_domain_user_fstr has been removed so
we can safely remove the function

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Tue Oct 24 13:47:16 UTC 2023 on atb-devel-224

source3/winbindd/winbindd_proto.h
source3/winbindd/winbindd_util.c

index 90433ee3a36da811c1c966240ce94a40f5e4d050..16e4e0ff14dcb074046359ad5077624f6f9786df 100644 (file)
@@ -531,10 +531,6 @@ bool parse_domain_user(TALLOC_CTX *ctx,
                       char **namespace,
                       char **domain,
                       char **user);
-bool parse_domain_user_fstr(const char *domuser,
-                      fstring namespace,
-                      fstring domain,
-                      fstring user);
 /**
  * Ensure an incoming username from NSS is fully qualified. Replace the
  * incoming username with DOMAIN <separator> user. Additionally returns
index 443f7c1a108b99767b71e062f15e5ec1543ab102..136d90c384c532d057ff449d0a22c57368547f6d 100644 (file)
@@ -1631,50 +1631,6 @@ fail:
        return false;
 }
 
-/* Parse a DOMAIN\user or UPN string into a domain, namespace and a user */
-bool parse_domain_user_fstr(const char *domuser,
-                      fstring namespace,
-                      fstring domain,
-                      fstring user)
-{
-       char *p = NULL;
-
-       if (strlen(domuser) == 0) {
-               return false;
-       }
-
-       p = strchr(domuser, *lp_winbind_separator());
-       if (p != NULL) {
-               if (PTR_DIFF(p, domuser) >= sizeof(fstring)) {
-                       DBG_ERR("index %td exceeds len of dest string %zu\n",
-                               PTR_DIFF(p, domuser),
-                               (sizeof(fstring) - 1));
-                       return false;
-               }
-               fstrcpy(user, p + 1);
-               fstrcpy(domain, domuser);
-               domain[PTR_DIFF(p, domuser)] = '\0';
-               fstrcpy(namespace, domain);
-       } else {
-               fstrcpy(user, domuser);
-
-               domain[0] = '\0';
-               namespace[0] = '\0';
-               p = strchr(domuser, '@');
-               if (p != NULL) {
-                       /* upn */
-                       fstrcpy(namespace, p + 1);
-               } else if (assume_domain(lp_workgroup())) {
-                       fstrcpy(domain, lp_workgroup());
-                       fstrcpy(namespace, domain);
-               } else {
-                       fstrcpy(namespace, lp_netbios_name());
-               }
-       }
-
-       return strupper_m(domain);
-}
-
 bool canonicalize_username(TALLOC_CTX *mem_ctx,
                           char **pusername_inout,
                           char **pnamespace,