importing files for 1.2.7.1-netsec release

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.7.1-netsec@19821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Creating tag for the release of asterisk-1.2.7.1-netsec
2025-12-12 18:12:33 +00:00 · 2006-04-13 17:54:14 +00:00 · 2006-04-13 17:53:29 +00:00 · 2006-04-13 17:52:23 +00:00 · 2006-04-13 17:51:35 +00:00 · 2006-04-13 16:06:43 +00:00
5 changed files with 1898 additions and 5 deletions
--- a/.lastclean
+++ b/.lastclean
@@ -0,0 +1 @@
+8
--- a/.version
+++ b/.version
@@ -0,0 +1 @@
+1.2.7.1-netsec
--- a/1890
+++ b/1890
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -171,16 +171,16 @@ static int page_exec(struct ast_channel *chan, void *data)
 		return -1;
 	}

+	ast_copy_string(originator, chan->name, sizeof(originator));
+	if ((tmp = strchr(originator, '-')))
+		*tmp = '\0';
+
 	tmp = strsep(&options, "|");
 	if (options)
 		ast_app_parse_options(page_opts, &flags, NULL, options);

 	snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m");

-	ast_copy_string(originator, chan->name, sizeof(originator));
-	if ((tmp = strchr(originator, '-')))
-		*tmp = '\0';
-
 	while ((tech = strsep(&tmp, "&"))) {
 		/* don't call the originating device */
 		if (!strcasecmp(tech, originator))
--- a/pbx.c
+++ b/pbx.c
@@ -1023,7 +1023,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
 						*ret = workspace;
 					} else
 						*ret = NULL;
-				}
+				} else
+					goto icky;
 			} else if (!strcmp(var + 6, "ANI")) {
 				/* CALLERANI */
 				if (c->cid.cid_ani) {
Author	SHA1	Message	Date
Kevin P. Fleming	1000a2d07a	importing files for 1.2.7.1-netsec release git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.7.1-netsec@19821 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-13 17:54:14 +00:00
Kevin P. Fleming	02f59b431b	Creating tag for the release of asterisk-1.2.7.1-netsec git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.7.1-netsec@19820 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-13 17:53:29 +00:00
Kevin P. Fleming	63566eac42	Merged revisions 19812 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r19812 \| kpfleming \| 2006-04-13 12:40:21 -0500 (Thu, 13 Apr 2006) \| 2 lines oops... let's not set a variable and then immediately overwrite it while assuming its old value will magically return ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19818 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-13 17:52:23 +00:00
Kevin P. Fleming	87dfbd848e	Creating tag for the release of asterisk-1.2.7.1-netsec git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.7.1-netsec@19817 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-13 17:51:35 +00:00
Automerge script	b64b6ef1f7	automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19808 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-13 16:06:43 +00:00