Author: kai Date: 2007-07-31 23:43:59 +0000 (Tue, 31 Jul 2007) New Revision: 24108
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24108 Log: Split out samba3_parse_domuser to a seperate file and rename, so it can be used for a name2domain call. Added: branches/SAMBA_4_0/source/winbind/wb_utils.c Modified: branches/SAMBA_4_0/source/winbind/config.mk branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c Changeset: Modified: branches/SAMBA_4_0/source/winbind/config.mk =================================================================== --- branches/SAMBA_4_0/source/winbind/config.mk 2007-07-31 19:15:27 UTC (rev 24107) +++ branches/SAMBA_4_0/source/winbind/config.mk 2007-07-31 23:43:59 UTC (rev 24108) @@ -41,7 +41,8 @@ [SUBSYSTEM::WB_HELPER] PRIVATE_PROTO_HEADER = wb_helper.h OBJ_FILES = \ - wb_async_helpers.o + wb_async_helpers.o \ + wb_utils.o PUBLIC_DEPENDENCIES = RPC_NDR_LSA dcerpc_samr # End SUBSYSTEM WB_HELPER ################################################ Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c =================================================================== --- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2007-07-31 19:15:27 UTC (rev 24107) +++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2007-07-31 23:43:59 UTC (rev 24108) @@ -25,6 +25,7 @@ #include "nsswitch/winbindd_nss.h" #include "winbind/wb_server.h" #include "winbind/wb_async_helpers.h" +#include "winbind/wb_helper.h" #include "libcli/composite/composite.h" #include "version.h" #include "librpc/gen_ndr/netlogon.h" @@ -529,27 +530,6 @@ wbsrv_samba3_async_auth_epilogue(status, s3call); } -/* Helper function: Split a domain\\user string into it's parts, - * because the client supplies it as one string */ - -static BOOL samba3_parse_domuser(TALLOC_CTX *mem_ctx, const char *domuser, - char **domain, char **user) -{ - char *p = strchr(domuser, *lp_winbind_separator()); - - if (p == NULL) { - *domain = talloc_strdup(mem_ctx, lp_workgroup()); - } 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)); -} - /* Plaintext authentication This interface is used by ntlm_auth in it's 'basic' authentication @@ -566,7 +546,7 @@ s3call->wbconn->listen_socket->service; char *user, *domain; - if (!samba3_parse_domuser(s3call, + if (!wb_samba3_split_username(s3call, s3call->request.data.auth.user, &domain, &user)) { return NT_STATUS_NO_SUCH_USER; Added: branches/SAMBA_4_0/source/winbind/wb_utils.c =================================================================== --- branches/SAMBA_4_0/source/winbind/wb_utils.c 2007-07-31 19:15:27 UTC (rev 24107) +++ branches/SAMBA_4_0/source/winbind/wb_utils.c 2007-07-31 23:43:59 UTC (rev 24108) @@ -0,0 +1,47 @@ +/* + Unix SMB/CIFS implementation. + + Utility functions that are not related with async operations. + + Copyright (C) Andrew Bartlett <[EMAIL PROTECTED]> 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 <http://www.gnu.org/licenses/>. +*/ + +#include "includes.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, const char *domuser, + char **domain, char **user) +{ + char *p = strchr(domuser, *lp_winbind_separator()); + + if (p == NULL) { + *domain = talloc_strdup(mem_ctx, lp_workgroup()); + } 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)); +} + +