diff options
| -rw-r--r-- | source3/utils/net.c | 13 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 4 |
2 files changed, 13 insertions, 4 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 */ diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index b2e37ac559..ca81d367f2 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -6621,7 +6621,7 @@ int net_rpc_usage(int argc, const char **argv) { d_printf(" net rpc info \t\t\tshow basic info about a domain \n"); d_printf(" net rpc join \t\t\tto join a domain \n"); - d_printf(" net rpc oldjoin \t\t\tto join a domain created in server manager\n"); + d_printf(" net rpc oldjoin \t\tto join a domain created in server manager\n"); d_printf(" net rpc testjoin \t\ttests that a join is valid\n"); d_printf(" net rpc user \t\t\tto add, delete and list users\n"); d_printf(" net rpc password <username> [<password>] -Uadmin_username%%admin_pass\n"); @@ -6632,7 +6632,7 @@ int net_rpc_usage(int argc, const char **argv) d_printf(" net rpc changetrustpw \tto change the trust account password\n"); d_printf(" net rpc getsid \t\tfetch the domain sid into the local secrets.tdb\n"); d_printf(" net rpc vampire \t\tsyncronise an NT PDC's users and groups into the local passdb\n"); - d_printf(" net rpc samdump \t\tdiplay an NT PDC's users, groups and other data\n"); + d_printf(" net rpc samdump \t\tdisplay an NT PDC's users, groups and other data\n"); d_printf(" net rpc trustdom \t\tto create trusting domain's account or establish trust\n"); d_printf(" net rpc abortshutdown \tto abort the shutdown of a remote server\n"); d_printf(" net rpc shutdown \t\tto shutdown a remote server\n"); |