diff options
| -rw-r--r-- | source4/winbind/config.mk | 3 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 24 | ||||
| -rw-r--r-- | source4/winbind/wb_utils.c | 47 |
3 files changed, 51 insertions, 23 deletions
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk index c95abc47f8..531367b26b 100644 --- a/source4/winbind/config.mk +++ b/source4/winbind/config.mk @@ -41,7 +41,8 @@ PRIVATE_DEPENDENCIES = \ [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 ################################################ diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index f917bb96ae..c5fe0ddb48 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -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 @@ static void pam_auth_crap_recv(struct composite_context *ctx) 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 @@ NTSTATUS wbsrv_samba3_pam_auth(struct wbsrv_samba3_call *s3call) 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; diff --git a/source4/winbind/wb_utils.c b/source4/winbind/wb_utils.c new file mode 100644 index 0000000000..5938bb391d --- /dev/null +++ b/source4/winbind/wb_utils.c @@ -0,0 +1,47 @@ +/* + Unix SMB/CIFS implementation. + + Utility functions that are not related with async operations. + + Copyright (C) Andrew Bartlett <abartlet@samba.org> 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)); +} + + |