make static, usergoup=>group changes

Author: Emmankoko

usr.sbin/npf/npfctl/npf_data.c

@@ -272,7 +272,7 @@ npfctl_parse_table_id(const char *name)
 int
 npfctl_parse_user(const char *user, uint32_t *uid)
 {
-	if (strcmp(user, "unknown"))
+	if (!strcmp(user, "unknown"))
 		*uid = UID_MAX;
 	else {
 		struct passwd	*pw;
@@ -286,14 +286,14 @@ npfctl_parse_user(const char *user, uint32_t *uid)
 }
 
 int
-npfctl_parse_usergroup(const char *usergroup, *uint32_t *gid)
+npfctl_parse_group(const char *group, *uint32_t *gid)
 {
-	if (!strcmp(usergroup, "unknown"))
+	if (!strcmp(group, "unknown"))
 		*gid = GID_MAX;
 	else {
 		struct group	*grp;
 
-		if ((grp = getgrnam(usergroup)) == NULL) {
+		if ((grp = getgrnam(group)) == NULL) {
 			return -1;
 		}
 		*gid = grp->gr_gid;

usr.sbin/npf/npfctl/npf_parse.y

@@ -1091,23 +1091,23 @@ gid
 	}
 	| IDENTIFIER
 	{
-		if (npfctl_parse_usergroup($1, &$$) == -1) {
-			yyerror("unknown user group %s", $1);
+		if (npfctl_parse_group($1, &$$) == -1) {
+			yyerror("unknown group %s", $1);
 			YYERROR;
 		}
 	}
 	| VAR_ID
 	{
 		npfvar_t *vp = npfvar_lookup($1);
 		int type = npfvar_get_type(vp, 0);
-		char *user_group;
+		char *group;
 
 		switch (type) {
 		case NPFVAR_IDENTIFIER:
 		case NPFVAR_STRING:
-			user_group = npfvar_expand_string(vp);
-			if (npfctl_parse_usergroup(user_group, &$$) == -1) {
-				yyerror("unknown user group %s", $1);
+			group = npfvar_expand_string(vp);
+			if (npfctl_parse_group(group, &$$) == -1) {
+				yyerror("unknown group %s", $1);
 				YYERROR;
 			}
 			break;

usr.sbin/npf/npfctl/npfctl.h

@@ -142,7 +142,7 @@ npfvar_t *	npfctl_parse_port_range_variable(const char *, npfvar_t *);
 npfvar_t *	npfctl_parse_fam_addr_mask(const char *, const char *,
 		    unsigned long *);
 int		npfctl_parse_user(const char *, uint32_t *);
-int		npfctl_parse_usergroup(const char *, uint32_t *);
+int		npfctl_parse_group(const char *, uint32_t *);
 struct r_uid *	npfctl_init_uid(uint32_t, uint32_t, uint8_t);
 struct r_gid *	npfctl_init_gid(uint32_t, uint32_t, uint8_t);
 bool		npfctl_parse_cidr(char *, fam_addr_mask_t *, int *);