*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "utils/net.h"
-
-/*********************************************************
- utility function to parse an integer parameter from
- "parameter = value"
-**********************************************************/
-static uint32 get_int_param( const char* param )
-{
- char *p;
-
- p = strchr( param, '=' );
- if ( !p )
- return 0;
-
- return atoi(p+1);
-}
-
-/*********************************************************
- utility function to parse an integer parameter from
- "parameter = value"
-**********************************************************/
-static char* get_string_param( const char* param )
-{
- char *p;
-
- p = strchr( param, '=' );
- if ( !p )
- return NULL;
-
- return (p+1);
-}
-
/*********************************************************
Figure out if the input was an NT group or a SID string.
Return the SID.
**********************************************************/
-static BOOL get_sid_from_input(DOM_SID *sid, char *input)
+static bool get_sid_from_input(DOM_SID *sid, char *input)
{
GROUP_MAP map;
/* Perhaps its the NT group name? */
if (!pdb_getgrnam(&map, input)) {
printf("NT Group %s doesn't exist in mapping DB\n", input);
- return False;
+ return false;
} else {
*sid = map.sid;
}
} else {
if (!string_to_sid(sid, input)) {
printf("converting sid %s from a string failed!\n", input);
- return False;
+ return false;
}
}
- return True;
+ return true;
}
/*********************************************************
Dump a GROUP_MAP entry to stdout (long or short listing)
**********************************************************/
-static void print_map_entry ( GROUP_MAP map, BOOL long_list )
+static void print_map_entry ( GROUP_MAP map, bool long_list )
{
if (!long_list)
d_printf("%s (%s) -> %s\n", map.nt_name,
- sid_string_static(&map.sid), gidtoname(map.gid));
+ sid_string_tos(&map.sid), gidtoname(map.gid));
else {
d_printf("%s\n", map.nt_name);
- d_printf("\tSID : %s\n", sid_string_static(&map.sid));
+ d_printf("\tSID : %s\n", sid_string_tos(&map.sid));
+ d_printf("\tUnix gid : %u\n", (unsigned int)map.gid);
d_printf("\tUnix group: %s\n", gidtoname(map.gid));
d_printf("\tGroup type: %s\n",
- decode_sid_name_use(map.sid_name_use));
+ sid_type_lookup(map.sid_name_use));
d_printf("\tComment : %s\n", map.comment);
}
/*********************************************************
List the groups.
**********************************************************/
-static int net_groupmap_list(int argc, const char **argv)
+static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
{
size_t entries;
- BOOL long_list = False;
+ bool long_list = false;
size_t i;
fstring ntgroup = "";
fstring sid_string = "";
+ const char list_usage_str[] = "net groupmap list [verbose] "
+ "[ntgroup=NT group] [sid=SID]\n"
+ " verbose\tPrint verbose list\n"
+ " ntgroup\tNT group to list\n"
+ " sid\tSID of group to list";
+
+ if (c->display_usage) {
+ d_printf("Usage:\n%s\n", list_usage_str);
+ return 0;
+ }
+
+ if (c->opt_verbose || c->opt_long_list_entries)
+ long_list = true;
- if (opt_verbose || opt_long_list_entries)
- long_list = True;
-
/* get the options */
for ( i=0; i<argc; i++ ) {
if ( !StrCaseCmp(argv[i], "verbose")) {
- long_list = True;
+ long_list = true;
}
else if ( !StrnCaseCmp(argv[i], "ntgroup", strlen("ntgroup")) ) {
fstrcpy( ntgroup, get_string_param( argv[i] ) );
if ( !ntgroup[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "sid", strlen("sid")) ) {
fstrcpy( sid_string, get_string_param( argv[i] ) );
if ( !sid_string[0] ) {
- d_printf("must supply a SID\n");
+ d_fprintf(stderr, "must supply a SID\n");
return -1;
- }
+ }
}
else {
- d_printf("Bad option: %s\n", argv[i]);
+ d_fprintf(stderr, "Bad option: %s\n", argv[i]);
+ d_printf("Usage:\n%s\n", list_usage_str);
return -1;
}
}
if ( ntgroup[0] || sid_string[0] ) {
DOM_SID sid;
GROUP_MAP map;
-
+
if ( sid_string[0] )
fstrcpy( ntgroup, sid_string);
-
+
if (!get_sid_from_input(&sid, ntgroup)) {
return -1;
}
/* Get the current mapping from the database */
if(!pdb_getgrsid(&map, sid)) {
- d_printf("Failure to local group SID in the database\n");
+ d_fprintf(stderr, "Failure to local group SID in the database\n");
return -1;
}
-
+
print_map_entry( map, long_list );
}
else {
GROUP_MAP *map=NULL;
/* enumerate all group mappings */
- if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &entries, ENUM_ALL_MAPPED))
+ if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, ENUM_ALL_MAPPED))
return -1;
-
+
for (i=0; i<entries; i++) {
print_map_entry( map[i], long_list );
}
Add a new group mapping entry
**********************************************************/
-static int net_groupmap_add(int argc, const char **argv)
+static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
{
DOM_SID sid;
fstring ntgroup = "";
fstring string_sid = "";
fstring type = "";
fstring ntcomment = "";
- enum SID_NAME_USE sid_type = SID_NAME_DOM_GRP;
- uint32 rid = 0;
+ enum lsa_SidType sid_type = SID_NAME_DOM_GRP;
+ uint32 rid = 0;
gid_t gid;
int i;
-
+ GROUP_MAP map;
+
+ const char *name_type;
+ const char add_usage_str[] = "net groupmap add {rid=<int>|sid=<string>}"
+ " unixgroup=<string> "
+ "[type=<domain|local|builtin>] "
+ "[ntgroup=<string>] [comment=<string>]";
+
+ ZERO_STRUCT(map);
+
+ /* Default is domain group. */
+ map.sid_name_use = SID_NAME_DOM_GRP;
+ name_type = "domain group";
+
+ if (c->display_usage) {
+ d_printf("Usage\n%s\n", add_usage_str);
+ return 0;
+ }
+
/* get the options */
for ( i=0; i<argc; i++ ) {
if ( !StrnCaseCmp(argv[i], "rid", strlen("rid")) ) {
rid = get_int_param(argv[i]);
if ( rid < DOMAIN_GROUP_RID_ADMINS ) {
- d_printf("RID must be greater than %d\n", (uint32)DOMAIN_GROUP_RID_ADMINS-1);
+ d_fprintf(stderr, "RID must be greater than %d\n", (uint32)DOMAIN_GROUP_RID_ADMINS-1);
return -1;
}
}
else if ( !StrnCaseCmp(argv[i], "unixgroup", strlen("unixgroup")) ) {
fstrcpy( unixgrp, get_string_param( argv[i] ) );
if ( !unixgrp[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "ntgroup", strlen("ntgroup")) ) {
fstrcpy( ntgroup, get_string_param( argv[i] ) );
if ( !ntgroup[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "sid", strlen("sid")) ) {
fstrcpy( string_sid, get_string_param( argv[i] ) );
if ( !string_sid[0] ) {
- d_printf("must supply a SID\n");
+ d_fprintf(stderr, "must supply a SID\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "comment", strlen("comment")) ) {
fstrcpy( ntcomment, get_string_param( argv[i] ) );
if ( !ntcomment[0] ) {
- d_printf("must supply a comment string\n");
+ d_fprintf(stderr, "must supply a comment string\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "type", strlen("type")) ) {
fstrcpy( type, get_string_param( argv[i] ) );
case 'b':
case 'B':
sid_type = SID_NAME_WKN_GRP;
+ name_type = "wellknown group";
break;
case 'd':
case 'D':
sid_type = SID_NAME_DOM_GRP;
+ name_type = "domain group";
break;
case 'l':
case 'L':
sid_type = SID_NAME_ALIAS;
+ name_type = "alias (local) group";
break;
+ default:
+ d_fprintf(stderr, "unknown group type %s\n", type);
+ return -1;
}
}
else {
- d_printf("Bad option: %s\n", argv[i]);
+ d_fprintf(stderr, "Bad option: %s\n", argv[i]);
return -1;
}
}
if ( !unixgrp[0] ) {
- d_printf("Usage: net groupmap add {rid=<int>|sid=<string>} unixgroup=<string> [type=<domain|local|builtin>] [ntgroup=<string>] [comment=<string>]\n");
+ d_printf("Usage:\n%s\n", add_usage_str);
return -1;
}
-
+
if ( (gid = nametogid(unixgrp)) == (gid_t)-1 ) {
- d_printf("Can't lookup UNIX group %s\n", unixgrp);
+ d_fprintf(stderr, "Can't lookup UNIX group %s\n", unixgrp);
return -1;
}
-
+
+ {
+ if (pdb_getgrgid(&map, gid)) {
+ d_printf("Unix group %s already mapped to SID %s\n",
+ unixgrp, sid_string_tos(&map.sid));
+ return -1;
+ }
+ }
+
if ( (rid == 0) && (string_sid[0] == '\0') ) {
- d_printf("No rid or sid specified, choosing algorithmic mapping\n");
- rid = pdb_gid_to_group_rid(gid);
+ d_printf("No rid or sid specified, choosing a RID\n");
+ if (pdb_rid_algorithm()) {
+ rid = algorithmic_pdb_gid_to_group_rid(gid);
+ } else {
+ if (!pdb_new_rid(&rid)) {
+ d_printf("Could not get new RID\n");
+ }
+ }
+ d_printf("Got RID %d\n", rid);
}
/* append the rid to our own domain/machine SID if we don't have a full SID */
if ( !string_sid[0] ) {
sid_copy(&sid, get_global_sam_sid());
sid_append_rid(&sid, rid);
- sid_to_string(string_sid, &sid);
+ sid_to_fstring(string_sid, &sid);
}
if (!ntcomment[0]) {
break;
}
}
-
+
if (!ntgroup[0] )
fstrcpy( ntgroup, unixgrp );
-
-
- if (!add_initial_entry(gid, string_sid, sid_type, ntgroup, ntcomment)) {
- d_printf("adding entry for group %s failed!\n", ntgroup);
+
+ if (!NT_STATUS_IS_OK(add_initial_entry(gid, string_sid, sid_type, ntgroup, ntcomment))) {
+ d_fprintf(stderr, "adding entry for group %s failed!\n", ntgroup);
return -1;
}
- d_printf("Successfully added group %s to the mapping db\n", ntgroup);
+ d_printf("Successfully added group %s to the mapping db as a %s\n",
+ ntgroup, name_type);
return 0;
}
-static int net_groupmap_modify(int argc, const char **argv)
+static int net_groupmap_modify(struct net_context *c, int argc, const char **argv)
{
DOM_SID sid;
GROUP_MAP map;
fstring ntgroup = "";
fstring unixgrp = "";
fstring sid_string = "";
- enum SID_NAME_USE sid_type = SID_NAME_UNKNOWN;
+ enum lsa_SidType sid_type = SID_NAME_UNKNOWN;
int i;
gid_t gid;
+ const char modify_usage_str[] = "net groupmap modify "
+ "{ntgroup=<string>|sid=<SID>} "
+ "[comment=<string>] "
+ "[unixgroup=<string>] "
+ "[type=<domain|local>]";
+
+ if (c->display_usage) {
+ d_printf("Usage:\n%s\n", modify_usage_str);
+ return 0;
+ }
/* get the options */
for ( i=0; i<argc; i++ ) {
if ( !StrnCaseCmp(argv[i], "ntgroup", strlen("ntgroup")) ) {
fstrcpy( ntgroup, get_string_param( argv[i] ) );
if ( !ntgroup[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "sid", strlen("sid")) ) {
fstrcpy( sid_string, get_string_param( argv[i] ) );
if ( !sid_string[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "comment", strlen("comment")) ) {
fstrcpy( ntcomment, get_string_param( argv[i] ) );
if ( !ntcomment[0] ) {
- d_printf("must supply a comment string\n");
+ d_fprintf(stderr, "must supply a comment string\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "unixgroup", strlen("unixgroup")) ) {
fstrcpy( unixgrp, get_string_param( argv[i] ) );
if ( !unixgrp[0] ) {
- d_printf("must supply a group name\n");
+ d_fprintf(stderr, "must supply a group name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "type", strlen("type")) ) {
fstrcpy( type, get_string_param( argv[i] ) );
}
}
else {
- d_printf("Bad option: %s\n", argv[i]);
+ d_fprintf(stderr, "Bad option: %s\n", argv[i]);
return -1;
}
}
-
+
if ( !ntgroup[0] && !sid_string[0] ) {
- d_printf("Usage: net groupmap modify {ntgroup=<string>|sid=<SID>} [comment=<string>] [unixgroup=<string>] [type=<domain|local>]\n");
+ d_printf("Usage:\n%s\n", modify_usage_str);
return -1;
}
/* give preference to the SID; if both the ntgroup name and SID
- are defined, use the SID and assume that the group name could be a
+ are defined, use the SID and assume that the group name could be a
new name */
-
- if ( sid_string[0] ) {
+
+ if ( sid_string[0] ) {
if (!get_sid_from_input(&sid, sid_string)) {
return -1;
}
if (!get_sid_from_input(&sid, ntgroup)) {
return -1;
}
- }
+ }
/* Get the current mapping from the database */
if(!pdb_getgrsid(&map, sid)) {
- d_printf("Failure to local group SID in the database\n");
+ d_fprintf(stderr, "Failure to local group SID in the database\n");
return -1;
}
-
+
/*
* Allow changing of group type only between domain and local
* We disallow changing Builtin groups !!! (SID problem)
- */
- 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;
+ */
+ if (sid_type == SID_NAME_UNKNOWN) {
+ d_fprintf(stderr, "Can't map to an unknown group type.\n");
+ return -1;
+ }
+
+ if (map.sid_name_use == SID_NAME_WKN_GRP) {
+ d_fprintf(stderr, "You can only change between domain and local groups.\n");
+ return -1;
}
+ map.sid_name_use=sid_type;
+
/* Change comment if new one */
if ( ntcomment[0] )
fstrcpy( map.comment, ntcomment );
-
+
if ( ntgroup[0] )
fstrcpy( map.nt_name, ntgroup );
-
+
if ( unixgrp[0] ) {
gid = nametogid( unixgrp );
if ( gid == -1 ) {
- d_printf("Unable to lookup UNIX group %s. Make sure the group exists.\n",
+ d_fprintf(stderr, "Unable to lookup UNIX group %s. Make sure the group exists.\n",
unixgrp);
return -1;
}
-
+
map.gid = gid;
}
- if ( !pdb_update_group_mapping_entry(&map) ) {
- d_printf("Could not update group database\n");
+ if ( !NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map)) ) {
+ d_fprintf(stderr, "Could not update group database\n");
return -1;
}
-
+
d_printf("Updated mapping entry for %s\n", map.nt_name);
return 0;
}
-static int net_groupmap_delete(int argc, const char **argv)
+static int net_groupmap_delete(struct net_context *c, int argc, const char **argv)
{
DOM_SID sid;
fstring ntgroup = "";
fstring sid_string = "";
int i;
+ const char delete_usage_str[] = "net groupmap delete "
+ "{ntgroup=<string>|sid=<SID>}";
+
+ if (c->display_usage) {
+ d_printf("Usage:\n%s\n", delete_usage_str);
+ return 0;
+ }
/* get the options */
for ( i=0; i<argc; i++ ) {
if ( !StrnCaseCmp(argv[i], "ntgroup", strlen("ntgroup")) ) {
fstrcpy( ntgroup, get_string_param( argv[i] ) );
if ( !ntgroup[0] ) {
- d_printf("must supply a name\n");
+ d_fprintf(stderr, "must supply a name\n");
return -1;
- }
+ }
}
else if ( !StrnCaseCmp(argv[i], "sid", strlen("sid")) ) {
fstrcpy( sid_string, get_string_param( argv[i] ) );
if ( !sid_string[0] ) {
- d_printf("must supply a SID\n");
+ d_fprintf(stderr, "must supply a SID\n");
return -1;
- }
+ }
}
else {
- d_printf("Bad option: %s\n", argv[i]);
+ d_fprintf(stderr, "Bad option: %s\n", argv[i]);
return -1;
}
}
-
+
if ( !ntgroup[0] && !sid_string[0]) {
- d_printf("Usage: net groupmap delete {ntgroup=<string>|sid=<SID>}\n");
+ d_printf("Usage:\n%s\n", delete_usage_str);
return -1;
}
-
+
/* give preference to the SID if we have that */
-
+
if ( sid_string[0] )
fstrcpy( ntgroup, sid_string );
-
+
if ( !get_sid_from_input(&sid, ntgroup) ) {
- d_printf("Unable to resolve group %s to a SID\n", ntgroup);
+ d_fprintf(stderr, "Unable to resolve group %s to a SID\n", ntgroup);
return -1;
}
- if ( !pdb_delete_group_mapping_entry(sid) ) {
- printf("Failed to removing group %s from the mapping db!\n", ntgroup);
+ if ( !NT_STATUS_IS_OK(pdb_delete_group_mapping_entry(sid)) ) {
+ d_fprintf(stderr, "Failed to removing group %s from the mapping db!\n", ntgroup);
return -1;
}
return 0;
}
-static int net_groupmap_set(int argc, const char **argv)
+static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
{
const char *ntgroup = NULL;
struct group *grp = NULL;
GROUP_MAP map;
- BOOL have_map = False;
+ bool have_map = false;
- if ((argc < 1) || (argc > 2)) {
+ if ((argc < 1) || (argc > 2) || c->display_usage) {
d_printf("Usage: net groupmap set \"NT Group\" "
"[\"unix group\"] [-C \"comment\"] [-L] [-D]\n");
return -1;
}
- if ( opt_localgroup && opt_domaingroup ) {
+ if ( c->opt_localgroup && c->opt_domaingroup ) {
d_printf("Can only specify -L or -D, not both\n");
return -1;
}
grp = getgrnam(argv[1]);
if (grp == NULL) {
- d_printf("Could not find unix group %s\n", argv[1]);
+ d_fprintf(stderr, "Could not find unix group %s\n", argv[1]);
return -1;
}
}
/* Ok, add it */
if (grp == NULL) {
- d_printf("Could not find group mapping for %s\n",
+ d_fprintf(stderr, "Could not find group mapping for %s\n",
ntgroup);
return -1;
}
map.gid = grp->gr_gid;
- if (opt_rid == 0) {
- opt_rid = pdb_gid_to_group_rid(map.gid);
+ if (c->opt_rid == 0) {
+ if ( pdb_rid_algorithm() )
+ c->opt_rid = algorithmic_pdb_gid_to_group_rid(map.gid);
+ else {
+ if ( !pdb_new_rid((uint32*)&c->opt_rid) ) {
+ d_fprintf( stderr, "Could not allocate new RID\n");
+ return -1;
+ }
+ }
}
sid_copy(&map.sid, get_global_sam_sid());
- sid_append_rid(&map.sid, opt_rid);
+ sid_append_rid(&map.sid, c->opt_rid);
map.sid_name_use = SID_NAME_DOM_GRP;
fstrcpy(map.nt_name, ntgroup);
fstrcpy(map.comment, "");
- if (!pdb_add_group_mapping_entry(&map)) {
- d_printf("Could not add mapping entry for %s\n",
+ if (!NT_STATUS_IS_OK(pdb_add_group_mapping_entry(&map))) {
+ d_fprintf(stderr, "Could not add mapping entry for %s\n",
ntgroup);
return -1;
}
/* Now we have a mapping entry, update that stuff */
- if ( opt_localgroup || opt_domaingroup ) {
+ if ( c->opt_localgroup || c->opt_domaingroup ) {
if (map.sid_name_use == SID_NAME_WKN_GRP) {
- d_printf("Can't change type of the BUILTIN group %s\n",
+ d_fprintf(stderr, "Can't change type of the BUILTIN group %s\n",
map.nt_name);
return -1;
}
}
- if (opt_localgroup)
+ if (c->opt_localgroup)
map.sid_name_use = SID_NAME_ALIAS;
- if (opt_domaingroup)
+ if (c->opt_domaingroup)
map.sid_name_use = SID_NAME_DOM_GRP;
/* The case (opt_domaingroup && opt_localgroup) was tested for above */
- if (strlen(opt_comment) > 0)
- fstrcpy(map.comment, opt_comment);
+ if ((c->opt_comment != NULL) && (strlen(c->opt_comment) > 0)) {
+ fstrcpy(map.comment, c->opt_comment);
+ }
- if (strlen(opt_newntname) > 0)
- fstrcpy(map.nt_name, opt_newntname);
+ if ((c->opt_newntname != NULL) && (strlen(c->opt_newntname) > 0)) {
+ fstrcpy(map.nt_name, c->opt_newntname);
+ }
if (grp != NULL)
map.gid = grp->gr_gid;
- if (!pdb_update_group_mapping_entry(&map)) {
- d_printf("Could not update group mapping for %s\n", ntgroup);
+ if (!NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map))) {
+ d_fprintf(stderr, "Could not update group mapping for %s\n", ntgroup);
return -1;
}
return 0;
}
-static int net_groupmap_cleanup(int argc, const char **argv)
+static int net_groupmap_cleanup(struct net_context *c, int argc, const char **argv)
{
GROUP_MAP *map = NULL;
size_t i, entries;
- if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &entries,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net groupmap cleanup\n"
+ " Delete all group mappings\n");
+ return 0;
+ }
+
+ if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries,
ENUM_ALL_MAPPED)) {
- d_printf("Could not list group mappings\n");
+ d_fprintf(stderr, "Could not list group mappings\n");
return -1;
}
for (i=0; i<entries; i++) {
- if (map[i].sid_name_use == SID_NAME_WKN_GRP)
- continue;
-
if (map[i].gid == -1)
printf("Group %s is not mapped\n", map[i].nt_name);
if (!sid_check_is_in_our_domain(&map[i].sid)) {
printf("Deleting mapping for NT Group %s, sid %s\n",
map[i].nt_name,
- sid_string_static(&map[i].sid));
+ sid_string_tos(&map[i].sid));
pdb_delete_group_mapping_entry(map[i].sid);
}
}
return 0;
}
-static int net_groupmap_addmem(int argc, const char **argv)
+static int net_groupmap_addmem(struct net_context *c, int argc, const char **argv)
{
DOM_SID alias, member;
- if ( (argc != 2) ||
+ if ( (argc != 2) ||
+ c->display_usage ||
!string_to_sid(&alias, argv[0]) ||
!string_to_sid(&member, argv[1]) ) {
d_printf("Usage: net groupmap addmem alias-sid member-sid\n");
return -1;
}
- if (!pdb_add_aliasmem(&alias, &member)) {
- d_printf("Could not add sid %s to alias %s\n",
+ if (!NT_STATUS_IS_OK(pdb_add_aliasmem(&alias, &member))) {
+ d_fprintf(stderr, "Could not add sid %s to alias %s\n",
argv[1], argv[0]);
return -1;
}
return 0;
}
-static int net_groupmap_delmem(int argc, const char **argv)
+static int net_groupmap_delmem(struct net_context *c, int argc, const char **argv)
{
DOM_SID alias, member;
- if ( (argc != 2) ||
+ if ( (argc != 2) ||
+ c->display_usage ||
!string_to_sid(&alias, argv[0]) ||
!string_to_sid(&member, argv[1]) ) {
d_printf("Usage: net groupmap delmem alias-sid member-sid\n");
return -1;
}
- if (!pdb_del_aliasmem(&alias, &member)) {
- d_printf("Could not delete sid %s from alias %s\n",
+ if (!NT_STATUS_IS_OK(pdb_del_aliasmem(&alias, &member))) {
+ d_fprintf(stderr, "Could not delete sid %s from alias %s\n",
argv[1], argv[0]);
return -1;
}
return 0;
}
-static int net_groupmap_listmem(int argc, const char **argv)
+static int net_groupmap_listmem(struct net_context *c, int argc, const char **argv)
{
DOM_SID alias;
DOM_SID *members;
size_t i, num;
- if ( (argc != 1) ||
+ if ( (argc != 1) ||
+ c->display_usage ||
!string_to_sid(&alias, argv[0]) ) {
d_printf("Usage: net groupmap listmem alias-sid\n");
return -1;
members = NULL;
num = 0;
- if (!pdb_enum_aliasmem(&alias, &members, &num)) {
- d_printf("Could not list members for sid %s\n", argv[0]);
+ if (!NT_STATUS_IS_OK(pdb_enum_aliasmem(&alias, &members, &num))) {
+ d_fprintf(stderr, "Could not list members for sid %s\n", argv[0]);
return -1;
}
for (i = 0; i < num; i++) {
- printf("%s\n", sid_string_static(&(members[i])));
+ printf("%s\n", sid_string_tos(&(members[i])));
}
- SAFE_FREE(members);
+ TALLOC_FREE(members);
return 0;
}
-static BOOL print_alias_memberships(TALLOC_CTX *mem_ctx,
+static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
const DOM_SID *member)
{
alias_rids = NULL;
num_alias_rids = 0;
- if (!pdb_enum_alias_memberships(mem_ctx, domain_sid, member, 1,
- &alias_rids, &num_alias_rids)) {
- d_printf("Could not list memberships for sid %s\n",
- sid_string_static(member));
- return False;
+ if (!NT_STATUS_IS_OK(pdb_enum_alias_memberships(
+ mem_ctx, domain_sid, member, 1,
+ &alias_rids, &num_alias_rids))) {
+ d_fprintf(stderr, "Could not list memberships for sid %s\n",
+ sid_string_tos(member));
+ return false;
}
for (i = 0; i < num_alias_rids; i++) {
DOM_SID alias;
sid_copy(&alias, domain_sid);
sid_append_rid(&alias, alias_rids[i]);
- printf("%s\n", sid_string_static(&alias));
+ printf("%s\n", sid_string_tos(&alias));
}
- return True;
+ return true;
}
-static int net_groupmap_memberships(int argc, const char **argv)
+static int net_groupmap_memberships(struct net_context *c, int argc, const char **argv)
{
TALLOC_CTX *mem_ctx;
DOM_SID *domain_sid, *builtin_sid, member;
- if ( (argc != 1) ||
+ if ( (argc != 1) ||
+ c->display_usage ||
!string_to_sid(&member, argv[0]) ) {
d_printf("Usage: net groupmap memberof sid\n");
return -1;
mem_ctx = talloc_init("net_groupmap_memberships");
if (mem_ctx == NULL) {
- d_printf("talloc_init failed\n");
+ d_fprintf(stderr, "talloc_init failed\n");
return -1;
}
domain_sid = get_global_sam_sid();
builtin_sid = string_sid_talloc(mem_ctx, "S-1-5-32");
if ((domain_sid == NULL) || (builtin_sid == NULL)) {
- d_printf("Could not get domain sid\n");
+ d_fprintf(stderr, "Could not get domain sid\n");
return -1;
}
return 0;
}
-int net_help_groupmap(int argc, const char **argv)
-{
- d_printf("net groupmap add"\
- "\n Create a new group mapping\n");
- d_printf("net groupmap modify"\
- "\n Update a group mapping\n");
- d_printf("net groupmap delete"\
- "\n Remove a group mapping\n");
- d_printf("net groupmap addmem"\
- "\n Add a foreign alias member\n");
- d_printf("net groupmap delmem"\
- "\n Delete a foreign alias member\n");
- d_printf("net groupmap listmem"\
- "\n List foreign group members\n");
- d_printf("net groupmap memberships"\
- "\n List foreign group memberships\n");
- d_printf("net groupmap list"\
- "\n List current group map\n");
- d_printf("net groupmap set"\
- "\n Set group mapping\n");
- d_printf("net groupmap cleanup"\
- "\n Remove foreign group mapping entries\n");
-
- return -1;
-}
-
-
/***********************************************************
migrated functionality from smbgroupedit
**********************************************************/
-int net_groupmap(int argc, const char **argv)
+int net_groupmap(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"add", net_groupmap_add},
- {"modify", net_groupmap_modify},
- {"delete", net_groupmap_delete},
- {"set", net_groupmap_set},
- {"cleanup", net_groupmap_cleanup},
- {"addmem", net_groupmap_addmem},
- {"delmem", net_groupmap_delmem},
- {"listmem", net_groupmap_listmem},
- {"memberships", net_groupmap_memberships},
- {"list", net_groupmap_list},
- {"help", net_help_groupmap},
- {NULL, NULL}
+ {
+ "add",
+ net_groupmap_add,
+ NET_TRANSPORT_LOCAL,
+ "Create a new group mapping",
+ "net groupmap add\n"
+ " Create a new group mapping"
+ },
+ {
+ "modify",
+ net_groupmap_modify,
+ NET_TRANSPORT_LOCAL,
+ "Update a group mapping",
+ "net groupmap modify\n"
+ " Modify an existing group mapping"
+ },
+ {
+ "delete",
+ net_groupmap_delete,
+ NET_TRANSPORT_LOCAL,
+ "Remove a group mapping",
+ "net groupmap delete\n"
+ " Remove a group mapping"
+ },
+ {
+ "set",
+ net_groupmap_set,
+ NET_TRANSPORT_LOCAL,
+ "Set group mapping",
+ "net groupmap set\n"
+ " Set a group mapping"
+ },
+ {
+ "cleanup",
+ net_groupmap_cleanup,
+ NET_TRANSPORT_LOCAL,
+ "Remove foreign group mapping entries",
+ "net groupmap cleanup\n"
+ " Remove foreign group mapping entries"
+ },
+ {
+ "addmem",
+ net_groupmap_addmem,
+ NET_TRANSPORT_LOCAL,
+ "Add a foreign alias member",
+ "net groupmap addmem\n"
+ " Add a foreign alias member"
+ },
+ {
+ "delmem",
+ net_groupmap_delmem,
+ NET_TRANSPORT_LOCAL,
+ "Delete foreign alias member",
+ "net groupmap delmem\n"
+ " Delete foreign alias member"
+ },
+ {
+ "listmem",
+ net_groupmap_listmem,
+ NET_TRANSPORT_LOCAL,
+ "List foreign group members",
+ "net groupmap listmem\n"
+ " List foreign alias members"
+ },
+ {
+ "memberships",
+ net_groupmap_memberships,
+ NET_TRANSPORT_LOCAL,
+ "List foreign group memberships",
+ "net groupmap memberships\n"
+ " List foreign group memberships"
+ },
+ {
+ "list",
+ net_groupmap_list,
+ NET_TRANSPORT_LOCAL,
+ "List current group map",
+ "net groupmap list\n"
+ " List current group map"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
/* we shouldn't have silly checks like this */
if (getuid() != 0) {
- d_printf("You must be root to edit group mappings.\nExiting...\n");
+ d_fprintf(stderr, "You must be root to edit group mappings.\n");
return -1;
}
-
- if ( argc )
- return net_run_function(argc, argv, func, net_help_groupmap);
- return net_help_groupmap( argc, argv );
+ return net_run_function(c,argc, argv, "net groupmap", func);
}
git.samba.org / ira / wip.git / blobdiff