diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 21:32:08 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:13 +0100 |
| commit | 934e932387ea5668ec000bcefe4ec86935297339 (patch) | |
| tree | b101a7e8ff027df768ef9612ca9a7b84f12a7b8a /source4/winbind/wb_utils.c | |
| parent | 7e298580e06a5b9a0c1210937af47f277849080e (diff) | |
| download | samba-934e932387ea5668ec000bcefe4ec86935297339.tar.gz samba-934e932387ea5668ec000bcefe4ec86935297339.tar.bz2 samba-934e932387ea5668ec000bcefe4ec86935297339.zip | |
r26235: Avoid global_loadparm.
(This used to be commit e9039782204389cc827e76da319d5ccf6d33be46)
Diffstat (limited to 'source4/winbind/wb_utils.c')
| -rw-r--r-- | source4/winbind/wb_utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/winbind/wb_utils.c b/source4/winbind/wb_utils.c index dfd09a98fe..43effc3028 100644 --- a/source4/winbind/wb_utils.c +++ b/source4/winbind/wb_utils.c @@ -27,13 +27,14 @@ * 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, +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, *lp_winbind_separator(global_loadparm)); + char *p = strchr(domuser, *lp_winbind_separator(lp_ctx)); if (p == NULL) { - *domain = talloc_strdup(mem_ctx, lp_workgroup(global_loadparm)); + *domain = talloc_strdup(mem_ctx, lp_workgroup(lp_ctx)); } else { *domain = talloc_strndup(mem_ctx, domuser, PTR_DIFF(p, domuser)); |