[SCM] Samba Shared Repository - branch master updated -cde1b09d68e496f8f531336088433e9546b2864d

[Tim Prouty]

On Oct 7, 2008, at 9:50 AM, Jeremy Allison wrote:

> On Tue, Oct 07, 2008 at 09:29:28AM -0700, Tim Prouty wrote:
>>
>> On Oct 7, 2008, at 8:51 AM, Jeremy Allison wrote:
>>
>>> Don't forget to push these to all other branches that
>>> have the same problem.
>>>
>>> In this case that'll be 3-3-test and 3-2-test as well
>>> please.
>>
>>
>> That makes sense.  I'll push these patches there as well.
>
> Thanks Tim !

I pushed both to 3-2-test.

It turns out f19086872ec7 is already fixed in 3-3-test, and was  
recently broken in master.  Specifically the fix got lost in  
41669237cd714c when socket_wrapper was moved from source3/lib to the  
top level lib, so I only pushed the one applicable patch to 3-3-test.

Finally, I also changed a variable name for f19086872ec7 in master so  
it is in sync with 3-3-test and 3-2-test.

-Tim