Skip to content

Commit

Permalink
Allow configuration of the SSSD through /etc/sssd/sssd.conf
Browse files Browse the repository at this point in the history
The SSSD now links with the ini_config and collection libraries
in the common directory.

The monitor will track changes to the /etc/sssd/sssd.conf file
using inotify on platforms that support it, or polled every 5
seconds on platforms that do not.

At startup or modification of the conf file, the monitor will
purge the existing confdb and reread it completely from the conf
file, to ensure that there are no lingering entries. It does this
in a transaction, so there should be no race condition with the
client services.

A new option has been added to the startup options for the SSSD.
It is now possible to specify an alternate config file with the
-c <file> at the command line.
  • Loading branch information
sgallagher authored and simo5 committed Apr 13, 2009
1 parent c1d6bff commit 4626af1
Show file tree
Hide file tree
Showing 11 changed files with 686 additions and 274 deletions.
19 changes: 15 additions & 4 deletions server/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ builddir = @builddir@
sharedbuilddir = @sharedbuilddir@
INSTALLCMD = @INSTALL@
EXTRA_OBJ=@EXTRA_OBJ@
SSSD_CONF_DIR = @sysconfdir@/sssd
SSSD_LIBEXEC_PATH = @libexecdir@/@PACKAGE_NAME@
SSSD_LIBDIR = @pluginpath@
LDB_LIBDIR = @libdir@/ldb
Expand Down Expand Up @@ -62,6 +63,12 @@ OPENLDAP_LIBS = @OPENLDAP_LIBS@
LDAP_CFLAGS = $(OPENLDAP_CFLAGS)
LDAP_LIBS = $(OPENLDAP_LIBS)

COLLECTION_CFLAGS = -I ../common/collection -I../common/trace
COLLECTION_LIBS = -L ../common/collection/.libs/ -lcollection

INI_CFG_CFLAGS = -I ../common/ini
INI_CFG_LIBS = -L ../common/ini/.libs/ -lini_config

LIBDL = @LIBDL@

SHLIBEXT = @SHLIBEXT@
Expand All @@ -72,13 +79,15 @@ SHLD_FLAGS = @SHLD_FLAGS@
SONAMEFLAG = @SONAMEFLAG@

LDFLAGS += @LDFLAGS@ -L$(srcdir)/lib
LIBS = @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS) $(TEVENT_LIBS) $(POPT_LIBS) $(LDB_LIBS) $(DBUS_LIBS) $(PCRE_LIBS)
LIBS = @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS) $(TEVENT_LIBS) $(POPT_LIBS) $(LDB_LIBS) $(DBUS_LIBS) $(PCRE_LIBS) $(INI_CFG_LIBS) $(COLLECTION_LIBS)

PICFLAG = @PICFLAG@
CFLAGS := -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(TEVENT_CFLAGS) $(LDB_CFLAGS) $(DBUS_CFLAGS) $(CHECK_CFLAGS) $(PCRE_CFLAGS) \
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(TEVENT_CFLAGS) \
$(LDB_CFLAGS) $(DBUS_CFLAGS) $(CHECK_CFLAGS) $(PCRE_CFLAGS) \
$(COLLECTION_CFLAGS) $(INI_CFG_CFLAGS)\
-DLIBDIR=\"$(libdir)\" -DVARDIR=\"$(localstatedir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DSSSD_LIBEXEC_PATH=\"$(SSSD_LIBEXEC_PATH)\" \
-DSSSD_INTROSPECT_PATH=\"$(SSSD_INTROSPECT_PATH)\" -DUSE_MMAP=1 $(CFLAGS)
-DSSSD_INTROSPECT_PATH=\"$(SSSD_INTROSPECT_PATH)\" -DSSSD_CONF_DIR=\"$(SSSD_CONF_DIR)\" -DUSE_MMAP=1 $(CFLAGS)

MDLD = @MDLD@
MDLD_FLAGS = @MDLD_FLAGS@
Expand Down Expand Up @@ -109,6 +118,7 @@ OBJS = $(SERVER_OBJ) $(EXTRA_OBJ)
headers =

DBUS_SYSBUS_POLICY_DIR = @sysconfdir@/dbus-1/system.d
SSSD_CONF_FILE = etc/sssd.conf

LIBEXECBINS = sbin/sssd_nss sbin/sssd_dp sbin/sssd_be sbin/sssd_pam
ifneq (x$(HAVE_INFOPIPE), x)
Expand Down Expand Up @@ -180,7 +190,8 @@ installdirs::
$(DESTDIR)$(SSSD_INTROSPECT_PATH)/infopipe \
$(DESTDIR)$(SSSD_PIPE_PATH)/private \
$(DESTDIR)$(SSSD_DB_PATH) \
$(DESTDIR)$(SSSD_PID_PATH)
$(DESTDIR)$(SSSD_PID_PATH) \
$(DESTDIR)$(SSSD_CONF_DIR)

installheaders:: installdirs
ifneq (x$(headers), x)
Expand Down
Loading

0 comments on commit 4626af1

Please sign in to comment.