[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5148-gf846e0f

[Michael Adam]

The branch, v3-3-test has been updated
       via  f846e0fcdf62333b44a16e5a392930189b512f9b (commit)
      from  d01cca5e3ddb925696d49a1ea728013ec1032372 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit f846e0fcdf62333b44a16e5a392930189b512f9b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Mar 19 18:29:09 2009 +0100

    version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
    
    We need a string version of this, or else version.c does not compile.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/lib/version.c       |    2 +-
 source/script/mkversion.sh |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/version.c b/source/lib/version.c
index 3982646..271a3c4 100644
--- a/source/lib/version.c
+++ b/source/lib/version.c
@@ -29,7 +29,7 @@ const char *samba_version_string(void)
  #ifdef SAMBA_VERSION_VENDOR_SUFFIX
   #ifdef SAMBA_VERSION_VENDOR_PATCH
 	return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \
-		"-" SAMBA_VERSION_VENDOR_PATCH;
+		"-" SAMBA_VERSION_VENDOR_PATCH_STRING;
   #endif /* SAMBA_VERSION_VENDOR_PATCH */
 	return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX;
  #endif /* SAMBA_VERSION_VENDOR_SUFFIX */
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 695fc7d..08b3a38 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -112,6 +112,7 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
     if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
         echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE
+        echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE
         SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}"
     fi
 fi


-- 
Samba Shared Repository