sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

s3: Make nmbd socket dir configurable

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Jan  7 14:14:19 CET 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-01-06 12:33:44 +01:00 committed by Volker Lendecke
parent 2672101cc4
commit 3e0915f271
5 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/Makefile.in
View File

@ -177,6 +177,9 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
# the directory where nmbd listens on the unexpected socket
NMBDSOCKETDIR = @nmbdsocketdir@
FLAGS = -I. \
-I$(srcdir) \
@FLAGS1@ \
@ -206,6 +209,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
-DCODEPAGEDIR=\"$(CODEPAGEDIR)\" \
-DCACHEDIR=\"$(CACHEDIR)\" \
-DSTATEDIR=\"$(STATEDIR)\" \
-DNMBDSOCKETDIR=\"$(NMBDSOCKETDIR)\" \
-DLOCALEDIR=\"$(LOCALEDIR)\"
# Note that all executable programs now provide for an optional executable suffix.
@ -3150,6 +3154,7 @@ installdirs::
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \
$(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \
$(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
$(NMBDSOCKETDIR) \
$(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
installservers:: all installdirs
@ -3228,6 +3233,7 @@ showlayout::
@echo " statedir: $(STATEDIR)"
@echo " cachedir: $(CACHEDIR)"
@echo " piddir: $(PIDDIR)"
@echo " nmbdsocketdir: $(NMBSOCKETDIR)"
@echo " swatdir: $(SWATDIR)"
@echo " datadir: ${DATADIR}"
@echo " codepagedir: $(CODEPAGEDIR)"

1
source3/dynconfig.c
View File

@ -79,6 +79,7 @@ DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */
DEFINE_DYN_CONFIG_PARAM(CACHEDIR) /** Temporary cache files. Default LOCKDIR */
DEFINE_DYN_CONFIG_PARAM(PIDDIR)
DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)

4
source3/include/dynconfig.h
View File

@ -79,6 +79,10 @@ const char *get_dyn_PIDDIR(void);
const char *set_dyn_PIDDIR(const char *newpath);
bool is_default_dyn_PIDDIR(void);
const char *get_dyn_NMBDSOCKETDIR(void);
const char *set_dyn_NMBDSOCKETDIR(const char *newpath);
bool is_default_dyn_NMBDSOCKETDIR(void);
const char *get_dyn_NCALRPCDIR(void);
const char *set_dyn_NCALRPCDIR(const char *newpath);
bool is_default_dyn_NCALRPCDIR(void);

3
source3/libsmb/unexpected.c
View File

@ -23,7 +23,8 @@
static const char *nmbd_socket_dir(void)
{
return lp_parm_const_string(-1, "nmbd", "socket dir", "/tmp/.nmbd");
return lp_parm_const_string(-1, "nmbd", "socket dir",
get_dyn_NMBDSOCKETDIR());
}
struct nb_packet_query {

18
source3/m4/check_path.m4
View File

@ -19,6 +19,7 @@ rootsbindir="\${SBINDIR}"
lockdir="\${VARDIR}/locks"
piddir="\${VARDIR}/locks"
ncalrpcdir="\${VARDIR}/ncalrpc"
nmbdsocketdir="${lockdir}/.nmbd"
test "${mandir}" || mandir="\${prefix}/man"
logfilebase="\${VARDIR}"
privatedir="\${prefix}/private"
@ -165,6 +166,22 @@ AC_ARG_WITH(ncalrpcdir,
;;
esac])
#################################################
# set nmbd socket directory location
AC_ARG_WITH(nmbdsocketdir,
[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory (${lockdir}/.nmbd)])],
[ case "$withval" in
yes|no)
#
# Just in case anybody calls it without argument
#
AC_MSG_WARN([--with-nmbdsocketdir called without argument - will use default])
;;
* )
nmbdsocketdir="$withval"
;;
esac])
#################################################
# set SWAT directory location
AC_ARG_WITH(swatdir,
@ -298,6 +315,7 @@ AC_ARG_WITH(codepagedir,
AC_SUBST(configdir)
AC_SUBST(lockdir)
AC_SUBST(piddir)
AC_SUBST(nmbdsocketdir)
AC_SUBST(ncalrpcdir)
AC_SUBST(logfilebase)
AC_SUBST(privatedir)