(merge from 3.0)
authorAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2004 23:19:17 +0000 (23:19 +0000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 25 Feb 2004 23:19:17 +0000 (23:19 +0000)
commit41025e8d4f88eb024dbe4a130cf9eb0519b39158
treea241baaca8b9e64111b26f34a38d31ab1e87b710
parenteb8ed992c65a4d394d40ef21002c366ce501c7e4
(merge from 3.0)

Fix bug in previous global_sam_sid() commit.  I broke the 'read from
MACHINE.SID' file functionality.

Also, before we print out the results of 'net getlocalsid' and 'net
getdomainsid', ensure we have tried to read that file, or have
generated one.

Andrew Bartlett
(This used to be commit af1b6447b8292a83851361570219ee6d889e0898)
source3/passdb/machine_sid.c
source3/utils/net.c