[SSSD] [PATCH] Add krb5_kadmin option
Sumit Bose
sbose at redhat.com
Wed Mar 10 16:18:53 UTC 2010
Hi,
this is an attempt to fix bz#571896 aka trac#415. A new parameter
krb5_kadmin is introduced together with a new failover service in the
Kerberos provider. If the change password service is not available the
backend is not switched to offline mode unless authentication isn't
possible too.
I haven't add to option to the IPA provider, because I think here the
kpasswd always runs together with the KDC.
bye,
Sumit
-------------- next part --------------
From 986a9b0238b88cbf20e11a1c523161d78d797964 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Wed, 10 Mar 2010 17:03:23 +0100
Subject: [PATCH] Add krb5_kadmin option
---
src/config/SSSDConfig.py | 1 +
src/config/SSSDConfigTest.py | 3 +-
src/config/etc/sssd.api.d/sssd-krb5.conf | 1 +
src/krb5_plugin/sssd_krb5_locator_plugin.c | 114 +++++++++++++++++++--------
src/man/sssd-krb5.5.xml | 15 ++++
src/providers/ipa/ipa_common.c | 5 +-
src/providers/krb5/krb5_auth.c | 85 ++++++++++++++++++--
src/providers/krb5/krb5_auth.h | 2 +
src/providers/krb5/krb5_child.c | 7 ++
src/providers/krb5/krb5_common.c | 52 +++++++++----
src/providers/krb5/krb5_common.h | 8 ++-
src/providers/krb5/krb5_init.c | 21 +++++-
12 files changed, 248 insertions(+), 66 deletions(-)
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index c9e08ca..4ffc875 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -100,6 +100,7 @@ option_strings = {
# [provider/krb5/chpass]
'krb5_changepw_principal' : _('The principal of the change password service'),
+ 'krb5_kadmin' : _('Server where the change password service is running if not on the KDC'),
# [provider/ldap]
'ldap_uri' : _('ldap_uri, The URI of the LDAP server'),
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 4e9d091..ec7e431 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -677,7 +677,8 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
#Test looking up all provider values
options = domain.list_provider_options('krb5')
- control_list.extend(['krb5_changepw_principal'])
+ control_list.extend(['krb5_changepw_principal',
+ 'krb5_kadmin'])
self.assertTrue(type(options) == dict,
"Options should be a dictionary")
diff --git a/src/config/etc/sssd.api.d/sssd-krb5.conf b/src/config/etc/sssd.api.d/sssd-krb5.conf
index 7ba0ab3..32e6149 100644
--- a/src/config/etc/sssd.api.d/sssd-krb5.conf
+++ b/src/config/etc/sssd.api.d/sssd-krb5.conf
@@ -11,3 +11,4 @@ krb5_validate = bool, None, false
[provider/krb5/chpass]
krb5_changepw_principal = str, None, false
+krb5_kadmin = str, None, false
diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
index 8f32a31..2fc381b 100644
--- a/src/krb5_plugin/sssd_krb5_locator_plugin.c
+++ b/src/krb5_plugin/sssd_krb5_locator_plugin.c
@@ -46,6 +46,7 @@
struct sssd_ctx {
char *sssd_realm;
char *kdc_addr;
+ char *kadmin_addr;
bool debug;
};
@@ -69,31 +70,47 @@ void debug_fn(const char *format, ...)
free(s);
}
-static int get_kdcinfo(const char *realm, struct sssd_ctx *ctx)
+static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
+ enum locate_service_type svc)
{
int ret;
- char *kdcinfo_name = NULL;
+ char *krb5info_name = NULL;
size_t len;
uint8_t buf[BUFSIZE + 1];
uint8_t *p;
int fd = -1;
+ const char *name_tmpl = NULL;
+
+ switch (svc) {
+ case locate_service_kdc:
+ name_tmpl = KDCINFO_TMPL;
+ break;
+ case locate_service_kadmin:
+ name_tmpl = KADMININFO_TMPL;
+ break;
+ default:
+ PLUGIN_DEBUG(("Unsupported service [%d].\n", svc));
+ return EINVAL;
+ }
- len = strlen(realm) + strlen(KDCINFO_TMPL);
- kdcinfo_name = calloc(1, len + 1);
- if (kdcinfo_name == NULL) {
+ len = strlen(realm) + strlen(name_tmpl);
+
+ krb5info_name = calloc(1, len + 1);
+ if (krb5info_name == NULL) {
PLUGIN_DEBUG(("malloc failed.\n"));
return ENOMEM;
}
- ret = snprintf(kdcinfo_name, len, KDCINFO_TMPL, realm);
+ ret = snprintf(krb5info_name, len, name_tmpl, realm);
if (ret < 0) {
- PLUGIN_DEBUG(("snprintf failed"));
+ PLUGIN_DEBUG(("snprintf failed.\n"));
ret = EINVAL;
+ goto done;
}
- kdcinfo_name[len] = '\0';
+ krb5info_name[len] = '\0';
- fd = open(kdcinfo_name, O_RDONLY);
+ fd = open(krb5info_name, O_RDONLY);
if (fd == -1) {
PLUGIN_DEBUG(("open failed [%d][%s].\n", errno, strerror(errno)));
ret = errno;
@@ -117,27 +134,38 @@ static int get_kdcinfo(const char *realm, struct sssd_ctx *ctx)
close(fd);
if (len == 0) {
- PLUGIN_DEBUG(("Content of kdcinfo file [%s] is [%d] or larger.\n",
- kdcinfo_name, BUFSIZE));
- }
- PLUGIN_DEBUG(("Found kdcinfo [%s].\n", buf));
-
- ctx->kdc_addr = strdup((char *) buf);
- if (ctx->kdc_addr == NULL) {
- PLUGIN_DEBUG(("strdup failed.\n"));
- ret = ENOMEM;
- goto done;
+ PLUGIN_DEBUG(("Content of krb5info file [%s] is [%d] or larger.\n",
+ krb5info_name, BUFSIZE));
}
+ PLUGIN_DEBUG(("Found [%s] in [%s].\n", buf, krb5info_name));
- ctx->sssd_realm = strdup(realm);
- if (ctx->sssd_realm == NULL) {
- PLUGIN_DEBUG(("strdup failed.\n"));
- ret = ENOMEM;
- goto done;
+ switch (svc) {
+ case locate_service_kdc:
+ free(ctx->kdc_addr);
+ ctx->kdc_addr = strdup((char *) buf);
+ if (ctx->kdc_addr == NULL) {
+ PLUGIN_DEBUG(("strdup failed.\n"));
+ ret = ENOMEM;
+ goto done;
+ }
+ break;
+ case locate_service_kadmin:
+ free(ctx->kadmin_addr);
+ ctx->kadmin_addr = strdup((char *) buf);
+ if (ctx->kadmin_addr == NULL) {
+ PLUGIN_DEBUG(("strdup failed.\n"));
+ ret = ENOMEM;
+ goto done;
+ }
+ break;
+ default:
+ PLUGIN_DEBUG(("Unsupported service [%d].\n", svc));
+ ret = EINVAL;
+ goto done;
}
done:
- free(kdcinfo_name);
+ free(krb5info_name);
return ret;
}
@@ -173,6 +201,7 @@ void sssd_krb5_locator_close(void *private_data)
PLUGIN_DEBUG(("sssd_krb5_locator_close called\n"));
free(ctx->kdc_addr);
+ free(ctx->kadmin_addr);
free(ctx->sssd_realm);
free(ctx);
private_data = NULL;
@@ -193,20 +222,33 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
struct sssd_ctx *ctx;
struct addrinfo ai_hints;
const char *service = NULL;
+ const char *addr = NULL;
if (private_data == NULL) return KRB5_PLUGIN_NO_HANDLE;
ctx = (struct sssd_ctx *) private_data;
if (ctx->sssd_realm == NULL || strcmp(ctx->sssd_realm, realm) != 0) {
- free(ctx->kdc_addr);
- ctx->kdc_addr = NULL;
free(ctx->sssd_realm);
- ctx->sssd_realm = NULL;
- ret = get_kdcinfo(realm, ctx);
+ ctx->sssd_realm = strdup(realm);
+ if (ctx->sssd_realm == NULL) {
+ PLUGIN_DEBUG(("strdup failed.\n"));
+ return ENOMEM;
+ }
+
+ ret = get_krb5info(realm, ctx, locate_service_kdc);
if (ret != EOK) {
- PLUGIN_DEBUG(("get_kdcinfo failed.\n"));
+ PLUGIN_DEBUG(("get_krb5info failed.\n"));
return KRB5_PLUGIN_NO_HANDLE;
}
+
+ if (svc == locate_service_kadmin || svc == locate_service_kpasswd) {
+ ret = get_krb5info(realm, ctx, locate_service_kadmin);
+ if (ret != EOK) {
+ PLUGIN_DEBUG(("reading kadmin address failed, "
+ "using kdc address.\n"));
+ ctx->kadmin_addr = ctx->kdc_addr;
+ }
+ }
}
PLUGIN_DEBUG(("sssd_realm[%s] requested realm[%s] family[%d] socktype[%d] "
@@ -216,12 +258,15 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
switch (svc) {
case locate_service_kdc:
case locate_service_master_kdc:
+ addr = ctx->kdc_addr;
service = "kerberos";
break;
case locate_service_kadmin:
+ addr = ctx->kadmin_addr;
service = "kerberos-adm";
break;
case locate_service_kpasswd:
+ addr = ctx->kadmin_addr;
service = "kpasswd";
break;
case locate_service_krb524:
@@ -253,7 +298,8 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
memset(&ai_hints, 0, sizeof(struct addrinfo));
ai_hints.ai_flags = AI_NUMERICHOST;
ai_hints.ai_socktype = socktype;
- ret = getaddrinfo(ctx->kdc_addr, service, &ai_hints, &ai);
+
+ ret = getaddrinfo(addr, service, &ai_hints, &ai);
if (ret != 0) {
PLUGIN_DEBUG(("getaddrinfo failed [%d][%s].\n", ret,
gai_strerror(ret)));
@@ -264,7 +310,7 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
return EFAULT;
}
- PLUGIN_DEBUG(("addr[%s] family[%d] socktype[%d]\n", ctx->kdc_addr,
+ PLUGIN_DEBUG(("addr[%s] family[%d] socktype[%d]\n", addr,
ai->ai_family, ai->ai_socktype));
if ((family == AF_UNSPEC || ai->ai_family == family) &&
@@ -275,10 +321,10 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
PLUGIN_DEBUG(("cbfunc failed\n"));
return ret;
} else {
- PLUGIN_DEBUG(("[%s] used\n", ctx->kdc_addr));
+ PLUGIN_DEBUG(("[%s] used\n", addr));
}
} else {
- PLUGIN_DEBUG(("[%s] NOT used\n", ctx->kdc_addr));
+ PLUGIN_DEBUG(("[%s] NOT used\n", addr));
}
return 0;
diff --git a/src/man/sssd-krb5.5.xml b/src/man/sssd-krb5.5.xml
index ca4dae2..070c1d3 100644
--- a/src/man/sssd-krb5.5.xml
+++ b/src/man/sssd-krb5.5.xml
@@ -99,6 +99,21 @@
</varlistentry>
<varlistentry>
+ <term>krb5_kadmin (string)</term>
+ <listitem>
+ <para>
+ If the change password service is not running on the
+ KDC alternative servers can be defined here. For
+ more information on failover and server redundancy,
+ see the <quote>FAILOVER</quote> section. Please note
+ that even if there are no more kadmin servers to try
+ the back end is not switch to offline if
+ authentication against the KDC is still possible.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>krb5_ccachedir (string)</term>
<listitem>
<para>
diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c
index a50b63b..1fc881f 100644
--- a/src/providers/ipa/ipa_common.c
+++ b/src/providers/ipa/ipa_common.c
@@ -499,9 +499,10 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server)
talloc_zfree(service->krb5_service->address);
service->krb5_service->address = address;
- ret = write_kdcinfo_file(service->krb5_service->realm, address);
+ ret = write_krb5info_file(service->krb5_service->realm, address,
+ SSS_KRB5KDC_FO_SRV);
if (ret != EOK) {
- DEBUG(2, ("write_kdcinfo_file failed, authentication might fail.\n"));
+ DEBUG(2, ("write_krb5info_file failed, authentication might fail.\n"));
}
}
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index b8b498a..ff02f30 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -676,7 +676,9 @@ static int handle_child_recv(struct tevent_req *req,
}
static void get_user_attr_done(void *pvt, int err, struct ldb_result *res);
-static void krb5_resolve_done(struct tevent_req *req);
+static void krb5_resolve_kdc_done(struct tevent_req *req);
+static void krb5_resolve_kadmin_done(struct tevent_req *req);
+static void krb5_find_ccache_step(struct krb5child_req *kr);
static void krb5_save_ccname_done(struct tevent_req *req);
static void krb5_child_done(struct tevent_req *req);
static void krb5_pam_handler_cache_done(struct tevent_req *treq);
@@ -852,14 +854,16 @@ static void get_user_attr_done(void *pvt, int err, struct ldb_result *res)
break;
}
+ kr->srv = NULL;
+ kr->kadmin_srv = NULL;
req = be_resolve_server_send(kr, be_req->be_ctx->ev, be_req->be_ctx,
krb5_ctx->service->name);
if (req == NULL) {
- DEBUG(1, ("handle_child_send failed.\n"));
+ DEBUG(1, ("be_resolve_server_send failed.\n"));
goto failed;
}
- tevent_req_set_callback(req, krb5_resolve_done, kr);
+ tevent_req_set_callback(req, krb5_resolve_kdc_done, kr);
return;
@@ -870,18 +874,13 @@ failed:
krb_reply(be_req, dp_err, pd->pam_status);
}
-static void krb5_resolve_done(struct tevent_req *req)
+static void krb5_resolve_kdc_done(struct tevent_req *req)
{
struct krb5child_req *kr = tevent_req_callback_data(req,
struct krb5child_req);
int ret;
- int pam_status = PAM_SYSTEM_ERR;
- int dp_err = DP_ERR_FATAL;
struct pam_data *pd = kr->pd;
struct be_req *be_req = kr->req;
- char *msg;
- size_t offset = 0;
- bool private_path = false;
ret = be_resolve_server_recv(req, &kr->srv);
talloc_zfree(req);
@@ -892,8 +891,68 @@ static void krb5_resolve_done(struct tevent_req *req)
* the ccache file. */
be_mark_offline(be_req->be_ctx);
kr->is_offline = true;
+ } else {
+ if (pd->cmd == SSS_PAM_CHAUTHTOK &&
+ kr->krb5_ctx->kadmin_service != NULL) {
+ req = be_resolve_server_send(kr, be_req->be_ctx->ev, be_req->be_ctx,
+ kr->krb5_ctx->kadmin_service->name);
+ if (req == NULL) {
+ DEBUG(1, ("be_resolve_server_send failed.\n"));
+ goto failed;
+ }
+
+ tevent_req_set_callback(req, krb5_resolve_kadmin_done, kr);
+
+ return;
+ }
}
+ krb5_find_ccache_step(kr);
+ return;
+
+failed:
+ talloc_free(kr);
+
+ pd->pam_status = PAM_SYSTEM_ERR;
+ krb_reply(be_req, DP_ERR_FATAL, pd->pam_status);
+}
+
+static void krb5_resolve_kadmin_done(struct tevent_req *req)
+{
+ struct krb5child_req *kr = tevent_req_callback_data(req,
+ struct krb5child_req);
+ int ret;
+ struct pam_data *pd = kr->pd;
+ struct be_req *be_req = kr->req;
+
+ ret = be_resolve_server_recv(req, &kr->kadmin_srv);
+ talloc_zfree(req);
+ if (ret) {
+ /* all kadmin servers have been tried and none was found good, but the
+ * kdc seems ok. Password changes are not possible but
+ * authentication. We return an PAM error here, but do not mark the
+ * backend offline. */
+
+ talloc_free(kr);
+ pd->pam_status = PAM_AUTHTOK_LOCK_BUSY;
+ krb_reply(be_req, DP_ERR_OK, pd->pam_status);
+ }
+
+ krb5_find_ccache_step(kr);
+}
+
+static void krb5_find_ccache_step(struct krb5child_req *kr)
+{
+ int ret;
+ int pam_status = PAM_SYSTEM_ERR;
+ int dp_err = DP_ERR_FATAL;
+ struct pam_data *pd = kr->pd;
+ struct be_req *be_req = kr->req;
+ char *msg;
+ size_t offset = 0;
+ bool private_path = false;
+ struct tevent_req *req = NULL;
+
if (kr->ccname == NULL ||
(be_is_offline(be_req->be_ctx) && !kr->active_ccache_present &&
!kr->valid_tgt_present) ||
@@ -1081,6 +1140,14 @@ static void krb5_child_done(struct tevent_req *req)
fo_set_port_status(kr->srv, PORT_WORKING);
}
+ if (kr->kadmin_srv != NULL) {
+ if (*msg_status == PAM_AUTHTOK_LOCK_BUSY) {
+ fo_set_port_status(kr->kadmin_srv, PORT_NOT_WORKING);
+ } else {
+ fo_set_port_status(kr->kadmin_srv, PORT_WORKING);
+ }
+ }
+
struct sysdb_attrs *attrs;
attrs = sysdb_new_attrs(kr);
ret = sysdb_attrs_add_string(attrs, SYSDB_CCACHE_FILE, kr->ccname);
diff --git a/src/providers/krb5/krb5_auth.h b/src/providers/krb5/krb5_auth.h
index 825f3d6..9a99cb7 100644
--- a/src/providers/krb5/krb5_auth.h
+++ b/src/providers/krb5/krb5_auth.h
@@ -57,6 +57,7 @@ struct krb5child_req {
gid_t gid;
bool is_offline;
struct fo_server *srv;
+ struct fo_server *kadmin_srv;
bool active_ccache_present;
bool valid_tgt_present;
};
@@ -90,6 +91,7 @@ struct krb5_ctx {
struct dp_option *opts;
struct krb5_service *service;
+ struct krb5_service *kadmin_service;
int child_debug_fd;
pcre *illegal_path_re;
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 234b838..86242ef 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -587,9 +587,16 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
goto sendresponse;
}
+ memset(&result_code_string, 0, sizeof(krb5_data));
+ memset(&result_string, 0, sizeof(krb5_data));
kerr = krb5_change_password(kr->ctx, kr->creds, newpass_str, &result_code,
&result_code_string, &result_string);
+ if (kerr == KRB5_KDC_UNREACH) {
+ pam_status = PAM_AUTHTOK_LOCK_BUSY;
+ goto sendresponse;
+ }
+
if (kerr != 0 || result_code != 0) {
if (kerr != 0) {
KRB5_DEBUG(1, kerr);
diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c
index 8c1c7fa..e5ba133 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -38,7 +38,8 @@ struct dp_option default_krb5_opts[] = {
{ "krb5_changepw_principal", DP_OPT_STRING, { "kadmin/changepw" }, NULL_STRING },
{ "krb5_auth_timeout", DP_OPT_NUMBER, { .number = 15 }, NULL_NUMBER },
{ "krb5_keytab", DP_OPT_STRING, { "/etc/krb5.keytab" }, NULL_STRING },
- { "krb5_validate", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }
+ { "krb5_validate", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE },
+ { "krb5_kadmin", DP_OPT_STRING, NULL_STRING, NULL_STRING }
};
errno_t check_and_export_options(struct dp_option *opts,
@@ -67,7 +68,13 @@ errno_t check_and_export_options(struct dp_option *opts,
dummy = dp_opt_get_cstring(opts, KRB5_KDC);
if (dummy == NULL) {
- DEBUG(1, ("No KDC expicitly configured, using defaults"));
+ DEBUG(1, ("No KDC explicitly configured, using defaults"));
+ }
+
+ dummy = dp_opt_get_cstring(opts, KRB5_KADMIN);
+ if (dummy == NULL) {
+ DEBUG(1, ("No kadmin server explicitly configured, "
+ "using the KDC or defaults"));
}
dummy = dp_opt_get_cstring(opts, KRB5_CCNAME_TMPL);
@@ -139,21 +146,33 @@ done:
return ret;
}
-errno_t write_kdcinfo_file(const char *realm, const char *kdc)
+errno_t write_krb5info_file(const char *realm, const char *server,
+ const char *service)
{
int ret;
int fd = -1;
char *tmp_name = NULL;
- char *kdcinfo_name = NULL;
+ char *krb5info_name = NULL;
TALLOC_CTX *tmp_ctx = NULL;
- int kdc_len;
+ const char *name_tmpl = NULL;
+ int server_len;
+
+ if (realm == NULL || *realm == '\0' || server == NULL || *server == '\0' ||
+ service == NULL || service == '\0') {
+ DEBUG(1, ("Missing or empty realm, server or service.\n"));
+ return EINVAL;
+ }
- if (realm == NULL || *realm == '\0' || kdc == NULL || *kdc == '\0') {
- DEBUG(1, ("Missing or empty realm or kdc.\n"));
+ if (strcmp(service, SSS_KRB5KDC_FO_SRV) == 0) {
+ name_tmpl = KDCINFO_TMPL;
+ } else if (strcmp(service, SSS_KRB5KADMIN_FO_SRV) == 0) {
+ name_tmpl = KADMININFO_TMPL;
+ } else {
+ DEBUG(1, ("Unsupported service [%s]\n.", service));
return EINVAL;
}
- kdc_len = strlen(kdc);
+ server_len = strlen(server);
tmp_ctx = talloc_new(NULL);
if (tmp_ctx == NULL) {
@@ -161,15 +180,15 @@ errno_t write_kdcinfo_file(const char *realm, const char *kdc)
return ENOMEM;
}
- tmp_name = talloc_asprintf(tmp_ctx, PUBCONF_PATH"/.kdcinfo_dummy_XXXXXX");
+ tmp_name = talloc_asprintf(tmp_ctx, PUBCONF_PATH"/.krb5info_dummy_XXXXXX");
if (tmp_name == NULL) {
DEBUG(1, ("talloc_asprintf failed.\n"));
ret = ENOMEM;
goto done;
}
- kdcinfo_name = talloc_asprintf(tmp_ctx, KDCINFO_TMPL, realm);
- if (kdcinfo_name == NULL) {
+ krb5info_name = talloc_asprintf(tmp_ctx, name_tmpl, realm);
+ if (krb5info_name == NULL) {
DEBUG(1, ("talloc_asprintf failed.\n"));
ret = ENOMEM;
goto done;
@@ -182,12 +201,12 @@ errno_t write_kdcinfo_file(const char *realm, const char *kdc)
goto done;
}
- ret = write(fd, kdc, kdc_len);
+ ret = write(fd, server, server_len);
if (ret == -1) {
DEBUG(1, ("write failed [%d][%s].\n", errno, strerror(errno)));
goto done;
}
- if (ret != kdc_len) {
+ if (ret != server_len) {
DEBUG(1, ("Partial write occured, this should never happen.\n"));
ret = EINTR;
goto done;
@@ -205,7 +224,7 @@ errno_t write_kdcinfo_file(const char *realm, const char *kdc)
goto done;
}
- ret = rename(tmp_name, kdcinfo_name);
+ ret = rename(tmp_name, krb5info_name);
if (ret == -1) {
DEBUG(1, ("rename failed [%d][%s].\n", errno, strerror(errno)));
goto done;
@@ -251,9 +270,10 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server)
talloc_zfree(krb5_service->address);
krb5_service->address = address;
- ret = write_kdcinfo_file(krb5_service->realm, address);
+ ret = write_krb5info_file(krb5_service->realm, address,
+ krb5_service->name);
if (ret != EOK) {
- DEBUG(2, ("write_kdcinfo_file failed, authentication might fail.\n"));
+ 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 832ffcd..c2f561a 100644
--- a/src/providers/krb5/krb5_common.h
+++ b/src/providers/krb5/krb5_common.h
@@ -38,6 +38,10 @@
#define SSSD_KRB5_CHANGEPW_PRINCIPLE "SSSD_KRB5_CHANGEPW_PRINCIPLE"
#define KDCINFO_TMPL PUBCONF_PATH"/kdcinfo.%s"
+#define KADMININFO_TMPL PUBCONF_PATH"/kadmininfo.%s"
+
+#define SSS_KRB5KDC_FO_SRV "KRB5KDC"
+#define SSS_KRB5KADMIN_FO_SRV "KRB5KADMIN"
enum krb5_opts {
KRB5_KDC = 0,
@@ -48,6 +52,7 @@ enum krb5_opts {
KRB5_AUTH_TIMEOUT,
KRB5_KEYTAB,
KRB5_VALIDATE,
+ KRB5_KADMIN,
KRB5_OPTS
};
@@ -64,7 +69,8 @@ errno_t check_and_export_options(struct dp_option *opts,
errno_t krb5_get_options(TALLOC_CTX *memctx, struct confdb_ctx *cdb,
const char *conf_path, struct dp_option **_opts);
-errno_t write_kdcinfo_file(const char *realm, const char *kdc);
+errno_t write_krb5info_file(const char *realm, const char *kdc,
+ const char *service);
int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx,
const char *service_name, const char *servers,
diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c
index 4d21238..36039a3 100644
--- a/src/providers/krb5/krb5_init.c
+++ b/src/providers/krb5/krb5_init.c
@@ -52,6 +52,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx,
unsigned v;
FILE *debug_filep;
const char *krb5_servers;
+ const char *krb5_kadmin_servers;
const char *krb5_realm;
const char *errstr;
int errval;
@@ -98,13 +99,27 @@ int sssm_krb5_auth_init(struct be_ctx *bectx,
return EINVAL;
}
- ret = krb5_service_init(ctx, bectx, "KRB5", krb5_servers, krb5_realm,
- &ctx->service);
+ ret = krb5_service_init(ctx, bectx, SSS_KRB5KDC_FO_SRV, krb5_servers,
+ krb5_realm, &ctx->service);
if (ret != EOK) {
- DEBUG(0, ("Failed to init IPA failover service!\n"));
+ DEBUG(0, ("Failed to init KRB5 failover service!\n"));
return ret;
}
+ krb5_kadmin_servers = dp_opt_get_string(ctx->opts, KRB5_KADMIN);
+ if (krb5_kadmin_servers == NULL) {
+ DEBUG(0, ("Missing krb5_kadmin option, using KDC!\n"));
+ ctx->kadmin_service = NULL;
+ } else {
+ ret = krb5_service_init(ctx, bectx, SSS_KRB5KADMIN_FO_SRV,
+ krb5_kadmin_servers, krb5_realm,
+ &ctx->kadmin_service);
+ if (ret != EOK) {
+ DEBUG(0, ("Failed to init KRB5KADMIN failover service!\n"));
+ return ret;
+ }
+ }
+
ret = check_and_export_options(ctx->opts, bectx->domain);
if (ret != EOK) {
DEBUG(1, ("check_and_export_options failed.\n"));
--
1.6.6.1
More information about the sssd-devel
mailing list