diff options
| author | Stef Walter <stefw@gnome.org> | 2012-04-11 15:02:10 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-06-12 21:28:06 -0400 |
| commit | 3c60433641ce2e86b9b04778c8f8652ef0d097e4 (patch) | |
| tree | 7e62e915dc54fc40305e5e81714190154783620c /src/responder/nss/nsssrv_services.c | |
| parent | 6199bd6b41e8b280e65db4b4bb17a1c5c0444aa9 (diff) | |
| download | sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.tar.gz sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.tar.xz sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.zip | |
Make re_expression and full_name_format per domain options
* Allows different user/domain qualified names for different
domains. For example Domain\User or user@domain.
* The global re_expression and full_name_format options remain
as defaults for the domains.
* Subdomains get the re_expression and full_name_format of
their parent domain.
https://bugzilla.redhat.com/show_bug.cgi?id=811663
Diffstat (limited to 'src/responder/nss/nsssrv_services.c')
| -rw-r--r-- | src/responder/nss/nsssrv_services.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c index 2e539f135..e0ee21c30 100644 --- a/src/responder/nss/nsssrv_services.c +++ b/src/responder/nss/nsssrv_services.c @@ -779,7 +779,7 @@ done: errno_t parse_getservbyname(TALLOC_CTX *mem_ctx, uint8_t *body, size_t blen, - struct sss_names_ctx *names, + struct sss_domain_info *domains, char **domain_name, char **service_name, char **service_protocol); @@ -820,7 +820,7 @@ int nss_cmd_getservbyname(struct cli_ctx *cctx) } ret = parse_getservbyname(cmdctx, body, blen, - cctx->rctx->names, + cctx->rctx->domains, &domname, &service_name, &service_protocol); @@ -870,7 +870,7 @@ done: errno_t parse_getservbyname(TALLOC_CTX *mem_ctx, uint8_t *body, size_t blen, - struct sss_names_ctx *names, + struct sss_domain_info *domains, char **domain_name, char **service_name, char **service_protocol) @@ -959,8 +959,8 @@ errno_t parse_getservbyname(TALLOC_CTX *mem_ctx, } } - ret = sss_parse_name(tmp_ctx, names, rawname, - &domname, &svc_name); + ret = sss_parse_name_for_domains(tmp_ctx, domains, rawname, + &domname, &svc_name); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, ("Could not split name and domain of [%s]\n", @@ -1034,7 +1034,6 @@ nss_cmd_getserv_done(struct tevent_req *req) errno_t parse_getservbyport(TALLOC_CTX *mem_ctx, uint8_t *body, size_t blen, - struct sss_names_ctx *names, uint16_t *service_port, char **service_protocol) { @@ -1138,7 +1137,6 @@ int nss_cmd_getservbyport(struct cli_ctx *cctx) } ret = parse_getservbyport(cmdctx, body, blen, - cctx->rctx->names, &port, &service_protocol); if (ret != EOK) { |