diff options
| author | Gerald Carter <jerry@samba.org> | 2003-04-22 18:03:55 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-04-22 18:03:55 +0000 |
| commit | 651ff45e8d7cba0a6aead787a94d81ae3a693206 (patch) | |
| tree | dcc6aba246494882ab9d5c6ee82aea3f1284baab | |
| parent | 14466825655137e67accccf42179c7e843404f9e (diff) | |
| download | samba-651ff45e8d7cba0a6aead787a94d81ae3a693206.tar.gz samba-651ff45e8d7cba0a6aead787a94d81ae3a693206.tar.bz2 samba-651ff45e8d7cba0a6aead787a94d81ae3a693206.zip | |
don't reset the group type unless specified
(This used to be commit 541f40a144461ca139ac53837d3f31ce6972d18c)
| -rw-r--r-- | source3/utils/net_groupmap.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index 2436fffc6d..63e69fa7cf 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -370,20 +370,14 @@ int net_groupmap_modify(int argc, const char **argv) * Allow changing of group type only between domain and local * We disallow changing Builtin groups !!! (SID problem) */ - if (sid_type==SID_NAME_ALIAS - || sid_type==SID_NAME_DOM_GRP - || sid_type==SID_NAME_UNKNOWN) - { - if (map.sid_name_use==SID_NAME_ALIAS - || map.sid_name_use==SID_NAME_DOM_GRP - || map.sid_name_use==SID_NAME_UNKNOWN) - { - map.sid_name_use=sid_type; - } else { - printf("cannot change group type to builtin\n"); - }; - } else { - printf("cannot change group type from builtin\n"); + if ( sid_type != SID_NAME_UNKNOWN ) + { + if ( map.sid_name_use == SID_NAME_WKN_GRP ) { + d_printf("You can only change between domain and local groups.\n"); + return -1; + } + + map.sid_name_use=sid_type; } /* Change comment if new one */ |