Even if the 'device type' is always an ascii string, use push_string to get

[jra/samba/.git] / source3 / dynconfig.c

diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index 22d6caa8cf2dd02ab1adb278b62117e4b10962db..34c716926ccf9a803e72dfd98cae4085b4050607 100644 (file)
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -1,6 +1,7 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+   Copyright (C) 2003 by Jim McDonough <jmcd@us.ibm.com>
    
    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
@@ -34,6 +35,9 @@
  * they can for example consistently be set across the whole of Samba
  * by command-line parameters, config file entries, or environment
  * variables.
+ *
+ * @todo Perhaps eventually these should be merged into the parameter
+ * table?  There's kind of a chicken-and-egg situation there...
  **/
 
 char const *dyn_SBINDIR = SBINDIR,
@@ -42,4 +46,27 @@ 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;
+
+/** 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 = LIBDIR;
+const fstring dyn_SHLIBEXT = SHLIBEXT;
+
+/**
+ * @brief Directory holding lock files.
+ *
+ * Not writable, but used to set a default in the parameter table.
+ **/
+const pstring dyn_LOCKDIR = LOCKDIR;
+const pstring dyn_PIDDIR  = PIDDIR;
+
+const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
+const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;