diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-02-25 23:12:29 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-02-25 23:12:29 +0000 |
| commit | 191b43159e7358541be9a3deac8c447885145442 (patch) | |
| tree | f6bdfa5d0a1701e77f8e26db044e80fd5f4a08e4 /source | |
| parent | 86ad04d26d3065a99b08afaaf2914968a9e701c5 (diff) | |
| download | samba-191b43159e7358541be9a3deac8c447885145442.tar.gz samba-191b43159e7358541be9a3deac8c447885145442.tar.xz samba-191b43159e7358541be9a3deac8c447885145442.zip | |
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/passdb/machine_sid.c | 1 | ||||
| -rw-r--r-- | source/utils/net.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/passdb/machine_sid.c b/source/passdb/machine_sid.c index f52e7116b0d..47b9e2d487e 100644 --- a/source/passdb/machine_sid.c +++ b/source/passdb/machine_sid.c @@ -163,7 +163,6 @@ static DOM_SID *pdb_generate_sam_sid(void) /* Stored the old sid from MACHINE.SID successfully.*/ SAFE_FREE(fname); - SAFE_FREE(sam_sid); return sam_sid; } diff --git a/source/utils/net.c b/source/utils/net.c index 9026900e814..01f56b8a0c7 100644 --- a/source/utils/net.c +++ b/source/utils/net.c @@ -423,6 +423,9 @@ static int net_getlocalsid(int argc, const char **argv) "backend knowlege (such as the sid stored in LDAP)\n")); } + /* Generate one, if it doesn't exist */ + get_global_sam_sid(); + if (!secrets_fetch_domain_sid(name, &sid)) { DEBUG(0, ("Can't fetch domain SID for name: %s\n", name)); return 1; @@ -462,6 +465,9 @@ static int net_getdomainsid(int argc, const char **argv) "backend knowlege (such as the sid stored in LDAP)\n")); } + /* Generate one, if it doesn't exist */ + get_global_sam_sid(); + if (!secrets_fetch_domain_sid(global_myname(), &domain_sid)) { d_printf("Could not fetch local SID\n"); return 1; |