summaryrefslogtreecommitdiff
path: root/source4/winbind/wb_utils.c
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2010-07-16 09:57:03 -0400
committerSimo Sorce <idra@samba.org>2010-07-16 09:57:03 -0400
commit378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch)
tree9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/winbind/wb_utils.c
parent2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff)
parent6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff)
downloadsamba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz
samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2
samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/winbind/wb_utils.c')
-rw-r--r--source4/winbind/wb_utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/winbind/wb_utils.c b/source4/winbind/wb_utils.c
index 43effc3028..ffc4aa1950 100644
--- a/source4/winbind/wb_utils.c
+++ b/source4/winbind/wb_utils.c
@@ -31,10 +31,10 @@ bool wb_samba3_split_username(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c
const char *domuser,
char **domain, char **user)
{
- char *p = strchr(domuser, *lp_winbind_separator(lp_ctx));
+ char *p = strchr(domuser, *lpcfg_winbind_separator(lp_ctx));
if (p == NULL) {
- *domain = talloc_strdup(mem_ctx, lp_workgroup(lp_ctx));
+ *domain = talloc_strdup(mem_ctx, lpcfg_workgroup(lp_ctx));
} else {
*domain = talloc_strndup(mem_ctx, domuser,
PTR_DIFF(p, domuser));