[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-38-g4580a49

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  4580a491d2341a70a7e8e869e2fb249be2d25dcd (commit)
      from  ece9a659dee5e7f97125053745df7d1095bdb6ec (commit)

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


- Log -----------------------------------------------------------------
commit 4580a491d2341a70a7e8e869e2fb249be2d25dcd
Author: John H Terpstra <jht at samba.org>
Date:   Thu Jun 19 16:11:31 2008 -0500

    Fixing net help info.
    (cherry picked from commit f62909d2b457f3494c9536c994a9209f8cc0c331)

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

Summary of changes:
 source/utils/net_help.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_help.c b/source/utils/net_help.c
index 908be05..c4accf0 100644
--- a/source/utils/net_help.c
+++ b/source/utils/net_help.c
@@ -61,7 +61,7 @@ static int help_usage(int argc, const char **argv)
 "Valid functions are:\n"\
 "  RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n"\
 "  GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n"\
-"  SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
+"  GETDOMAINSID SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
 	return -1;
 }
 
@@ -228,8 +228,9 @@ static int net_usage(int argc, const char **argv)
 		 "  net groupmap\t\tto manage group mappings\n"\
 		 "  net join\t\tto join a domain\n"\
 		 "  net cache\t\tto operate on cache tdb file\n"\
-		 "  net getlocalsid [NAME]\tto get the SID for local name\n"\
-		 "  net setlocalsid SID\tto set the local domain SID\n"\
+		 "  net getlocalsid [NAME]\tto get the SID for local machine name\n"\
+		 "  net setlocalsid SID\tto set the local machine SID\n"\
+		 "  net getdomainsid the machine SID and the domain SID on the local server\n"\
 		 "  net setdomainsid SID\tto set the domain SID on member servers\n"\
 		 "  net changesecretpw\tto change the machine password in the local secrets database only\n"\
 		 "                    \tthis requires the -f flag as a safety barrier\n"\


-- 
Samba Shared Repository