Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MONITOR: remove nscd conf check #7820

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,6 @@ endif
sssd_SOURCES = \
src/monitor/monitor.c \
src/monitor/monitor_bootstrap.c \
src/monitor/nscd.c \
src/confdb/confdb_setup.c \
$(NULL)

Expand Down
4 changes: 0 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,6 @@ AC_SUBST(UNICODE_LIBS)

WITH_LIBNL

AS_IF([test x$HAVE_NSCD], [
WITH_NSCD_CONF
])

WITH_INITSCRIPT
AS_IF([test x$initscript = xsystemd], [
m4_include([src/external/systemd.m4])
Expand Down
13 changes: 0 additions & 13 deletions src/conf_macros.m4
Original file line number Diff line number Diff line change
Expand Up @@ -462,19 +462,6 @@ AC_DEFUN([WITH_IPA_GETKEYTAB],
AC_DEFINE_UNQUOTED(IPA_GETKEYTAB_PATH, "$IPA_GETKEYTAB_PATH", [The path to the ipa-getkeytab utility])
])

AC_DEFUN([WITH_NSCD_CONF],
[ AC_ARG_WITH([nscd_conf],
[AC_HELP_STRING([--with-nscd-conf=PATH], [Path to nscd.conf file [/etc/nscd.conf]])
]
)

NSCD_CONF_PATH="/etc/nscd.conf"
if test x"$with_nscd_conf" != x; then
NSCD_CONF_PATH=$with_nscd_conf
fi
AC_DEFINE_UNQUOTED([NSCD_CONF_PATH], ["$NSCD_CONF_PATH"], [NSCD configuration file])
])

AC_DEFUN([WITH_GPO_CACHE_PATH],
[ AC_ARG_WITH([gpo-cache-path],
[AC_HELP_STRING([--with-gpo-cache-path=PATH],
Expand Down
5 changes: 0 additions & 5 deletions src/monitor/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -1774,9 +1774,6 @@ static void monitor_restart_service(struct mt_svc *svc)
}
}

/* from nscd.c */
void check_nscd(void);

#ifdef BUILD_CONF_SERVICE_USER_SUPPORT
int bootstrap_monitor_process(uid_t target_uid, gid_t target_gid);
#else
Expand Down Expand Up @@ -1986,8 +1983,6 @@ int main(int argc, const char *argv[])
}
}

check_nscd();

/* set up things like debug, signals, daemonization, etc. */
ret = close(STDIN_FILENO);
if (ret != EOK) {
Expand Down
185 changes: 0 additions & 185 deletions src/monitor/nscd.c

This file was deleted.