diff --git a/docs/parsers/group.md b/docs/parsers/group.md index dd9de4a6..9c064b93 100644 --- a/docs/parsers/group.md +++ b/docs/parsers/group.md @@ -17,19 +17,19 @@ Examples: "group_name": "nobody", "password": "*", "gid": -2, - "group_list": [] + "members": [] }, { "group_name": "nogroup", "password": "*", "gid": -1, - "group_list": [] + "members": [] }, { "group_name": "wheel", "password": "*", "gid": 0, - "group_list": [ + "members": [ "root" ] }, @@ -37,7 +37,7 @@ Examples: "group_name": "certusers", "password": "*", "gid": 29, - "group_list": [ + "members": [ "root", "_jabber", "_postfix", @@ -55,7 +55,7 @@ Examples: "group_name": "nobody", "password": "*", "gid": "-2", - "group_list": [ + "members": [ "" ] }, @@ -63,7 +63,7 @@ Examples: "group_name": "nogroup", "password": "*", "gid": "-1", - "group_list": [ + "members": [ "" ] }, @@ -71,7 +71,7 @@ Examples: "group_name": "wheel", "password": "*", "gid": "0", - "group_list": [ + "members": [ "root" ] }, @@ -79,7 +79,7 @@ Examples: "group_name": "certusers", "password": "*", "gid": "29", - "group_list": [ + "members": [ "root", "_jabber", "_postfix", @@ -116,7 +116,7 @@ Returns: "group_name": string, "password": string, "gid": integer, - "group_list": [ + "members": [ string ] } diff --git a/jc/parsers/group.py b/jc/parsers/group.py index ea4c8499..d4b35ef9 100644 --- a/jc/parsers/group.py +++ b/jc/parsers/group.py @@ -16,19 +16,19 @@ Examples: "group_name": "nobody", "password": "*", "gid": -2, - "group_list": [] + "members": [] }, { "group_name": "nogroup", "password": "*", "gid": -1, - "group_list": [] + "members": [] }, { "group_name": "wheel", "password": "*", "gid": 0, - "group_list": [ + "members": [ "root" ] }, @@ -36,7 +36,7 @@ Examples: "group_name": "certusers", "password": "*", "gid": 29, - "group_list": [ + "members": [ "root", "_jabber", "_postfix", @@ -54,7 +54,7 @@ Examples: "group_name": "nobody", "password": "*", "gid": "-2", - "group_list": [ + "members": [ "" ] }, @@ -62,7 +62,7 @@ Examples: "group_name": "nogroup", "password": "*", "gid": "-1", - "group_list": [ + "members": [ "" ] }, @@ -70,7 +70,7 @@ Examples: "group_name": "wheel", "password": "*", "gid": "0", - "group_list": [ + "members": [ "root" ] }, @@ -78,7 +78,7 @@ Examples: "group_name": "certusers", "password": "*", "gid": "29", - "group_list": [ + "members": [ "root", "_jabber", "_postfix", @@ -124,7 +124,7 @@ def process(proc_data): "group_name": string, "password": string, "gid": integer, - "group_list": [ + "members": [ string ] } @@ -140,8 +140,8 @@ def process(proc_data): except (ValueError): entry[key] = None - if entry['group_list'] == ['']: - entry['group_list'] = [] + if entry['members'] == ['']: + entry['members'] = [] return proc_data @@ -180,7 +180,7 @@ def parse(data, raw=False, quiet=False): output_line['group_name'] = fields[0] output_line['password'] = fields[1] output_line['gid'] = fields[2] - output_line['group_list'] = fields[3].split(',') + output_line['members'] = fields[3].split(',') raw_output.append(output_line)