diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-20 09:55:05 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-20 09:55:05 +0000 |
| commit | 0a8518b7c882ee0c0e954fac34fb488d42a9fc00 (patch) | |
| tree | 0d6c0aea4374306de8f0b0397b8c7138771c6870 /res | |
| parent | 832aa00d113c434ab218ae2321b88be1df51d074 (diff) | |
modify http://svn.digium.com/view/asterisk?view=rev&rev=93603
so that paths and filename are writable by asterisk.c without
causing segfaults.
This involves defining the variables as const char *,
and having them point to as static, writable buffer
defined in asterisk.c
On passing, fix some errors in using these variables
in some files in utils/ , and in res/snmp/agent.c
which was redefining a variable without using paths.h
(not applicable to 1.4)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94168 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/snmp/agent.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/res/snmp/agent.c b/res/snmp/agent.c index aace4623a..65f0fd434 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -51,6 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> +#include "asterisk/paths.h" /* need ast_config_AST_SOCKET */ #include "asterisk/channel.h" #include "asterisk/logger.h" #include "asterisk/options.h" @@ -71,9 +72,6 @@ int header_simple_table(struct variable *, oid *, size_t *, int, size_t *, Write int register_sysORTable(oid *, size_t, const char *); int unregister_sysORTable(oid *, size_t); -/* Not defined in header files */ -extern char ast_config_AST_SOCKET[]; - /* Forward declaration */ static void init_asterisk_mib(void); |