[asterisk-commits] seanbright: branch seanbright/resolve-shadow-warnings r114334 - in /team/sean...

Mon Apr 21 12:03:59 CDT 2008

Author: seanbright
Date: Mon Apr 21 12:03:58 2008
New Revision: 114334

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114334
Log:
Merged revisions 114320,114323,114325,114327 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114320 | file | 2008-04-21 10:34:06 -0400 (Mon, 21 Apr 2008) | 6 lines

Only print out the error message if ldap_modify_ext_s actually returns an error, and not success.
(closes issue #12438)
Reported by: gservat
Patches:
      res_config_ldap.c-patch-code uploaded by gservat (license 466)

................
r114323 | file | 2008-04-21 10:40:33 -0400 (Mon, 21 Apr 2008) | 12 lines

Merged revisions 114322 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114322 | file | 2008-04-21 11:39:32 -0300 (Mon, 21 Apr 2008) | 4 lines

Only drop audio if we receive it without a progress indication. We allow other frames through such as DTMF because they may be needed to complete the call.
(closes issue #12440)
Reported by: aragon

........

................
r114325 | russell | 2008-04-21 11:01:04 -0400 (Mon, 21 Apr 2008) | 2 lines

Add a simple janitor project

................
r114327 | jpeeler | 2008-04-21 11:34:37 -0400 (Mon, 21 Apr 2008) | 2 lines

This removes an invalid warning message for an incorrectly entered pin, but more importantly removes an inapplicable check. If the first argument passed to app_authenticate does not contain a '/', the argument should be treated as the sole fixed "password" to match against and that is all. (Previous behavior was attempting to open a file based on the pin.)

................

Modified:
    team/seanbright/resolve-shadow-warnings/   (props changed)
    team/seanbright/resolve-shadow-warnings/apps/app_authenticate.c
    team/seanbright/resolve-shadow-warnings/channels/chan_sip.c
    team/seanbright/resolve-shadow-warnings/doc/janitor-projects.txt
    team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 21 12:03:58 2008
@@ -1,1 +1,1 @@
-/trunk:1-114315
+/trunk:1-114333

Modified: team/seanbright/resolve-shadow-warnings/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_authenticate.c?view=diff&rev=114334&r1=114333&r2=114334
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_authenticate.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_authenticate.c Mon Apr 21 12:03:58 2008
@@ -126,9 +126,7 @@
 			/* Compare against a fixed password */
 			if (!strcmp(passwd, arglist.password))
 				break;
-		}
-
-		if (ast_test_flag(&flags,OPT_DATABASE)) {
+		} else if (ast_test_flag(&flags,OPT_DATABASE)) {
 			char tmp[256];
 			/* Compare against a database key */
 			if (!ast_db_get(arglist.password + 1, passwd, tmp, sizeof(tmp))) {

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_sip.c?view=diff&rev=114334&r1=114333&r2=114334
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_sip.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_sip.c Mon Apr 21 12:03:58 2008
@@ -5880,7 +5880,7 @@
 	}
 
 	/* Only allow audio through if they sent progress with SDP, or if the channel is actually answered */
-	if (p->invitestate != INV_EARLY_MEDIA && ast->_state != AST_STATE_UP) {
+	if (fr->frametype == AST_FRAME_VOICE && p->invitestate != INV_EARLY_MEDIA && ast->_state != AST_STATE_UP) {
 		fr = &ast_null_frame;
 	}
 

Modified: team/seanbright/resolve-shadow-warnings/doc/janitor-projects.txt
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/doc/janitor-projects.txt?view=diff&rev=114334&r1=114333&r2=114334
==============================================================================
--- team/seanbright/resolve-shadow-warnings/doc/janitor-projects.txt (original)
+++ team/seanbright/resolve-shadow-warnings/doc/janitor-projects.txt Mon Apr 21 12:03:58 2008
@@ -1,3 +1,7 @@
+ -- Audit uses of usleep() to ensure that the argument is never greater than 1 million.
+    On some systems, that is considered an error.  In any such cases, convert the usage
+	over to use nanosleep(), instead.
+
  -- There a bunch of places where the result of pbx_builtin_getvar_helper()
     gets stored and used.  This is not threadsafe.  This code should be replaced
 	with the following thread-safe version:

Modified: team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c?view=diff&rev=114334&r1=114333&r2=114334
==============================================================================
--- team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c (original)
+++ team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c Mon Apr 21 12:03:58 2008
@@ -1285,7 +1285,7 @@
 
 		for (i = 0; ldap_entry; i++) { 
 			dn = ldap_get_dn(ldapConn, ldap_entry);
-			if (!(error = ldap_modify_ext_s(ldapConn, dn, ldap_mods, NULL, NULL))) 
+			if ((error = ldap_modify_ext_s(ldapConn, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) 
 				ast_log(LOG_ERROR, "Couldn't modify dn:%s because %s", dn, ldap_err2string(error));
 
 			ldap_entry = ldap_next_entry(ldapConn, ldap_entry);


