Importing files for 1.2.26.2 release

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

.version

@@ -1 +1 @@
-1.2.27
+1.2.26.2

CREDITS

@@ -95,7 +95,7 @@ Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
 	available under a Creative Commons License at http://www.asteriskdocs.org
 
 === HOLD MUSIC ===
-Music provided by www.opsound.org
+Music provided by www.freeplaymusic.com
 
 === OTHER SOURCE CODE IN ASTERISK ===
 

ChangeLog

@@ -1,17 +1,3 @@
-2008-03-18  Russell Bryant <russell@digium.com>
-
-	* Asterisk 1.2.27 released
-
-2008-03-18 16:27 +0000 [r109488]  Terry Wilson <twilson@digium.com>
-
-	* include/asterisk/astobj.h: Fix character string being treated as
-	  format string
-
-2008-03-18 15:08 +0000 [r109391]  Jason Parker <jparker@digium.com>
-
-	* channels/chan_sip.c: Do not return with a successful
-	  authentication if the From header ends up empty. (AST-2008-003)
-
 2008-01-22  Russell Bryant <russell@digium.com>
 
 	* Asterisk 1.2.26.2 released

README.fpm

@@ -0,0 +1,8 @@
+About Hold Music
+================
+Digium has licensed the music included with
+the Asterisk distribution From FreePlayMusic
+for use and distribution with Asterisk.  It
+is licensed ONLY for use as hold music within
+an Asterisk based PBX.
+

README.opsound

@@ -1,22 +0,0 @@
-About Hold Music
-================
-These files were obtained from http://opsound.org, where the authors placed them
-under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
-may be found at http://creativecommons.org.
-
-Credits
-================
-macroform-cold_day - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-macroform-robot_dity - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-macroform-the_simplicity - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-manolo_camp-morning_coffee - Manolo Camp
-beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
-
-reno_project-system - Reno Project
-renoproject@hotmail.com - http://www.jamendo.com/en/album/23661

channels/chan_sip.c

@@ -7308,6 +7308,8 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
 		ast_copy_string(p->cid_num, of, sizeof(p->cid_num));
 		ast_shrink_phone_number(p->cid_num);
 	}
+	if (ast_strlen_zero(of))
+		return 0;
 
 	if (!mailbox)	/* If it's a mailbox SUBSCRIBE, don't check users */
 		user = find_user(of, 1);

include/asterisk/astobj.h

@@ -743,7 +743,7 @@ extern "C" {
  * descriptor.
  */
 #define ASTOBJ_CONTAINER_DUMP(fd,s,slen,container) \
-	ASTOBJ_CONTAINER_TRAVERSE(container, 1, do { ASTOBJ_DUMP(s,slen,iterator); ast_cli(fd, "%s", s); } while(0))
+	ASTOBJ_CONTAINER_TRAVERSE(container, 1, do { ASTOBJ_DUMP(s,slen,iterator); ast_cli(fd, s); } while(0))
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

sounds/moh/LICENSE

@@ -1,7 +1,3 @@
-About Hold Music
-================
-These files were obtained from http://opsound.org, where the authors placed them
-under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
-may be found at http://creativecommons.org.
-
-
+Music Provided By www.freeplaymusic.com. These sound files are provided by
+Digium under license from Freeplay Music Corporation for use in conjunction
+with the Asterisk software only.