diff options
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | src/providers/data_provider_be.c | 2 | ||||
-rw-r--r-- | src/providers/dp_backend.h | 2 | ||||
-rw-r--r-- | src/providers/ipa/ipa_dyndns.c | 2 | ||||
-rw-r--r-- | src/providers/ipa/ipa_init.c | 2 | ||||
-rw-r--r-- | src/providers/krb5/krb5_auth.c | 2 | ||||
-rw-r--r-- | src/providers/krb5/krb5_auth.h | 2 | ||||
-rw-r--r-- | src/providers/krb5/krb5_child.c | 2 | ||||
-rw-r--r-- | src/providers/krb5/krb5_child_handler.c | 2 | ||||
-rw-r--r-- | src/providers/krb5/krb5_init.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/ldap_child.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/ldap_init.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_child_helpers.c | 2 | ||||
-rw-r--r-- | src/util/child_common.c (renamed from src/providers/child_common.c) | 2 | ||||
-rw-r--r-- | src/util/child_common.h (renamed from src/providers/child_common.h) | 0 |
15 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 7ebf29f46..f6b340a57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -327,7 +327,7 @@ dist_noinst_HEADERS = \ src/providers/dp_backend.h \ src/providers/fail_over.h \ src/providers/providers.h \ - src/providers/child_common.h \ + src/util/child_common.h \ src/providers/simple/simple_access.h \ src/providers/krb5/krb5_auth.h \ src/providers/krb5/krb5_common.h \ @@ -366,6 +366,9 @@ libsss_debug_la_SOURCES = \ src/util/debug.c \ src/util/sss_log.c +noinst_LTLIBRARIES += libsss_child.la +libsss_child_la_SOURCES = src/util/child_common.c + noinst_LTLIBRARIES += libsss_util.la libsss_util_la_SOURCES = \ src/confdb/confdb.c \ @@ -395,6 +398,7 @@ libsss_util_la_SOURCES = \ libsss_util_la_LIBADD = \ $(SSSD_LIBS) \ $(UNICODE_LIBS) \ + libsss_child.la \ libsss_crypt.la \ libsss_debug.la if BUILD_SUDO @@ -461,7 +465,6 @@ sssd_sudo_LDADD = \ endif sssd_be_SOURCES = \ - src/providers/child_common.c \ src/providers/data_provider_be.c \ src/providers/data_provider_fo.c \ src/providers/data_provider_opts.c \ @@ -870,7 +873,6 @@ dist_noinst_DATA += \ #################### libsss_ldap_la_SOURCES = \ src/util/find_uid.c \ - src/providers/child_common.c \ src/providers/ldap/ldap_id.c \ src/providers/ldap/ldap_id_enum.c \ src/providers/ldap/ldap_id_cleanup.c \ @@ -938,7 +940,6 @@ libsss_simple_la_LDFLAGS = \ libsss_krb5_la_SOURCES = \ src/util/find_uid.c \ - src/providers/child_common.c \ src/providers/krb5/krb5_utils.c \ src/providers/krb5/krb5_become_user.c \ src/providers/krb5/krb5_delayed_online_authentication.c \ @@ -963,7 +964,6 @@ libsss_krb5_la_LDFLAGS = \ -module libsss_ipa_la_SOURCES = \ - src/providers/child_common.c \ src/providers/ipa/ipa_init.c \ src/providers/ipa/ipa_common.c \ src/providers/ipa/ipa_utils.c \ @@ -1026,7 +1026,6 @@ libsss_ipa_la_LDFLAGS = \ krb5_child_SOURCES = \ src/providers/krb5/krb5_become_user.c \ src/providers/krb5/krb5_child.c \ - src/providers/child_common.c \ src/providers/dp_pam_data_util.c \ src/util/user_info_msg.c \ src/util/sss_krb5.c \ @@ -1038,6 +1037,7 @@ krb5_child_CFLAGS = \ $(KRB5_CFLAGS) krb5_child_LDADD = \ libsss_debug.la \ + libsss_child.la \ $(TALLOC_LIBS) \ $(TEVENT_LIBS) \ $(POPT_LIBS) \ @@ -1046,7 +1046,6 @@ krb5_child_LDADD = \ ldap_child_SOURCES = \ src/providers/ldap/ldap_child.c \ - src/providers/child_common.c \ src/util/sss_krb5.c \ src/util/util.c \ src/util/signal.c @@ -1056,6 +1055,7 @@ ldap_child_CFLAGS = \ $(KRB5_CFLAGS) ldap_child_LDADD = \ libsss_debug.la \ + libsss_child.la \ $(TALLOC_LIBS) \ $(TEVENT_LIBS) \ $(POPT_LIBS) \ diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index fb4da87c4..bf77c5f6e 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -42,7 +42,7 @@ #include "sbus/sssd_dbus.h" #include "providers/dp_backend.h" #include "providers/fail_over.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "resolv/async_resolv.h" #include "monitor/monitor_interfaces.h" diff --git a/src/providers/dp_backend.h b/src/providers/dp_backend.h index 3d1c6bf25..f462b82df 100644 --- a/src/providers/dp_backend.h +++ b/src/providers/dp_backend.h @@ -24,7 +24,7 @@ #include "providers/data_provider.h" #include "providers/fail_over.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "db/sysdb.h" /* a special token, if used in place of the hostname, denotes that real diff --git a/src/providers/ipa/ipa_dyndns.c b/src/providers/ipa/ipa_dyndns.c index e579e1d9c..60bc6ec0c 100644 --- a/src/providers/ipa/ipa_dyndns.c +++ b/src/providers/ipa/ipa_dyndns.c @@ -33,7 +33,7 @@ #include "confdb/confdb.h" #include "providers/ipa/ipa_common.h" #include "providers/ipa/ipa_dyndns.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/data_provider.h" #include "providers/ldap/ldap_common.h" #include "providers/ldap/sdap_async_private.h" diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index 57b4180cc..9acee7bf2 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/ipa/ipa_common.h" #include "providers/krb5/krb5_auth.h" #include "providers/ipa/ipa_id.h" diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index f177be513..6aaf7fbef 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -35,7 +35,7 @@ #include "util/util.h" #include "util/find_uid.h" #include "db/sysdb.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/krb5/krb5_auth.h" #include "providers/krb5/krb5_utils.h" diff --git a/src/providers/krb5/krb5_auth.h b/src/providers/krb5/krb5_auth.h index 0d6318d12..89b77d366 100644 --- a/src/providers/krb5/krb5_auth.h +++ b/src/providers/krb5/krb5_auth.h @@ -30,7 +30,7 @@ #include "util/sss_krb5.h" #include "providers/dp_backend.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/krb5/krb5_common.h" #define CCACHE_ENV_NAME "KRB5CCNAME" diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index fe8721094..01690cf4a 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -32,7 +32,7 @@ #include "util/util.h" #include "util/sss_krb5.h" #include "util/user_info_msg.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/dp_backend.h" #include "providers/krb5/krb5_auth.h" #include "providers/krb5/krb5_utils.h" diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c index bafa0bbf2..990a9eccb 100644 --- a/src/providers/krb5/krb5_child_handler.c +++ b/src/providers/krb5/krb5_child_handler.c @@ -23,7 +23,7 @@ */ #include "util/util.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/krb5/krb5_common.h" #include "providers/krb5/krb5_auth.h" #include "src/providers/krb5/krb5_utils.h" diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c index 6176dd187..3c39d847e 100644 --- a/src/providers/krb5/krb5_init.c +++ b/src/providers/krb5/krb5_init.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/krb5/krb5_auth.h" #include "providers/krb5/krb5_common.h" diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index 02c7e5573..160cc1ce4 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -31,7 +31,7 @@ #include "util/util.h" #include "util/sss_krb5.h" -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/dp_backend.h" static krb5_context krb5_error_ctx; diff --git a/src/providers/ldap/ldap_init.c b/src/providers/ldap/ldap_init.c index e7be90d9b..8c4d3e684 100644 --- a/src/providers/ldap/ldap_init.c +++ b/src/providers/ldap/ldap_init.c @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "providers/child_common.h" +#include "util/child_common.h" #include "providers/ldap/ldap_common.h" #include "providers/ldap/sdap_async_private.h" #include "providers/ldap/sdap_access.h" diff --git a/src/providers/ldap/sdap_child_helpers.c b/src/providers/ldap/sdap_child_helpers.c index 5990fc3ac..704c89ec3 100644 --- a/src/providers/ldap/sdap_child_helpers.c +++ b/src/providers/ldap/sdap_child_helpers.c @@ -32,7 +32,7 @@ #include "util/sss_krb5.h" #include "providers/ldap/ldap_common.h" #include "providers/ldap/sdap_async_private.h" -#include "providers/child_common.h" +#include "util/child_common.h" #ifndef SSSD_LIBEXEC_PATH #error "SSSD_LIBEXEC_PATH not defined" diff --git a/src/providers/child_common.c b/src/util/child_common.c index 34602a41f..6214c7cc3 100644 --- a/src/providers/child_common.c +++ b/src/util/child_common.c @@ -31,7 +31,7 @@ #include "util/util.h" #include "util/find_uid.h" #include "db/sysdb.h" -#include "providers/child_common.h" +#include "util/child_common.h" struct sss_sigchild_ctx { struct tevent_context *ev; diff --git a/src/providers/child_common.h b/src/util/child_common.h index 1e9f1b6c1..1e9f1b6c1 100644 --- a/src/providers/child_common.h +++ b/src/util/child_common.h |