Don't specify what should be a default option in the generated smb.conf

[jelmer/samba4-debian.git] / source / dynconfig.c

diff --git a/source/dynconfig.c b/source/dynconfig.c
index 7c09f9805ba678d8fa40aace7fc5a754b7b89b1a..6dbbf872d9d25d25c10e4fb3590cb619382c7369 100644 (file)
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -1,11 +1,12 @@
 /* 
    Unix SMB/CIFS implementation.
    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
-   Copyright (C) 2003 by Anthony Liguori <aliguor@us.ibm.com>
+   Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
+   Copyright (C) Stefan Metzmacher     2003
    
    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 2 of the License, or
+   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,
@@ -14,8 +15,7 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -40,32 +40,47 @@
  * table?  There's kind of a chicken-and-egg situation there...
  **/
 
-const char *dyn_SBINDIR = SBINDIR,
-       *dyn_BINDIR = BINDIR;
+/** Directory with generic binaries */
+_PUBLIC_ const char *dyn_BINDIR = BINDIR;
 
-pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
+/**< Location of smb.conf file. **/
+_PUBLIC_ const char *dyn_CONFIGFILE = CONFIGFILE; 
 
 /** Log file directory. **/
-const char *dyn_LOGFILEBASE = LOGFILEBASE;
+_PUBLIC_ const char *dyn_LOGFILEBASE = LOGFILEBASE; 
+
+/** Directory for local RPC (ncalrpc: transport) */
+_PUBLIC_ const char *dyn_NCALRPCDIR = NCALRPCDIR;
 
 /** Statically configured LanMan hosts. **/
-pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
+_PUBLIC_ const char *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;
+/** Samba data directory. */
+_PUBLIC_ const char *dyn_DATADIR = DATADIR;
+
+_PUBLIC_ const char *dyn_MODULESDIR = MODULESDIR;
 
 /**
  * @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;
+_PUBLIC_ const char *dyn_LOCKDIR = LOCKDIR;
+
+/** pid file directory */
+_PUBLIC_ const char *dyn_PIDDIR  = PIDDIR;
+
+/** Private data directory; holds ldb files and the like */
+_PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
+
+/** SWAT  directory */
+_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
+
+/** SETUP files (source files used by the provision) */
+_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
+
+/** EJS Javascript library includes */
+_PUBLIC_ const char *dyn_JSDIR = JSDIR;
 
-const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
-const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
+/** Where to find the winbindd socket */
+_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;