sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Move all other paths into dynconfig

Browse Source
This commit is contained in:
Martin Pool -
parent ebd46aebf9
commit d51ef6bfa3
5 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Makefile.in
View File

@ -69,20 +69,20 @@ LOCKDIR = @lockdir@
# man pages language(s)
man_langs = "@manlangs@"
PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir)
FLAGS2 =
FLAGS3 =
FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
FLAGS = $(ISA) $(FLAGS5)
FLAGS32 = $(ISA32) $(FLAGS5)
PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\"
PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\"
PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\"
PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\"
PATH_FLAGS = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" -DLOGFILEBASE=\"$(LOGFILEBASE)\"
PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" -DLOGFILEBASE=\"$(LOGFILEBASE)\"
PATH_FLAGS = $(PATH_FLAGS5) $(PASSWD_FLAGS)
WINBIND_PROGS = bin/wbinfo
WINBIND_SPROGS = bin/winbindd

17
source/dynconfig.c
View File

@ -45,20 +45,29 @@ char const *dyn_SBINDIR = SBINDIR,
pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
pstring dyn_LOGFILEBASE; /**< Log file directory. **/
/** Log file directory. **/
pstring dyn_LOGFILEBASE = LOGFILEBASE;
pstring dyn_LMHOSTSFILE; /**< Statically configured LanMan hosts. **/
/** Statically configured LanMan hosts. **/
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
/**
* @brief Samba library directory.
*
* @sa lib_path() to get the path to a file inside the LIBDIR.
**/
pstring dyn_LIBDIR;
pstring dyn_LIBDIR = LIBDIR;
/**
* @brief Directory holding lock files.
*
* Not writable, but used to set a default in the parameter table.
**/
const pstring dyn_LOCKDIR;
const pstring dyn_LOCKDIR = LOCKDIR;
const pstring dyn_DRIVERFILE = DRIVERFILE;
const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;

3
source/include/dynconfig.h
View File

@ -31,3 +31,6 @@ extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
extern pstring dyn_LIBDIR;
extern const pstring dyn_LOCKDIR;
extern const pstring dyn_DRIVERFILE;
extern const pstring dyn_SMB_PASSWD_FILE;
extern const pstring dyn_PRIVATE_DIR;

6
source/param/loadparm.c
View File

@ -1045,7 +1045,7 @@ Initialise the sDefault parameter structure for the printer values.
static void init_printer_values(void)
{
string_set(&sDefault.szPrinterDriver, "");
string_set(&sDefault.szDriverFile, DRIVERFILE);
string_set(&sDefault.szDriverFile, dyn_DRIVERFILE);
/* choose defaults depending on the type of printing */
switch (sDefault.iPrinting)
@ -1186,8 +1186,8 @@ static void init_globals(void)
DEBUG(3, ("Initialising global parameters\n"));
string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE);
string_set(&Globals.szPrivateDir, PRIVATE_DIR);
string_set(&Globals.szSMBPasswdFile, dyn_SMB_PASSWD_FILE);
string_set(&Globals.szPrivateDir, dyn_PRIVATE_DIR);
string_set(&Globals.szPassdbModulePath, "");
string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);

10
source/smbd/build_options.c
View File

@ -195,16 +195,8 @@ void build_options(BOOL screen)
output(screen," SBINDIR: %s\n", dyn_SBINDIR);
output(screen," BINDIR: %s\n", dyn_BINDIR);
output(screen," LOCKDIR: %s\n",dyn_LOCKDIR);
#ifdef DRIVERFILE
output(screen," DRIVERFILE: %s\n",DRIVERFILE);
#endif
output(screen," DRIVERFILE: %s\n", dyn_DRIVERFILE);
output(screen," LOGFILEBASE: %s\n", dyn_LOGFILEBASE);
#ifdef FORMSFILE
output(screen," FORMSFILE: %s\n",FORMSFILE);
#endif
#ifdef NTDRIVERSDIR
output(screen," NTDRIVERSDIR: %s\n",NTDRIVERSDIR);
#endif
/*Output various other options (most map to defines in the configure script*/
output(screen,"\nOther Build Options:\n");