diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-01-23 11:23:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:23 -0500 |
| commit | 36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc (patch) | |
| tree | c20609c202d735fc7f0ebc8d3b9c3ecf4143a3d8 /source4/lib | |
| parent | 9c9b42a5499dc381f43684ebd46b3bc1272d743c (diff) | |
| download | samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.tar.gz samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.tar.bz2 samba-36b1a0f82de812fafb2bf75b3fe5b29cb789cdbc.zip | |
r13079: add SAMBA_VERSION_RELEASE_NICKNAME
if it's set in source/VERSION
smbd --version will print
4.0.0tp1 (Nickname)
metze
(This used to be commit 780870293b8109250b16101649f110ba22c1932b)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/version.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/source4/lib/version.c b/source4/lib/version.c index 1adbc91385..a5733a953d 100644 --- a/source4/lib/version.c +++ b/source4/lib/version.c @@ -24,21 +24,33 @@ const char *samba_version_string(void) { -#ifndef SAMBA_VERSION_VENDOR_SUFFIX - return SAMBA_VERSION_OFFICIAL_STRING; + 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 static char *samba_version; static BOOL init_samba_version; - if (init_samba_version) + if (init_samba_version) { return samba_version; + } - samba_version = talloc_asprintf( - talloc_autofree_context(), "%s-%s", - SAMBA_VERSION_OFFICIAL_STRING, - SAMBA_VERSION_VENDOR_SUFFIX); + samba_version = talloc_asprintf(talloc_autofree_context(), + "%s%s%s%s%s%s", + official_string, + (vendor_suffix?"-":""), + (vendor_suffix?vendor_suffix:""), + (release_nickname?" (":""), + (release_nickname?release_nickname:""), + (release_nickname?")":"")); init_samba_version = True; return samba_version; -#endif } |