[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-511-gcb3a2df

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  cb3a2dfeb047d45bb9eec8cb97d3ba288f21887e (commit)
      from  1000c98eae0886dbdf60beb1fe64d66ec009746b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cb3a2dfeb047d45bb9eec8cb97d3ba288f21887e
Author: Karolin Seeger <ks at sernet.de>
Date:   Thu Dec 6 13:54:45 2007 +0100

    Make output of net getdomainsid more meaningful. Unify spelling of SID. Display usage if superfluous arguments are given.
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 source/utils/net.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net.c b/source/utils/net.c
index dc4c9da..e8fb2c4 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -715,10 +715,15 @@ static int net_getdomainsid(int argc, const char **argv)
 	DOM_SID domain_sid;
 	fstring sid_str;
 
+	if (argc > 0) {
+		d_printf("usage: net getdomainsid\n");
+		return 1;
+	}
+
 	if(!initialize_password_db(False, NULL)) {
-		DEBUG(0, ("WARNING: Could not open passdb - domain sid may "
+		DEBUG(0, ("WARNING: Could not open passdb - domain SID may "
 			  "not reflect passdb\n"
-			  "backend knowledge (such as the sid stored in "
+			  "backend knowledge (such as the SID stored in "
 			  "LDAP)\n"));
 	}
 
@@ -739,7 +744,7 @@ static int net_getdomainsid(int argc, const char **argv)
 		return 1;
 	}
 	sid_to_string(sid_str, &domain_sid);
-	d_printf("SID for domain %s is: %s\n", global_myname(), sid_str);
+	d_printf("SID for local machine %s is: %s\n", global_myname(), sid_str);
 
 	if (!secrets_fetch_domain_sid(opt_workgroup, &domain_sid)) {
 		d_fprintf(stderr, "Could not fetch domain SID\n");


-- 
Samba Shared Repository