diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2014-02-05 10:59:46 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-02-06 16:17:27 -0500 |
| commit | 1e4bdcfed2c7bda94d5c135cc32a5993ca032501 (patch) | |
| tree | d4a0a8ee96b73ad78152e1219183eb2787493897 /src/include | |
| parent | 53cfb8327c452bd72a8e915338fb5ec838079cd3 (diff) | |
| download | krb5-1e4bdcfed2c7bda94d5c135cc32a5993ca032501.tar.gz krb5-1e4bdcfed2c7bda94d5c135cc32a5993ca032501.tar.xz krb5-1e4bdcfed2c7bda94d5c135cc32a5993ca032501.zip | |
Move OTP sockets to KDC_RUN_DIR
Some system configurations expect Unix-domain sockets to live under
/run or /var/run, and not other parts of /var where persistent
application state lives. Define a new directory KDC_RUN_DIR using
$runstatedir (new in autoconf 2.70, so fall back to $localstatedir/run
if it's not set) and use that for the default socket path.
[ghudson@mit.edu: commit message, otp.rst formatting fix]
ticket: 7859 (new)
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/Makefile.in | 2 | ||||
| -rw-r--r-- | src/include/osconf.hin | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/include/Makefile.in b/src/include/Makefile.in index e13042a856..f83ff4eaa7 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -53,6 +53,7 @@ autoconf.stamp: $(srcdir)/autoconf.h.in $(BUILDTOP)/config.status SYSCONFDIR = @sysconfdir@ LOCALSTATEDIR = @localstatedir@ +RUNSTATEDIR = @runstatedir@ BINDIR = @bindir@ SBINDIR = @sbindir@ LIBDIR = @libdir@ @@ -66,6 +67,7 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ -e "s+@MODULEDIR+$(MODULE_DIR)+" \ -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \ -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ + -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \ -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \ -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' diff --git a/src/include/osconf.hin b/src/include/osconf.hin index 90ab86d129..871503ab1b 100644 --- a/src/include/osconf.hin +++ b/src/include/osconf.hin @@ -59,6 +59,7 @@ #define PLUGIN_EXT "@DYNOBJEXT" #define KDC_DIR "@LOCALSTATEDIR/krb5kdc" +#define KDC_RUN_DIR "@RUNSTATEDIR/krb5kdc" #define DEFAULT_KDB_FILE KDC_DIR "/principal" #define DEFAULT_KEYFILE_STUB KDC_DIR "/.k5." #define KRB5_DEFAULT_ADMIN_ACL KDC_DIR "/krb5_adm.acl" |