diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-10-03 12:55:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:07 -0500 |
| commit | 4a952fb0c0bb9d8ebb733b32f3f16596293b320b (patch) | |
| tree | d7b53177fc4e23664cdff267f4ae8100160a5ebf /source3/utils/net.c | |
| parent | 3665d6d9d54f0f52fcf1ad68ca7e126d7343d4fd (diff) | |
| download | samba-4a952fb0c0bb9d8ebb733b32f3f16596293b320b.tar.gz samba-4a952fb0c0bb9d8ebb733b32f3f16596293b320b.tar.bz2 samba-4a952fb0c0bb9d8ebb733b32f3f16596293b320b.zip | |
r25481: Fix some typos, don't panic as non-root on net getdomainsid
Thanks to Karolin Seeger <ks@sernet.de>
(This used to be commit 5ae4b2739853e2cd91e839909eb868dbb56be431)
Diffstat (limited to 'source3/utils/net.c')
| -rw-r--r-- | source3/utils/net.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c index 9c327f162d..88283ac145 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -625,7 +625,7 @@ static int net_getlocalsid(int argc, const char **argv) if(!initialize_password_db(False, NULL)) { DEBUG(0, ("WARNING: Could not open passdb - local sid may not reflect passdb\n" - "backend knowlege (such as the sid stored in LDAP)\n")); + "backend knowledge (such as the sid stored in LDAP)\n")); } /* first check to see if we can even access secrets, so we don't @@ -695,7 +695,16 @@ static int net_getdomainsid(int argc, const char **argv) if(!initialize_password_db(False, NULL)) { DEBUG(0, ("WARNING: Could not open passdb - domain sid may not reflect passdb\n" - "backend knowlege (such as the sid stored in LDAP)\n")); + "backend knowledge (such as the sid stored in LDAP)\n")); + } + + /* first check to see if we can even access secrets, so we don't + panic when we can't. */ + + if (!secrets_init()) { + d_fprintf(stderr, "Unable to open secrets.tdb. Can't fetch domain" + "SID for name: %s\n", get_global_sam_name()); + return 1; } /* Generate one, if it doesn't exist */ |