From e995c9c16f6a9a1d7d5dab53a75cd1ff3775aeb1 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 6 May 2019 13:36:36 +1200 Subject: [PATCH] s4-winbindd: Removed unused wb_utils.c Garming noticed this was untested code in the lcov report, and it turns out to be unused. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- source4/torture/wscript_build | 1 - source4/winbind/wb_utils.c | 51 ----------------------------------- source4/winbind/wscript_build | 7 ----- 3 files changed, 59 deletions(-) delete mode 100644 source4/winbind/wb_utils.c diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 97b36a1f3a5..8433d620b01 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -173,7 +173,6 @@ bld.SAMBA_MODULE('torture_rpc', RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS - WB_HELPER %s LIBCLI_AUTH popt diff --git a/source4/winbind/wb_utils.c b/source4/winbind/wb_utils.c deleted file mode 100644 index 535d1ec898c..00000000000 --- a/source4/winbind/wb_utils.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Utility functions that are not related with async operations. - - Copyright (C) Andrew Bartlett 2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" -#include "param/param.h" -#include "libcli/security/dom_sid.h" -#include "winbind/wb_helper.h" - - -/* Split a domain\\user string into it's parts, because the client supplies it - * as one string. - * TODO: We probably will need to handle other formats later. */ - -bool wb_samba3_split_username(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, - const char *domuser, - char **domain, char **user) -{ - char *p = strchr(domuser, *lpcfg_winbind_separator(lp_ctx)); - - if (p == NULL) { - *domain = talloc_strdup(mem_ctx, lpcfg_workgroup(lp_ctx)); - } else { - *domain = talloc_strndup(mem_ctx, domuser, - PTR_DIFF(p, domuser)); - domuser = p+1; - } - - *user = talloc_strdup(mem_ctx, domuser); - - return ((*domain != NULL) && (*user != NULL)); -} - - diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 61adeb598d9..be10cb5e737 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -10,13 +10,6 @@ bld.SAMBA_MODULE('service_winbindd', ) -bld.SAMBA_SUBSYSTEM('WB_HELPER', - source='wb_utils.c', - autoproto='wb_helper.h', - public_deps='RPC_NDR_LSA dcerpc-samr' - ) - - bld.SAMBA_SUBSYSTEM('IDMAP', source='idmap.c', autoproto='idmap_proto.h', -- 2.47.3