From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 23:35:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E36FC1065671; Tue, 16 Sep 2008 23:35:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A77C1106567A
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 23:35:52 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9322D8FC13
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 23:35:52 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8GNZq02024790
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 23:35:52 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8GNZq76024788
	for perforce@freebsd.org; Tue, 16 Sep 2008 23:35:52 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 16 Sep 2008 23:35:52 GMT
Message-Id: <200809162335.m8GNZq76024788@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149919 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Sep 2008 23:35:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=149919

Change 149919 by sam@sam_ebb on 2008/09/16 23:35:13

	check for undefined identifiers

Affected files ...

.. //depot/projects/vap/sbin/ifconfig/regdomain.c#6 edit

Differences ...

==== //depot/projects/vap/sbin/ifconfig/regdomain.c#6 (text+ko) ====

@@ -390,7 +390,7 @@
 	struct freqband *fp;
 	struct netband *nb;
 	const void *id;
-	int i;
+	int i, errors;
 
 	memset(rdp, 0, sizeof(struct regdata));
 	mt = calloc(1, sizeof(struct mystate));
@@ -415,6 +415,8 @@
 	if (rdp->ident == NULL)
 		return ENOMEM;
 	free(mt);
+
+	errors = 0;
 	i = 0;
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		rdp->ident[i].id = dp->name;
@@ -440,26 +442,71 @@
 		if (dp->cc != NULL) {
 			id = dp->cc;
 			dp->cc = findid(rdp, id, COUNTRY);
+			if (dp->cc == NULL) {
+				warnx("undefined country \"%s\"",
+				    __DECONST(char *, id));
+				errors++;
+			}
 			free(__DECONST(char *, id));
 		}
-		LIST_FOREACH(nb, &dp->bands_11b, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11g, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11a, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11ng, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11na, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
+		LIST_FOREACH(nb, &dp->bands_11b, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11b band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11g, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11g band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11a, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11a band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11ng, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11ng band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11na, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11na band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
 	}
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		id = cp->rd;
 		cp->rd = findid(rdp, id, DOMAIN);
+		if (cp->rd == NULL) {
+			warnx("undefined country \"%s\"",
+			    __DECONST(char *, id));
+			errors++;
+		}
 		free(__DECONST(char *, id));
 	}
 
-	return 0;
+	return errors ? EINVAL : 0;
 }
 
 static void