[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  4e6955a Fix bug #8687 - net memberships usage info is wrong
      from  70bbd7a s3-libsmb: Don't duplicate kerberos service tickets.

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


- Log -----------------------------------------------------------------
commit 4e6955a05a1813c7a452ad83652ff96b43e21f06
Author: Jeremy Allison <j...@samba.org>
Date:   Thu Jan 5 13:54:29 2012 -0800

    Fix bug #8687 - net memberships usage info is wrong
    
    Typo in usage.
    
    Autobuild-User: Jeremy Allison <j...@samba.org>
    Autobuild-Date: Fri Jan  6 00:30:20 CET 2012 on sn-devel-104
    (cherry picked from commit 0453544900ef2ebff7a3c677d4048ef530713b64)

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

Summary of changes:
 source3/utils/net_groupmap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 0d4cddd..44b024e 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -823,7 +823,7 @@ static int net_groupmap_memberships(struct net_context *c, 
int argc, const char
             !string_to_sid(&member, argv[0]) ) {
                d_printf("%s\n%s",
                         _("Usage:"),
-                        _("net groupmap memberof sid\n"));
+                        _("net groupmap memberships sid\n"));
                return -1;
        }
 


-- 
Samba Shared Repository