[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a2c1b8e net: Fix sam addgroupmem
      from  da2611a s3-util: Fix authentication with long hostnames.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a2c1b8e07652d925771bad11e7f7dd962283439b
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 13 12:51:13 2015 +0100

    net: Fix sam addgroupmem
    
    Domain local groups come across as SID_TYPE_ALIAS and are sent to us in the
    PAC/Info3 struct. We should allow this in net sam addgroupmem.
    
    Volker
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Tue Jan 13 15:28:16 CET 2015 on sn-devel-104

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

Summary of changes:
 source3/utils/net_sam.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 2ee9a91..f1cb0a4 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1220,10 +1220,12 @@ static int net_sam_addmem(struct net_context *c, int argc, const char **argv)
 
 	if ((grouptype == SID_NAME_ALIAS) || (grouptype == SID_NAME_WKN_GRP)) {
 		if ((membertype != SID_NAME_USER) &&
+		    (membertype != SID_NAME_ALIAS) &&
 		    (membertype != SID_NAME_DOM_GRP)) {
-			d_fprintf(stderr, _("%s is a local group, only users "
-				  "and domain groups can be added.\n"
-				  "%s is a %s\n"), argv[0], argv[1],
+			d_fprintf(stderr, _("Can't add %s: only users, domain "
+					    "groups and domain local groups "
+					    "can be added. %s is a %s\n"),
+				  argv[0], argv[1],
 				  sid_type_lookup(membertype));
 			return -1;
 		}


-- 
Samba Shared Repository