summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-14 15:00:32 +1000
committerStefan Metzmacher <metze@samba.org>2011-06-24 22:45:46 +0200
commit5be934eac2b4f0fdc4f67e273f88f1af9aecffdb (patch)
treeec3476abbcc95798cc96b3da62f1b0d1a661ee56
parentded32a34f4d43e598044508d7322ba527d167af8 (diff)
downloadsamba-5be934eac2b4f0fdc4f67e273f88f1af9aecffdb.tar.gz
samba-5be934eac2b4f0fdc4f67e273f88f1af9aecffdb.tar.bz2
samba-5be934eac2b4f0fdc4f67e273f88f1af9aecffdb.zip
s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
This is consistent with the new ncalrpc socket directory, also added in this release. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org> The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden name PREFIX/var/nmbd). (cherry picked from commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d) Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/m4/check_path.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index f04e6f89c0..65db076ee6 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -19,7 +19,7 @@ rootsbindir="\${SBINDIR}"
lockdir="\${VARDIR}/locks"
piddir="\${VARDIR}/locks"
ncalrpcdir="\${VARDIR}/ncalrpc"
-nmbdsocketdir="${lockdir}/.nmbd"
+nmbdsocketdir="\${VARDIR}/nmbd"
test "${mandir}" || mandir="\${prefix}/man"
logfilebase="\${VARDIR}"
privatedir="\${prefix}/private"
@@ -169,7 +169,7 @@ AC_ARG_WITH(ncalrpcdir,
#################################################
# set nmbd socket directory location
AC_ARG_WITH(nmbdsocketdir,
-[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory (${lockdir}/.nmbd)])],
+[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory ($ac_default_prefix/var/nmbd)])],
[ case "$withval" in
yes|no)
#