r3761: Fix bug #1932: crash when non-root invokes net getlocalsid

First check to see if we can open secrets.tdb.
(This used to be commit 81e3c78d056c0a7499b8f27dcd37a13e725053ee)

1 files changed, 9 insertions, 1 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 2fe15c2b8e..784612fc71 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -479,11 +479,19 @@ static int net_getlocalsid(int argc, const char **argv)
 			  "backend knowlege (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_printf("Unable to open secrets.tdb.  Can't fetch domain SID for name: %s\n", name);
+		return 1;
+	}
+
 	/* 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));	
+		DEBUG(0, ("Can't fetch domain SID for name: %s\n", name));
 		return 1;
 	}
 	sid_to_string(sid_str, &sid);