[PATCH] mkversion: Remove quotes around SAMBA_VERSION_VENDOR_PATCH string

[Amitay Isaacs]

On Wed, Jul 11, 2012 at 6:52 PM, Ralph Wuerthner <ralphw at de.ibm.com> wrote:
> On Tue, 10 Jul 2012 11:05:25 +1000
> Amitay Isaacs <amitay at samba.org> wrote:
>
>> On Tue, Jul 10, 2012 at 9:28 AM, Andrew Bartlett <abartlet at samba.org>
>> wrote:
>> > On Mon, 2012-07-09 at 14:04 +0200, Ralph Wuerthner wrote:
>> >> On Wed, 4 Jul 2012 11:47:32 +0200
>> >> Ralph Wuerthner <ralphw at de.ibm.com> wrote:
>> >>
>> >> > On Tue, 03 Jul 2012 22:06:38 +1000
>> >> > Andrew Bartlett <abartlet at samba.org> wrote:
>> >> >
>> >> > > On Tue, 2012-07-03 at 14:01 +0200, Ralph Wuerthner wrote:
>> >> > > > This is a small patch to address a compile error in
>> >> > > > source3/smbd/trans2.c when SAMBA_VERSION_VENDOR_PATCH is
>> >> > > > set. The patch applies on-top of v4-0-stable.
>> >> > > >
>> >> > > > Regards
>> >> > >
>> >> > > Does the waf implementation in
>> >> > > buildtools/wafsamba/samba_version.h need a similar fix?
>> >> > >
>> >> > > Thanks,
>> >> > >
>> >> > > Andrew Bartlett
>> >> > >
>> >> >
>> >> > No, buildtools/wafsamba/samba_version.py works correct.
>> >> >
>> >> > Regards
>> >> >
>> >> > Ralph
>> >> >
>> >>
>> >> Is anything missing to pick up this patch?
>> >
>> > I've dug into it some more, and as it is essentially a revert of
>> > part of 567f05e571278c4674dbf3c9aba8c69a11921873 that Amitay put in
>> > only a few months ago, I would like him to comment or push it.
>> >
>> > Thanks,
>>
>> Hi Ralph/Andrew,
>>
>> I misunderstood what SAMBA_VERSION_VENDOR_PATCH is meant for. I guess
>> it's supposed to be a number. Can you confirm that?
>>
>> Amitay.
>>
>
> Hi Amitay, Andrew,
>
> looking at the code SAMBA_VERSION_VENDOR_PATCH must be a number,
> otherwise we get the mentioned compile error in source3/smbd/trans2.c :
>
> ...
> #ifdef SAMBA_VERSION_VENDOR_PATCH
>         extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff);
> #endif
> ...
>
> If you need a string, you have to use
> SAMBA_VERSION_VENDOR_PATCH_STRING, as defined in source3/include/autoconf/version.h:
>
> ...
> #define SAMBA_VERSION_VENDOR_PATCH 1
> #define SAMBA_VERSION_VENDOR_PATCH_STRING "1"
> ...
>
>
> Regards
>
> Ralph
>

I have pushed the patch to autobuild.

Amitay.