CVS update: samba/source/utils

[Luke Kenneth Casson Leighton]

On Mon, 18 Jan 1999 matty at samba.anu.edu.au wrote:

> 
> Date:	Monday January 18, 1999 @ 12:32
> Author:	matty
> 
> Update of /data/cvs/samba/source/utils
> In directory samba:/data/people/matty/samba/source/utils
> 
> Modified Files:
> 	smbpasswd.c 
> Log Message:
> Added load_interfaces in smbpasswd to allow name resolution by broadcast and
> multiple interfaces. (Jeremy already committed this in SAMBA_2_0).

matt,

generally it's a bad idea to add code from one branch that has already
been added to another unless there's a really good reason.

the reason is that when you create a cvs diff -D "date_of_the_split" and
then attempt to merge it into the other branch, you run into unnecessary
conflicts.

luke