diff options
| -rw-r--r-- | src/providers/ipa/ipa_common.c | 9 | ||||
| -rw-r--r-- | src/providers/krb5/krb5_common.c | 41 | ||||
| -rw-r--r-- | src/providers/krb5/krb5_common.h | 1 |
3 files changed, 50 insertions, 1 deletions
diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index bed0666b..7d457b7d 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -486,6 +486,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, char *realm; int ret; int i; + struct tevent_req *req; tmp_ctx = talloc_new(memctx); if (!tmp_ctx) { @@ -564,6 +565,14 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, goto done; } + req = be_resolve_server_send(memctx, ctx->ev, ctx, "IPA"); + if (req == NULL) { + DEBUG(1, ("be_resolve_server_send failed.\n")); + ret = ENOMEM; + goto done; + } + tevent_req_set_callback(req, krb5_init_resolve_done, service->krb5_service); + ret = EOK; done: diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index 746b3f3c..1423b089 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -31,6 +31,8 @@ #include "providers/dp_backend.h" #include "providers/krb5/krb5_common.h" +#define DUMMY_ADDRESS "255.255.255.255" + struct dp_option default_krb5_opts[] = { { "krb5_kdcip", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING }, @@ -287,7 +289,6 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) return; } - int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, const char *service_name, const char *servers, const char *realm, struct krb5_service **_service) @@ -302,6 +303,7 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, char *server_spec; char *endptr; struct servent *servent; + struct tevent_req *req; tmp_ctx = talloc_new(memctx); if (!tmp_ctx) { @@ -403,6 +405,14 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, goto done; } + req = be_resolve_server_send(memctx, ctx->ev, ctx, service_name); + if (req == NULL) { + DEBUG(1, ("be_resolve_server_send failed.\n")); + ret = ENOMEM; + goto done; + } + tevent_req_set_callback(req, krb5_init_resolve_done, service); + ret = EOK; done: @@ -453,3 +463,32 @@ void krb5_finalize(struct tevent_context *ev, sig_term(signum); } + +void krb5_init_resolve_done(struct tevent_req *req) +{ + struct krb5_service *krb5_service = tevent_req_callback_data(req, + struct krb5_service); + int ret; + struct fo_server *srv; + const char *service_name; + + ret = be_resolve_server_recv(req, &srv); + talloc_zfree(req); + if (ret) { + DEBUG(1, ("be_resolve_server request failed [%d][%s]. " + "Creating dummy info file.\n", ret, strerror(ret))); + + service_name = krb5_service->name; + if (strcmp(service_name, "IPA") == 0) { + service_name = SSS_KRB5KDC_FO_SRV; + } + ret = write_krb5info_file(krb5_service->realm, DUMMY_ADDRESS, + service_name); + if (ret != EOK) { + DEBUG(2, ("write_krb5info_file failed, " + "authentication might fail.\n")); + } + } + + return; +} diff --git a/src/providers/krb5/krb5_common.h b/src/providers/krb5/krb5_common.h index 51afa0c6..0482ef02 100644 --- a/src/providers/krb5/krb5_common.h +++ b/src/providers/krb5/krb5_common.h @@ -82,4 +82,5 @@ void krb5_finalize(struct tevent_context *ev, int count, void *siginfo, void *private_data); +void krb5_init_resolve_done(struct tevent_req *req); #endif /* __KRB5_COMMON_H__ */ |