Merged revisions 159897 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r159897 | mvanbaak | 2008-12-01 15:05:41 +0100 (Mon, 01 Dec 2008) | 4 lines

  make manager compile on OpenBSD.
  The last (10th) argument to ast_channel_alloc here should be a pointer
  and NULL is not really a pointer.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159898 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index 077fb01..0676d8d 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -1814,7 +1814,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
 
        if (varname[strlen(varname) - 1] == ')') {
                if (!c) {
-                       c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", NULL);
+                       c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
                        if (c) {
                                ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
                                ast_channel_free(c);