summaryrefslogtreecommitdiff
path: root/source3/utils/net_sam.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-01-13 12:51:13 +0100
committerGünther Deschner <gd@samba.org>2015-01-13 15:28:16 +0100
commita2c1b8e07652d925771bad11e7f7dd962283439b (patch)
tree7ec86ec6667e562b7dc2138ba58df0aea5edc21e /source3/utils/net_sam.c
parentda2611adef32107f5a0eec97501c01232ab72efc (diff)
downloadsamba-a2c1b8e07652d925771bad11e7f7dd962283439b.tar.gz
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@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org> Autobuild-User(master): Günther Deschner <gd@samba.org> Autobuild-Date(master): Tue Jan 13 15:28:16 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/utils/net_sam.c')
-rw-r--r--source3/utils/net_sam.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 2ee9a91b704..f1cb0a4167b 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;
}