Compile error on CVS

[Jeremy Allison]

Stan Sander wrote:
> 
> The problem looks to me like a commit or patch that didn't apply
> correctly.  At line 766 of smbmount.c  there is an slprintf statement that
> belongs
> 
>  766                          } else {
>    767  <<<<<<< smbmount.c
>    768                                  slprintf(p, sizeof(pstring) - (p -
> options), "%s=%s,", opts, opteq+1);
>    769  =======
>    770                                  slprintf(p, sizeof(pstring) - (p -
> options) - 1, "%s=%s,", opts, opteq+1);
>    771  >>>>>>> 1.30.4.3
> 
> I edited my copy  so that the second statement (containing the -1) was the
> only one remaining and it compiled ok.
> 
> I tried another cvs update before doing this just in case it was my
> connection, but the file did not change, so it looks like it may be in the
> cvs tree that way.  BTW this is the Samba 2 2 tree.

Nope, the tree is fine - the >>>> and <<<< are hints that your
tree is in conflict (has been locally modified) with respect
to the CVS version. 

Remove client/smbmount.c and re-checkout.

Regards,

	Jeremy Allison,
	Samba Team.

-- 
--------------------------------------------------------
Buying an operating system without source is like buying
a self-assembly Space Shuttle with no instructions.
--------------------------------------------------------