Author: vlendec Date: 2007-10-03 12:55:45 +0000 (Wed, 03 Oct 2007) New Revision: 25481
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25481 Log: Fix some typos, don't panic as non-root on net getdomainsid Thanks to Karolin Seeger <[EMAIL PROTECTED]> Modified: branches/SAMBA_3_2/source/utils/net.c branches/SAMBA_3_2/source/utils/net_rpc.c branches/SAMBA_3_2_0/source/utils/net.c branches/SAMBA_3_2_0/source/utils/net_rpc.c Changeset: Modified: branches/SAMBA_3_2/source/utils/net.c =================================================================== --- branches/SAMBA_3_2/source/utils/net.c 2007-10-03 12:51:36 UTC (rev 25480) +++ branches/SAMBA_3_2/source/utils/net.c 2007-10-03 12:55:45 UTC (rev 25481) @@ -625,7 +625,7 @@ 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,9 +695,18 @@ 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 */ get_global_sam_sid(); Modified: branches/SAMBA_3_2/source/utils/net_rpc.c =================================================================== --- branches/SAMBA_3_2/source/utils/net_rpc.c 2007-10-03 12:51:36 UTC (rev 25480) +++ branches/SAMBA_3_2/source/utils/net_rpc.c 2007-10-03 12:55:45 UTC (rev 25481) @@ -6621,7 +6621,7 @@ { 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 @@ 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"); Modified: branches/SAMBA_3_2_0/source/utils/net.c =================================================================== --- branches/SAMBA_3_2_0/source/utils/net.c 2007-10-03 12:51:36 UTC (rev 25480) +++ branches/SAMBA_3_2_0/source/utils/net.c 2007-10-03 12:55:45 UTC (rev 25481) @@ -625,7 +625,7 @@ 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,9 +695,18 @@ 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 */ get_global_sam_sid(); Modified: branches/SAMBA_3_2_0/source/utils/net_rpc.c =================================================================== --- branches/SAMBA_3_2_0/source/utils/net_rpc.c 2007-10-03 12:51:36 UTC (rev 25480) +++ branches/SAMBA_3_2_0/source/utils/net_rpc.c 2007-10-03 12:55:45 UTC (rev 25481) @@ -6717,7 +6717,7 @@ { 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"); @@ -6728,7 +6728,7 @@ 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");
