s3:auth:sam_password_ok: fix allocation of a data blob.

[samba.git] / source3 / dynconfig.c

diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index c9dcea5204cd0d1e8cd792572a7893a773ac305c..dfec0c3baa8a3562c52be1aabfc51e7b33f488c8 100644 (file)
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -1,18 +1,19 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
    Copyright (C) 2003 by Jim McDonough <jmcd@us.ibm.com>
-   
+   Copyright (C) 2007 by Jeremy Allison <jra@samba.org>
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -39,65 +40,45 @@
  * table?  There's kind of a chicken-and-egg situation there...
  **/
 
-char const *dyn_SBINDIR = SBINDIR,
-       *dyn_BINDIR = BINDIR,
-       *dyn_SWATDIR = SWATDIR;
-
-/* JRA - FIXME - these should be dynamic char * */
-char dyn_CONFIGFILE[1024] = CONFIGFILE; /**< Location of smb.conf file. **/
-
-/** Log file directory. **/
-char dyn_LOGFILEBASE[1024] = LOGFILEBASE;
-
-/** Statically configured LanMan hosts. **/
-char dyn_LMHOSTSFILE[1024] = LMHOSTSFILE;
-
-/**
- * @brief Samba data directory.
- *
- * @sa data_path() to get the path to a file inside the CODEPAGEDIR.
- **/
-char dyn_CODEPAGEDIR[1024] = CODEPAGEDIR;
-
-/**
- * @brief Samba library directory.
- *
- * @sa lib_path() to get the path to a file inside the LIBDIR.
- **/
-char dyn_LIBDIR[1024] = LIBDIR;
-fstring dyn_SHLIBEXT = SHLIBEXT;
-
-/**
- * @brief Directory holding lock files.
- *
- * Not writable, but used to set a default in the parameter table.
- **/
-char dyn_LOCKDIR[1024] = LOCKDIR;
-char dyn_PIDDIR[1024]  = PIDDIR;
-
-char dyn_SMB_PASSWD_FILE[1024] = SMB_PASSWD_FILE;
-char dyn_PRIVATE_DIR[1024] = PRIVATE_DIR;
-
-
-/* In non-FHS mode, these should be configurable using 'lock dir =';
-   but in FHS mode, they are their own directory.  Implement as wrapper
-   functions so that everything can still be kept in dynconfig.c.
- */
-
-char *dyn_STATEDIR(void)
-{
-#ifdef FHS_COMPATIBLE
-       return STATEDIR;
-#else
-       return lp_lockdir();
-#endif
+#define DEFINE_DYN_CONFIG_PARAM(name) \
+static char *dyn_##name; \
+\
+ const char *get_dyn_##name(void) \
+{\
+       if (dyn_##name == NULL) {\
+               return name;\
+       }\
+       return dyn_##name;\
+}\
+\
+ const char *set_dyn_##name(const char *newpath) \
+{\
+       if (dyn_##name) {\
+               SAFE_FREE(dyn_##name);\
+       }\
+       dyn_##name = SMB_STRDUP(newpath);\
+       return dyn_##name;\
+}\
+\
+ bool is_default_dyn_##name(void) \
+{\
+       return (dyn_##name == NULL);\
 }
 
-char *dyn_CACHEDIR(void)
-{
-#ifdef FHS_COMPATIBLE
-       return CACHEDIR;
-#else
-       return lp_lockdir();
-#endif
-}
+DEFINE_DYN_CONFIG_PARAM(SBINDIR)
+DEFINE_DYN_CONFIG_PARAM(BINDIR)
+DEFINE_DYN_CONFIG_PARAM(SWATDIR)
+DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
+DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
+DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
+DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
+DEFINE_DYN_CONFIG_PARAM(LIBDIR)
+DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
+DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
+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(NCALRPCDIR)
+DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
+DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)