diff options
Diffstat (limited to 'source4/dynconfig.c')
| -rw-r--r-- | source4/dynconfig.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/source4/dynconfig.c b/source4/dynconfig.c index 26bbbec2d4..41728af57d 100644 --- a/source4/dynconfig.c +++ b/source4/dynconfig.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "version.h" /** * @file dynconfig.c @@ -42,9 +41,6 @@ * table? There's kind of a chicken-and-egg situation there... **/ -/** Directory with super-user binaries */ -_PUBLIC_ const char *dyn_SBINDIR = SBINDIR; - /** Directory with generic binaries */ _PUBLIC_ const char *dyn_BINDIR = BINDIR; @@ -91,45 +87,4 @@ _PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR; _PUBLIC_ const char *dyn_JSDIR = JSDIR; /** Where to find the winbindd socket */ - _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR; - -_PUBLIC_ 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; -} |