python: Use relative paths for registry.

[kai/samba.git] / source / dynconfig.c

diff --git a/source/dynconfig.c b/source/dynconfig.c
index c72b64bcac65930f84b6953ea64651f4d12c319a..6dbbf872d9d25d25c10e4fb3590cb619382c7369 100644 (file)
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -6,7 +6,7 @@
    
    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,
@@ -15,12 +15,10 @@
    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"
-#include "version.h"
 
 /**
  * @file dynconfig.c
@@ -42,94 +40,47 @@
  * table?  There's kind of a chicken-and-egg situation there...
  **/
 
-/** Directory with super-user binaries */
-const char *dyn_SBINDIR = SBINDIR;
-
 /** Directory with generic binaries */
-const char *dyn_BINDIR = BINDIR;
+_PUBLIC_ const char *dyn_BINDIR = BINDIR;
 
 /**< Location of smb.conf file. **/
-const char *dyn_CONFIGFILE = CONFIGFILE; 
+_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) */
-const char *dyn_NCALRPCDIR = NCALRPCDIR;
+_PUBLIC_ const char *dyn_NCALRPCDIR = NCALRPCDIR;
 
 /** Statically configured LanMan hosts. **/
-const char *dyn_LMHOSTSFILE = LMHOSTSFILE; 
-
-/** Samba library directory. */
-const char *dyn_LIBDIR = LIBDIR;
+_PUBLIC_ const char *dyn_LMHOSTSFILE = LMHOSTSFILE; 
 
-const char *dyn_MODULESDIR = MODULESDIR;
+/** Samba data directory. */
+_PUBLIC_ const char *dyn_DATADIR = DATADIR;
 
-/** Shared library extension */
-const char *dyn_SHLIBEXT = SHLIBEXT;
+_PUBLIC_ const char *dyn_MODULESDIR = MODULESDIR;
 
 /**
  * @brief Directory holding lock files.
  *
  * Not writable, but used to set a default in the parameter table.
  **/
-const char *dyn_LOCKDIR = LOCKDIR;
+_PUBLIC_ const char *dyn_LOCKDIR = LOCKDIR;
 
 /** pid file directory */
-const char *dyn_PIDDIR  = PIDDIR;
+_PUBLIC_ const char *dyn_PIDDIR  = PIDDIR;
 
 /** Private data directory; holds ldb files and the like */
-const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
+_PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
 
-/** SWAT data file (images, etc) directory */
-const char *dyn_SWATDIR = SWATDIR;
+/** SWAT  directory */
+_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
 
 /** SETUP files (source files used by the provision) */
-const char *dyn_SETUPDIR = SETUPDIR;
+_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
 
 /** EJS Javascript library includes */
-const char *dyn_JSDIR = JSDIR;
+_PUBLIC_ const char *dyn_JSDIR = JSDIR;
 
 /** Where to find the winbindd socket */
-
-const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
-
-const char *samba_version_string(void)
-{
-       const char *official_string = SAMBA_VERSION_OFFICIAL_STRING;
-#ifdef SAMBA_VERSION_RELEASE_NICKNAME
-       const char *release_nickname = SAMBA_VERSION_RELEASE_NICKNAME;
-#else
-       const char *release_nickname = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_SUFFIX
-       const char *vendor_suffix = SAMBA_VERSION_VENDOR_SUFFIX;
-#else
-       const char *vendor_suffix = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_PATCH
-       const char *vendor_patch = SAMBA_VERSION_VENDOR_PATCH;
-#else
-       const char *vendor_patch = NULL;
-#endif
-       static char *samba_version;
-       static BOOL init_samba_version;
-
-       if (init_samba_version) {
-               return samba_version;
-       }
-
-       samba_version = talloc_asprintf(talloc_autofree_context(),
-                                       "%s%s%s%s%s%s%s%s",
-                                       official_string,
-                                       (vendor_suffix?"-":""),
-                                       (vendor_suffix?vendor_suffix:""),
-                                       (vendor_patch?"-":""),
-                                       (vendor_patch?vendor_patch:""),
-                                       (release_nickname?" (":""),
-                                       (release_nickname?release_nickname:""),
-                                       (release_nickname?")":""));
-
-       init_samba_version = True;
-       return samba_version;
-}
+_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;