[Home]

Summary:ASTERISK-10376: Wrong definition of AST_KEY_DIR
Reporter:Faidon Liambotis (paravoid)Labels:
Date Opened:2007-09-24 01:34:42Date Closed:2007-09-24 12:10:04
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Core/BuildSystem
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:
Description:Makefile has this:
 $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys

main/asterisk.c:2399 has this:
 } else if (!strcasecmp(v->name, "astdatadir")) {
   ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
   snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);

build_tools/make_defaults_h:17 however:
 #define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"

This, obviously, needs to be changed to:
 #define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"

It's so trivial that I'm not even attaching a unified diff :)
Comments:By: Faidon Liambotis (paravoid) 2007-09-24 02:07:25

BTW, since this is too trivial to open a bug report for it and is related a bit to this bug report,

--- asterisk-1.4.9~dfsg.orig/Makefile
+++ asterisk-1.4.9~dfsg/Makefile
@@ -442,2 +442 @@
-       $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-       $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+       $(INSTALL) -m 644 keys/* $(DESTDIR)$(ASTDATADIR)/keys

This will allow to place keys under the keys directory without the need to change the Makefiles to install them.
Doesn't change anything for you.
By: Digium Subversion (svnbot) 2007-09-24 12:03:36

Repository: asterisk
Revision: 83695

------------------------------------------------------------------------
r83695 | tilghman | 2007-09-24 12:03:36 -0500 (Mon, 24 Sep 2007) | 4 lines

In the source, keys are relative to the datadir, not varlib (which is the same
in most cases, but it's good to be accurate).
Closes issue ASTERISK-10376

------------------------------------------------------------------------
By: Digium Subversion (svnbot) 2007-09-24 12:10:04

Repository: asterisk
Revision: 83696

------------------------------------------------------------------------
r83696 | tilghman | 2007-09-24 12:10:03 -0500 (Mon, 24 Sep 2007) | 12 lines

Merged revisions 83695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r83695 | tilghman | 2007-09-24 12:22:08 -0500 (Mon, 24 Sep 2007) | 4 lines

In the source, keys are relative to the datadir, not varlib (which is the same
in most cases, but it's good to be accurate).
Closes issue ASTERISK-10376

........

------------------------------------------------------------------------