diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-01-24 18:35:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:26 -0500 |
| commit | ca649f797cdc08a28fe43d5b47f4c84967b22837 (patch) | |
| tree | 441f5f8c452355ad7b34d68da1efc700ec90b66f /source4/lib | |
| parent | d5ae1a0387d281eeedc6c15f73df9dd13431a2bb (diff) | |
| download | samba-ca649f797cdc08a28fe43d5b47f4c84967b22837.tar.gz samba-ca649f797cdc08a28fe43d5b47f4c84967b22837.tar.bz2 samba-ca649f797cdc08a28fe43d5b47f4c84967b22837.zip | |
r13112: merge over some stuff from samba3
metze
(This used to be commit 7cb4e1bd0471f0c03fde25f6171565d74ab0549f)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/version.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/lib/version.c b/source4/lib/version.c index a5733a953d..b7aa81a081 100644 --- a/source4/lib/version.c +++ b/source4/lib/version.c @@ -35,6 +35,11 @@ const char *samba_version_string(void) #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; @@ -43,10 +48,12 @@ const char *samba_version_string(void) } samba_version = talloc_asprintf(talloc_autofree_context(), - "%s%s%s%s%s%s", + "%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?")":"")); |