summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-06 19:01:27 -0800
committerJeremy Allison <jra@samba.org>2007-12-06 19:01:27 -0800
commit77652360ec78807bbd2c7989bc9ea06943a6b2d1 (patch)
tree9fc9c0740195cc28850df3397d0a2c02af9d4d83
parente2ae63bcf72ac6a98d3b74281cba514b2e53f306 (diff)
downloadsamba-77652360ec78807bbd2c7989bc9ea06943a6b2d1.tar.gz
samba-77652360ec78807bbd2c7989bc9ea06943a6b2d1.tar.bz2
samba-77652360ec78807bbd2c7989bc9ea06943a6b2d1.zip
These should be char *, but replace them with [1024] for now
to eliminate the pstring data type. Jeremy (This used to be commit d690ba77107d8c2b722972300272f9d540641ce9)
-rw-r--r--source3/dynconfig.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index 01460b8363..c9dcea5204 100644
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -43,27 +43,28 @@ char const *dyn_SBINDIR = SBINDIR,
*dyn_BINDIR = BINDIR,
*dyn_SWATDIR = SWATDIR;
-pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
+/* JRA - FIXME - these should be dynamic char * */
+char dyn_CONFIGFILE[1024] = CONFIGFILE; /**< Location of smb.conf file. **/
/** Log file directory. **/
-pstring dyn_LOGFILEBASE = LOGFILEBASE;
+char dyn_LOGFILEBASE[1024] = LOGFILEBASE;
/** Statically configured LanMan hosts. **/
-pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
+char dyn_LMHOSTSFILE[1024] = LMHOSTSFILE;
/**
* @brief Samba data directory.
*
* @sa data_path() to get the path to a file inside the CODEPAGEDIR.
**/
-pstring dyn_CODEPAGEDIR = CODEPAGEDIR;
+char dyn_CODEPAGEDIR[1024] = CODEPAGEDIR;
/**
* @brief Samba library directory.
*
* @sa lib_path() to get the path to a file inside the LIBDIR.
**/
-pstring dyn_LIBDIR = LIBDIR;
+char dyn_LIBDIR[1024] = LIBDIR;
fstring dyn_SHLIBEXT = SHLIBEXT;
/**
@@ -71,11 +72,11 @@ fstring dyn_SHLIBEXT = SHLIBEXT;
*
* Not writable, but used to set a default in the parameter table.
**/
-pstring dyn_LOCKDIR = LOCKDIR;
-pstring dyn_PIDDIR = PIDDIR;
+char dyn_LOCKDIR[1024] = LOCKDIR;
+char dyn_PIDDIR[1024] = PIDDIR;
-pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
-pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
+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 =';