samba - Mar 2004 - Samba 2 -> Samba 3 : Group mapping only partially working

Hi,

I have just upgraded from samba 2.2.8 to samba 3.0.2.  In my old 2.2.8
pdc configuration
I used a domain admin group clause to map some users to administrators.
When I would
login with this user all would be well.  Printing out the user details
from a Win2K
client would show:

	c:\ net user mark /domain

	The request will be processed at a domain controller for domain
HOME.LAN.
	<snip>
	Local Group Memberships      *BUILTIN\Users        *Users
	Global Group memberships     *Domain Users         *Domain Admins

However, post upgrade the same command now shows:

	Local Group Memberships      *adm
	Global Group memberships     *Domain Admins        *Users

There are a few curious things here (a) Local group membership is set to
adm!!
(The mark uid includes membership of the linux group adm).  (b) The old
Users local memberships do not exist.

My samba group mapping is like this:

	System Operators (S-1-5-32-549) -> -1
	Domain Users (S-1-5-21-3891909844-1233218766-3156376020-513) ->
smbusers
	Replicators (S-1-5-32-552) -> -1
	Guests (S-1-5-32-546) -> smbguest
	Power Users (S-1-5-32-547) -> -1
	Domain Admins (S-1-5-21-3891909844-1233218766-3156376020-512) ->
smbadmin
	Print Operators (S-1-5-32-550) -> -1
	Administrators (S-1-5-32-544) -> smbadmin
	Domain Guests (S-1-5-21-3891909844-1233218766-3156376020-514) ->
smbguest
	Account Operators (S-1-5-32-548) -> -1
	Backup Operators (S-1-5-32-551) -> -1
	Users (S-1-5-32-545) -> smbusers

Can anyone give me some clues to restore the old local group
memberships?

Regards/Mark