svn commit: r275245 - stable/10/usr.sbin/ctld

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Nov 29 15:34:17 2014
New Revision: 275245
URL: https://svnweb.freebsd.org/changeset/base/275245

Log:
  MFC r273816:
  
  Simplify code; no functional changes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/ctld/ctld.c
  stable/10/usr.sbin/ctld/ctld.h
  stable/10/usr.sbin/ctld/parse.y
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Sat Nov 29 15:32:15 2014	(r275244)
+++ stable/10/usr.sbin/ctld/ctld.c	Sat Nov 29 15:34:17 2014	(r275245)
@@ -522,25 +522,10 @@ auth_group_find(const struct conf *conf,
 	return (NULL);
 }
 
-static int
-auth_group_set_type(struct auth_group *ag, int type)
-{
-
-	if (ag->ag_type == AG_TYPE_UNKNOWN) {
-		ag->ag_type = type;
-		return (0);
-	}
-
-	if (ag->ag_type == type)
-		return (0);
-
-	return (1);
-}
-
 int
-auth_group_set_type_str(struct auth_group *ag, const char *str)
+auth_group_set_type(struct auth_group *ag, const char *str)
 {
-	int error, type;
+	int type;
 
 	if (strcmp(str, "none") == 0) {
 		type = AG_TYPE_NO_AUTHENTICATION;
@@ -560,20 +545,22 @@ auth_group_set_type_str(struct auth_grou
 		return (1);
 	}
 
-	error = auth_group_set_type(ag, type);
-	if (error != 0) {
-		if (ag->ag_name != NULL)
+	if (ag->ag_type != AG_TYPE_UNKNOWN && ag->ag_type != type) {
+		if (ag->ag_name != NULL) {
 			log_warnx("cannot set auth-type to \"%s\" for "
 			    "auth-group \"%s\"; already has a different "
 			    "type", str, ag->ag_name);
-		else
+		} else {
 			log_warnx("cannot set auth-type to \"%s\" for target "
 			    "\"%s\"; already has a different type",
 			    str, ag->ag_target->t_name);
+		}
 		return (1);
 	}
 
-	return (error);
+	ag->ag_type = type;
+
+	return (0);
 }
 
 static struct portal *
@@ -979,25 +966,10 @@ isns_deregister(struct isns *isns)
 	set_timeout(0, false);
 }
 
-static int
-portal_group_set_filter(struct portal_group *pg, int filter)
-{
-
-	if (pg->pg_discovery_filter == PG_FILTER_UNKNOWN) {
-		pg->pg_discovery_filter = filter;
-		return (0);
-	}
-
-	if (pg->pg_discovery_filter == filter)
-		return (0);
-
-	return (1);
-}
-
 int
-portal_group_set_filter_str(struct portal_group *pg, const char *str)
+portal_group_set_filter(struct portal_group *pg, const char *str)
 {
-	int error, filter;
+	int filter;
 
 	if (strcmp(str, "none") == 0) {
 		filter = PG_FILTER_NONE;
@@ -1015,15 +987,17 @@ portal_group_set_filter_str(struct porta
 		return (1);
 	}
 
-	error = portal_group_set_filter(pg, filter);
-	if (error != 0) {
+	if (pg->pg_discovery_filter != PG_FILTER_UNKNOWN &&
+	    pg->pg_discovery_filter != filter) {
 		log_warnx("cannot set discovery-filter to \"%s\" for "
 		    "portal-group \"%s\"; already has a different "
 		    "value", str, pg->pg_name);
 		return (1);
 	}
 
-	return (error);
+	pg->pg_discovery_filter = filter;
+
+	return (0);
 }
 
 static bool

Modified: stable/10/usr.sbin/ctld/ctld.h
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.h	Sat Nov 29 15:32:15 2014	(r275244)
+++ stable/10/usr.sbin/ctld/ctld.h	Sat Nov 29 15:34:17 2014	(r275245)
@@ -266,7 +266,7 @@ struct auth_group	*auth_group_new(struct
 void			auth_group_delete(struct auth_group *ag);
 struct auth_group	*auth_group_find(const struct conf *conf,
 			    const char *name);
-int			auth_group_set_type_str(struct auth_group *ag,
+int			auth_group_set_type(struct auth_group *ag,
 			    const char *type);
 
 const struct auth	*auth_new_chap(struct auth_group *ag,
@@ -299,7 +299,7 @@ struct portal_group	*portal_group_find(c
 			    const char *name);
 int			portal_group_add_listen(struct portal_group *pg,
 			    const char *listen, bool iser);
-int			portal_group_set_filter_str(struct portal_group *pg,
+int			portal_group_set_filter(struct portal_group *pg,
 			    const char *filter);
 
 int			isns_new(struct conf *conf, const char *addr);

Modified: stable/10/usr.sbin/ctld/parse.y
==============================================================================
--- stable/10/usr.sbin/ctld/parse.y	Sat Nov 29 15:32:15 2014	(r275244)
+++ stable/10/usr.sbin/ctld/parse.y	Sat Nov 29 15:34:17 2014	(r275245)
@@ -238,7 +238,7 @@ auth_group_auth_type:	AUTH_TYPE STR
 	{
 		int error;
 
-		error = auth_group_set_type_str(auth_group, $2);
+		error = auth_group_set_type(auth_group, $2);
 		free($2);
 		if (error != 0)
 			return (1);
@@ -358,7 +358,7 @@ portal_group_discovery_filter:	DISCOVERY
 	{
 		int error;
 
-		error = portal_group_set_filter_str(portal_group, $2);
+		error = portal_group_set_filter(portal_group, $2);
 		free($2);
 		if (error != 0)
 			return (1);
@@ -480,7 +480,7 @@ target_auth_type:	AUTH_TYPE STR
 			}
 			target->t_auth_group->ag_target = target;
 		}
-		error = auth_group_set_type_str(target->t_auth_group, $2);
+		error = auth_group_set_type(target->t_auth_group, $2);
 		free($2);
 		if (error != 0)
 			return (1);