[asterisk-bugs] [Asterisk 0010811]: Wrong definition of AST_KEY_DIR

[noreply at bugs.digium.com]

A NOTE has been added to this issue. 
====================================================================== 
http://bugs.digium.com/view.php?id=10811 
====================================================================== 
Reported By:                paravoid
Assigned To:                
====================================================================== 
Project:                    Asterisk
Issue ID:                   10811
Category:                   Core/BuildSystem
Reproducibility:            always
Severity:                   minor
Priority:                   normal
Status:                     new
Asterisk Version:           1.4.11  
SVN Branch (only for SVN checkouts, not tarball releases): N/A  
SVN Revision (number only!):  
Disclaimer on File?:        N/A 
Request Review:              
====================================================================== 
Date Submitted:             09-24-2007 01:34 CDT
Last Modified:              09-24-2007 02:07 CDT
====================================================================== 
Summary:                    Wrong definition of AST_KEY_DIR
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 :)

====================================================================== 

---------------------------------------------------------------------- 
 paravoid - 09-24-07 02:07  
---------------------------------------------------------------------- 
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. 

Issue History 
Date Modified   Username       Field                    Change               
====================================================================== 
09-24-07 02:07  paravoid       Note Added: 0071017                          
======================================================================