[arch-general] dbus update - /etc/passwd merge question

[mike cloaked]

Having read the available postings in arch-dev-public as well as those on
this subject in the arch forums I am somewhat confused as to how to
complete the merge for /etc/passwd /etc/shadow /etc/group and /etc/gshadow
for the new entries in the .pacnew files.

For example in my old /etc/passwd I have the line:
dbus:x:81:81:System message bus:/:/bin/false

and in the pacnew file I have:
dbus:x:81:81:dbus:/:/sbin/nologin

Should I put the line from the .pacnew file into the old file?

Also for uidd I have in the original:
uuidd:x:999:999::/:/sbin/nologin

but in the pacnew file it is:
uuidd:x:68:68:uuidd:/:/sbin/nologin

Should I change the uid in the original file to 68 - and do the same in the
corresponding entries for shadow, group and gshadow?

I am an old linux user and usually I can sort things out after an upgrade
but this time I am really confused.

Any expert advice very much appreciated - thanks.

-- 
mike c