[PATCH] crda: allow loading of regulatory.bin from /lib/crda in addition to /usr/lib/crda

[PATCH] crda: allow loading of regulatory.bin from /lib/crda in addition to /usr/lib/crda

[Helmut Schaa]

As crda is typically installed in /sbin it might be worth to install
regulatory.bin into /lib/crda instead of /usr/lib/crda. Hence, extend
crda to try both paths for loading the database.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
---

diff --git a/crda.c b/crda.c
index f2c471f..55632a6 100644
--- a/crda.c
+++ b/crda.c
@@ -143,7 +143,7 @@ nla_put_failure:
 
 int main(int argc, char **argv)
 {
-	int fd;
+	int fd = -1;
 	struct stat stat;
 	__u8 *db;
 	struct regdb_file_header *header;
@@ -162,7 +162,12 @@ int main(int argc, char **argv)
 	struct nlattr *nl_reg_rules;
 	int num_rules;
 
-	const char regdb[] = "/usr/lib/crda/regulatory.bin";
+	const char *regdb_paths[] = {
+		"/usr/lib/crda/regulatory.bin",
+		"/lib/crda/regulatory.bin",
+		NULL
+	};
+	const char **regdb = regdb_paths;
 
 	if (argc != 1) {
 		fprintf(stderr, "Usage: %s\n", argv[0]);
@@ -183,7 +188,12 @@ int main(int argc, char **argv)
 
 	memcpy(alpha2, env_country, 2);
 
-	fd = open(regdb, O_RDONLY);
+	while (*regdb != NULL) {
+		fd = open(*regdb, O_RDONLY);
+		if (fd >= 0)
+			break;
+		regdb++;
+	}
 	if (fd < 0) {
 		perror("failed to open db file");
 		return -ENOENT;

Re: [PATCH] crda: allow loading of regulatory.bin from /lib/crda in addition to /usr/lib/crda

[John W. Linville]

On Tue, Feb 24, 2009 at 03:31:50PM +0100, Helmut Schaa wrote:
> As crda is typically installed in /sbin it might be worth to install
> regulatory.bin into /lib/crda instead of /usr/lib/crda. Hence, extend
> crda to try both paths for loading the database.
> 
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Is it worthwhile to add /usr/local/lib/crda too?  That way a user could
override the regulatory.bin without disturbing the distro's packaging.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH] crda: allow loading of regulatory.bin from /lib/crda in addition to /usr/lib/crda

[Luis R. Rodriguez]

On Tue, Feb 24, 2009 at 6:55 AM, John W. Linville
<linville@tuxdriver.com> wrote:
> On Tue, Feb 24, 2009 at 03:31:50PM +0100, Helmut Schaa wrote:
>> As crda is typically installed in /sbin it might be worth to install
>> regulatory.bin into /lib/crda instead of /usr/lib/crda. Hence, exten=
d
>> crda to try both paths for loading the database.
>>
>> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Thanks Helmut, applied.

> Is it worthwhile to add /usr/local/lib/crda too? =C2=A0That way a use=
r could
> override the regulatory.bin without disturbing the distro's packaging=
=2E

Added that as well and added that first in the path.

  Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html