From 3441d0c2d11aea0c39b009751a1898333c009674 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 27 Jun 2012 14:07:05 -0400 Subject: KRB5: Create a common init routine for krb5_child options This will reduce code duplication between the krb5, ipa and ad providers --- src/providers/ipa/ipa_init.c | 51 +++---------------- src/providers/krb5/krb5_init.c | 59 +++------------------- src/providers/krb5/krb5_init_shared.c | 94 +++++++++++++++++++++++++++++++++++ src/providers/krb5/krb5_init_shared.h | 29 +++++++++++ 4 files changed, 135 insertions(+), 98 deletions(-) create mode 100644 src/providers/krb5/krb5_init_shared.c create mode 100644 src/providers/krb5/krb5_init_shared.h (limited to 'src') diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index 0524ddfa6..4fb662c26 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -30,6 +30,7 @@ #include "util/child_common.h" #include "providers/ipa/ipa_common.h" #include "providers/krb5/krb5_auth.h" +#include "providers/krb5/krb5_init_shared.h" #include "providers/ipa/ipa_id.h" #include "providers/ipa/ipa_auth.h" #include "providers/ipa/ipa_access.h" @@ -231,8 +232,6 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, struct krb5_ctx *krb5_auth_ctx; struct sdap_auth_ctx *sdap_auth_ctx; struct bet_ops *id_ops; - FILE *debug_filep; - unsigned v; int ret; if (!ipa_options) { @@ -305,53 +304,15 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, goto done; } - if (dp_opt_get_bool(krb5_auth_ctx->opts, KRB5_STORE_PASSWORD_IF_OFFLINE)) { - ret = init_delayed_online_authentication(krb5_auth_ctx, bectx, - bectx->ev); - if (ret != EOK) { - DEBUG(1, ("init_delayed_online_authentication failed.\n")); - goto done; - } - } - - ret = check_and_export_options(krb5_auth_ctx->opts, bectx->domain, - krb5_auth_ctx); - if (ret != EOK) { - DEBUG(1, ("check_and_export_opts failed.\n")); - goto done; - } - - ret = krb5_install_offline_callback(bectx, krb5_auth_ctx); + /* Initialize features needed by the krb5_child */ + ret = krb5_child_init(krb5_auth_ctx, bectx); if (ret != EOK) { - DEBUG(1, ("krb5_install_offline_callback failed.\n")); + DEBUG(SSSDBG_FATAL_FAILURE, + ("Could not initialize krb5_child settings: [%s]\n", + strerror(ret))); goto done; } - ret = krb5_install_sigterm_handler(bectx->ev, krb5_auth_ctx); - if (ret != EOK) { - DEBUG(1, ("krb5_install_sigterm_handler failed.\n")); - goto done; - } - - if (debug_to_file != 0) { - ret = open_debug_file_ex("krb5_child", &debug_filep); - if (ret != EOK) { - DEBUG(0, ("Error setting up logging (%d) [%s]\n", - ret, strerror(ret))); - goto done; - } - - krb5_auth_ctx->child_debug_fd = fileno(debug_filep); - if (krb5_auth_ctx->child_debug_fd == -1) { - DEBUG(0, ("fileno failed [%d][%s]\n", errno, strerror(errno))); - ret = errno; - goto done; - } - - v = fcntl(krb5_auth_ctx->child_debug_fd, F_GETFD, 0); - fcntl(krb5_auth_ctx->child_debug_fd, F_SETFD, v & ~FD_CLOEXEC); - } - *ops = &ipa_auth_ops; *pvt_data = ipa_auth_ctx; ret = EOK; diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c index fbea87db4..39635e4e1 100644 --- a/src/providers/krb5/krb5_init.c +++ b/src/providers/krb5/krb5_init.c @@ -29,6 +29,7 @@ #include "util/child_common.h" #include "providers/krb5/krb5_auth.h" #include "providers/krb5/krb5_common.h" +#include "providers/krb5/krb5_init_shared.h" struct krb5_options { struct dp_option *opts; @@ -59,15 +60,12 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, { struct krb5_ctx *ctx = NULL; int ret; - unsigned v; - FILE *debug_filep; const char *krb5_servers; const char *krb5_kpasswd_servers; const char *krb5_realm; const char *errstr; int errval; int errpos; - time_t renew_intv; if (krb5_options == NULL) { krb5_options = talloc_zero(bectx, struct krb5_options); @@ -132,60 +130,15 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, } } - if (dp_opt_get_bool(ctx->opts, KRB5_STORE_PASSWORD_IF_OFFLINE)) { - ret = init_delayed_online_authentication(ctx, bectx, bectx->ev); - if (ret != EOK) { - DEBUG(1, ("init_delayed_online_authentication failed.\n")); - goto fail; - } - } - - renew_intv = dp_opt_get_int(ctx->opts, KRB5_RENEW_INTERVAL); - if (renew_intv > 0) { - ret = init_renew_tgt(ctx, bectx, bectx->ev, renew_intv); - if (ret != EOK) { - DEBUG(1, ("init_renew_tgt failed.\n")); - goto fail; - } - } - - ret = check_and_export_options(ctx->opts, bectx->domain, ctx); - if (ret != EOK) { - DEBUG(1, ("check_and_export_options failed.\n")); - goto fail; - } - - ret = krb5_install_sigterm_handler(bectx->ev, ctx); + /* Initialize features needed by the krb5_child */ + ret = krb5_child_init(ctx, bectx); if (ret != EOK) { - DEBUG(1, ("krb5_install_sigterm_handler failed.\n")); + DEBUG(SSSDBG_FATAL_FAILURE, + ("Could not initialize krb5_child settings: [%s]\n", + strerror(ret))); goto fail; } - ret = krb5_install_offline_callback(bectx, ctx); - if (ret != EOK) { - DEBUG(1, ("krb5_install_offline_callback failed.\n")); - goto fail; - } - - if (debug_to_file != 0) { - ret = open_debug_file_ex("krb5_child", &debug_filep); - if (ret != EOK) { - DEBUG(0, ("Error setting up logging (%d) [%s]\n", - ret, strerror(ret))); - goto fail; - } - - ctx->child_debug_fd = fileno(debug_filep); - if (ctx->child_debug_fd == -1) { - DEBUG(0, ("fileno failed [%d][%s]\n", errno, strerror(errno))); - ret = errno; - goto fail; - } - - v = fcntl(ctx->child_debug_fd, F_GETFD, 0); - fcntl(ctx->child_debug_fd, F_SETFD, v & ~FD_CLOEXEC); - } - ctx->illegal_path_re = pcre_compile2(ILLEGAL_PATH_PATTERN, 0, &errval, &errstr, &errpos, NULL); if (ctx->illegal_path_re == NULL) { diff --git a/src/providers/krb5/krb5_init_shared.c b/src/providers/krb5/krb5_init_shared.c new file mode 100644 index 000000000..7a0149184 --- /dev/null +++ b/src/providers/krb5/krb5_init_shared.c @@ -0,0 +1,94 @@ +/* + SSSD + + Authors: + Stephen Gallagher + + Copyright (C) 2012 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include + +#include "providers/krb5/krb5_common.h" +#include "providers/krb5/krb5_auth.h" + +errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, + struct be_ctx *bectx) +{ + errno_t ret; + FILE *debug_filep; + unsigned v; + time_t renew_intv; + + if (dp_opt_get_bool(krb5_auth_ctx->opts, KRB5_STORE_PASSWORD_IF_OFFLINE)) { + ret = init_delayed_online_authentication(krb5_auth_ctx, bectx, + bectx->ev); + if (ret != EOK) { + DEBUG(1, ("init_delayed_online_authentication failed.\n")); + goto done; + } + } + + renew_intv = dp_opt_get_int(krb5_auth_ctx->opts, KRB5_RENEW_INTERVAL); + if (renew_intv > 0) { + ret = init_renew_tgt(krb5_auth_ctx, bectx, bectx->ev, renew_intv); + if (ret != EOK) { + DEBUG(1, ("init_renew_tgt failed.\n")); + goto done; + } + } + + ret = check_and_export_options(krb5_auth_ctx->opts, bectx->domain, + krb5_auth_ctx); + if (ret != EOK) { + DEBUG(1, ("check_and_export_opts failed.\n")); + goto done; + } + + ret = krb5_install_offline_callback(bectx, krb5_auth_ctx); + if (ret != EOK) { + DEBUG(1, ("krb5_install_offline_callback failed.\n")); + goto done; + } + + ret = krb5_install_sigterm_handler(bectx->ev, krb5_auth_ctx); + if (ret != EOK) { + DEBUG(1, ("krb5_install_sigterm_handler failed.\n")); + goto done; + } + + if (debug_to_file != 0) { + ret = open_debug_file_ex("krb5_child", &debug_filep); + if (ret != EOK) { + DEBUG(0, ("Error setting up logging (%d) [%s]\n", + ret, strerror(ret))); + goto done; + } + + krb5_auth_ctx->child_debug_fd = fileno(debug_filep); + if (krb5_auth_ctx->child_debug_fd == -1) { + DEBUG(0, ("fileno failed [%d][%s]\n", errno, strerror(errno))); + ret = errno; + goto done; + } + + v = fcntl(krb5_auth_ctx->child_debug_fd, F_GETFD, 0); + fcntl(krb5_auth_ctx->child_debug_fd, F_SETFD, v & ~FD_CLOEXEC); + } + +done: + return ret; +} diff --git a/src/providers/krb5/krb5_init_shared.h b/src/providers/krb5/krb5_init_shared.h new file mode 100644 index 000000000..883b84ff3 --- /dev/null +++ b/src/providers/krb5/krb5_init_shared.h @@ -0,0 +1,29 @@ +/* + SSSD + + Authors: + Stephen Gallagher + + Copyright (C) 2012 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef KRB5_INIT_SHARED_H_ +#define KRB5_INIT_SHARED_H_ + +errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, + struct be_ctx *bectx); + +#endif /* KRB5_INIT_SHARED_H_ */ -- cgit