[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Wed Jul 11 20:04:01 MDT 2012


The branch, master has been updated
       via  2cc38ac mkversion: Remove quotes around SAMBA_VERSION_VENDOR_PATCH string
      from  73ede32 s3:vfs_gpfs: fix ACL length calculation

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2cc38ac4133bddf2b99137bc3b78e244b2e7ccfc
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Fri Jun 22 12:24:14 2012 +0200

    mkversion: Remove quotes around SAMBA_VERSION_VENDOR_PATCH string
    
    This fixes a build error in source3/smbd/trans2.c when
    SAMBA_VERSION_VENDOR_PATCH is set (as integer value).
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Thu Jul 12 04:03:08 CEST 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index ef3582a..eba8f9e 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -115,7 +115,7 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
     echo "#define SAMBA_VERSION_VENDOR_SUFFIX \"${SAMBA_VERSION_VENDOR_SUFFIX}\"" >> $OUTPUT_FILE
     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 ${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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list