[svn-commits] mmichelson: branch jrothenberger/asterisk-urgent r115578 - in /team/jrothenbe...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri May 9 11:00:50 CDT 2008


Author: mmichelson
Date: Fri May  9 11:00:48 2008
New Revision: 115578

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115578
Log:
Final sync with trunk prior to merge


Removed:
    team/jrothenberger/asterisk-urgent/contrib/scripts/postgres_cdr.sql
Modified:
    team/jrothenberger/asterisk-urgent/   (props changed)
    team/jrothenberger/asterisk-urgent/channels/chan_h323.c
    team/jrothenberger/asterisk-urgent/channels/chan_iax2.c
    team/jrothenberger/asterisk-urgent/channels/chan_sip.c
    team/jrothenberger/asterisk-urgent/channels/chan_zap.c
    team/jrothenberger/asterisk-urgent/contrib/init.d/rc.debian.asterisk
    team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldap-schema
    team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldif
    team/jrothenberger/asterisk-urgent/include/asterisk/dlinkedlists.h   (props changed)
    team/jrothenberger/asterisk-urgent/main/pbx.c
    team/jrothenberger/asterisk-urgent/main/sched.c
    team/jrothenberger/asterisk-urgent/res/res_config_ldap.c
    team/jrothenberger/asterisk-urgent/res/res_odbc.c
    team/jrothenberger/asterisk-urgent/sounds/Makefile

Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/jrothenberger/asterisk-urgent/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May  9 11:00:48 2008
@@ -1,1 +1,1 @@
-/trunk:1-115483
+/trunk:1-115577

Modified: team/jrothenberger/asterisk-urgent/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/channels/chan_h323.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/channels/chan_h323.c (original)
+++ team/jrothenberger/asterisk-urgent/channels/chan_h323.c Fri May  9 11:00:48 2008
@@ -1548,11 +1548,11 @@
 	struct oh323_peer *peer;
 	struct ast_variable *var;
 	struct ast_variable *tmp;
-	const char *addr;
+	const char *addr = NULL;
 
 	/* First check on peer name */
 	if (peername)
-		var = ast_load_realtime("h323", "name", peername, addr = NULL);
+		var = ast_load_realtime("h323", "name", peername, NULL);
 	else if (sin) /* Then check on IP address for dynamic peers */
 		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), NULL);
 	else

Modified: team/jrothenberger/asterisk-urgent/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/channels/chan_iax2.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/channels/chan_iax2.c (original)
+++ team/jrothenberger/asterisk-urgent/channels/chan_iax2.c Fri May  9 11:00:48 2008
@@ -87,7 +87,6 @@
 #include "asterisk/netsock.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/linkedlists.h"
-#include "asterisk/dlinkedlists.h"
 #include "asterisk/event.h"
 #include "asterisk/astobj2.h"
 
@@ -640,8 +639,6 @@
 	int frames_dropped;
 	/*! received frame count: (just for stats) */
 	int frames_received;
-
-	AST_DLLIST_ENTRY(chan_iax2_pvt) entry;
 };
 
 /*!
@@ -3929,6 +3926,21 @@
 
 	ast_mutex_lock(&iaxsl[callno]);
 	pvt = iaxs[callno];
+
+	if (!pvt->peercallno) {
+		/* We don't know the remote side's call number, yet.  :( */
+		int count = 10;
+		while (count-- && pvt && !pvt->peercallno) {
+			ast_mutex_unlock(&iaxsl[callno]);
+			usleep(1);
+			ast_mutex_lock(&iaxsl[callno]);
+			pvt = iaxs[callno];
+		}
+		if (!pvt->peercallno) {
+			res = -1;
+			goto done;
+		}
+	}
 
 	switch (condition) {
 	case AST_CONTROL_HOLD:

Modified: team/jrothenberger/asterisk-urgent/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/channels/chan_sip.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/channels/chan_sip.c (original)
+++ team/jrothenberger/asterisk-urgent/channels/chan_sip.c Fri May  9 11:00:48 2008
@@ -6170,11 +6170,6 @@
 	const char *to = get_header(req, "To");
 	const char *cseq = get_header(req, "Cseq");
 	struct sip_pvt *sip_pvt_ptr;
-
-	callid = get_header(req, "Call-ID");
-	from = get_header(req, "From");
-	to = get_header(req, "To");
-	cseq = get_header(req, "Cseq");
 
 	/* Call-ID, to, from and Cseq are required by RFC 3261. (Max-forwards and via too - ignored now) */
 	/* get_header always returns non-NULL so we must use ast_strlen_zero() */
@@ -15975,8 +15970,6 @@
 		}
 		break;
 	case 408:	/* Request timeout */
-		if (global_regattempts_max)
-			p->registry->regattempts = global_regattempts_max+1;
 		p->needdestroy = 1;
 		if (r->call)
 			r->call = dialog_unref(r->call, "unsetting registry->call pointer-- case 408");

Modified: team/jrothenberger/asterisk-urgent/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/channels/chan_zap.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/channels/chan_zap.c (original)
+++ team/jrothenberger/asterisk-urgent/channels/chan_zap.c Fri May  9 11:00:48 2008
@@ -9369,20 +9369,16 @@
 				res = ss7_read(ss7, pollers[i].fd);
 				ast_mutex_unlock(&linkset->lock);
 			}
+
 			if (pollers[i].revents & POLLOUT) {
 				ast_mutex_lock(&linkset->lock);
 				res = ss7_write(ss7, pollers[i].fd);
 				ast_mutex_unlock(&linkset->lock);
 				if (res < 0) {
-					ast_log(LOG_ERROR, "Error in write %s", strerror(errno));
-				}
-			}
-		}
-
-#if 0
-		if (res < 0)
-			exit(-1);
-#endif
+					ast_debug(1, "Error in write %s\n", strerror(errno));
+				}
+			}
+		}
 
 		while ((e = ss7_check_event(ss7))) {
 			switch (e->e) {

Modified: team/jrothenberger/asterisk-urgent/contrib/init.d/rc.debian.asterisk
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/contrib/init.d/rc.debian.asterisk?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/contrib/init.d/rc.debian.asterisk (original)
+++ team/jrothenberger/asterisk-urgent/contrib/init.d/rc.debian.asterisk Fri May  9 11:00:48 2008
@@ -22,6 +22,7 @@
 DESC="Asterisk PBX"
 # Full path to asterisk binary
 DAEMON=/usr/sbin/asterisk
+TRUE=/bin/true
 
 # Uncomment this ONLY if you know what you are doing.
 # export LD_ASSUME_KERNEL=2.4.1
@@ -53,7 +54,7 @@
   start)
 	# Check if Asterisk is already running.  If it is, then bug out, because
 	# starting up Asterisk when Asterisk is already running is very bad.
-	VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+	VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
 	if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
 		echo "Asterisk is already running.  $0 will exit now."
 		exit 1

Modified: team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldap-schema
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldap-schema?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldap-schema (original)
+++ team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldap-schema Fri May  9 11:00:48 2008
@@ -1,5 +1,12 @@
 #
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry at suretecsystems.com>
 #
 # Asterisk LDAP Schema
 #
@@ -224,28 +231,28 @@
 
 attributetype ( AstAccountExpirationTimestamp 
         NAME 'AstAccountExpirationTimestamp'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Expiration Timestamp'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountRegistrationContext 
         NAME 'AstAccountRegistrationContext'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Context'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountRegistrationExten 
         NAME 'AstAccountRegistrationExten'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Extension'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountNoTransfer 
         NAME 'AstAccountNoTransfer'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account No Transfer'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -327,28 +334,28 @@
       
 attributetype ( AstAccountRestrictCID 
         NAME 'AstAccountRestrictCID'
-        DESC 'Asterisk Restrict CallerID'
+        DESC 'Asterisk Account Restrict CallerID'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
             
 attributetype ( AstAccountRTPTimeout 
         NAME 'AstAccountRTPTimeout'
-        DESC 'Asterisk RTP Timeout'
+        DESC 'Asterisk Account RTP Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
       
 attributetype ( AstAccountRTPHoldTimeout 
         NAME 'AstAccountRTPHoldTimeout'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account RTP Hold Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
       
 attributetype ( AstAccountRealmedPassword 
         NAME 'AstAccountRealmedPassword'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account Realmed Password'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -362,21 +369,21 @@
 
 attributetype ( AstAccountMusicOnHold 
         NAME 'AstAccountMusicOnHold'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Music On Hold'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountCanCallForward 
         NAME 'AstAccountCanCallForward'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Can Call Forward' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountSecret 
         NAME 'AstAccountSecret'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Secret' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -559,4 +566,3 @@
         AstConfigCommented
     ) 
     )
-

Modified: team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldif
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldif?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldif (original)
+++ team/jrothenberger/asterisk-urgent/contrib/scripts/asterisk.ldif Fri May  9 11:00:48 2008
@@ -1,5 +1,12 @@
 #
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry at suretecsystems.com>
 #
 # Asterisk LDAP Schema ldif
 #
@@ -228,28 +235,28 @@
 #
 olcAttributeTypes: ( AstAccountExpirationTimestamp 
         NAME 'AstAccountExpirationTimestamp'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Expiration Timestamp'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountRegistrationContext 
         NAME 'AstAccountRegistrationContext'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Context'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountRegistrationExten 
         NAME 'AstAccountRegistrationExten'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Extension'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountNoTransfer 
         NAME 'AstAccountNoTransfer'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account No Transfer'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -331,28 +338,28 @@
 #      
 olcAttributeTypes: ( AstAccountRestrictCID 
         NAME 'AstAccountRestrictCID'
-        DESC 'Asterisk Restrict CallerID'
+        DESC 'Asterisk Account Restrict CallerID'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #            
 olcAttributeTypes: ( AstAccountRTPTimeout 
         NAME 'AstAccountRTPTimeout'
-        DESC 'Asterisk RTP Timeout'
+        DESC 'Asterisk Account RTP Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #      
 olcAttributeTypes: ( AstAccountRTPHoldTimeout 
         NAME 'AstAccountRTPHoldTimeout'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account RTP Hold Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #      
 olcAttributeTypes: ( AstAccountRealmedPassword 
         NAME 'AstAccountRealmedPassword'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account Realmed Password'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -366,21 +373,21 @@
 #
 olcAttributeTypes: ( AstAccountMusicOnHold 
         NAME 'AstAccountMusicOnHold'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Music On Hold'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountCanCallForward 
         NAME 'AstAccountCanCallForward'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Can Call Forward' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountSecret 
         NAME 'AstAccountSecret'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Secret' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -564,4 +571,3 @@
     ) 
     )
 #
-

Propchange: team/jrothenberger/asterisk-urgent/include/asterisk/dlinkedlists.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri May  9 11:00:48 2008
@@ -1,1 +1,1 @@
-Author Id Date Revision
+Author Date Id Revision

Modified: team/jrothenberger/asterisk-urgent/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/main/pbx.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/main/pbx.c (original)
+++ team/jrothenberger/asterisk-urgent/main/pbx.c Fri May  9 11:00:48 2008
@@ -6310,13 +6310,13 @@
 		   the PBX, we have to make a new channel, masquerade, and start the PBX
 		   at the new location */
 		struct ast_channel *tmpchan = ast_channel_alloc(0, chan->_state, 0, 0, chan->accountcode, chan->exten, chan->context, chan->amaflags, "AsyncGoto/%s", chan->name);
-		if (chan->cdr) {
-			ast_cdr_discard(tmpchan->cdr);
-			tmpchan->cdr = ast_cdr_dup(chan->cdr);  /* share the love */
-		}
-		if (!tmpchan)
+		if (!tmpchan) {
 			res = -1;
-		else {
+		} else {
+			if (chan->cdr) {
+				ast_cdr_discard(tmpchan->cdr);
+				tmpchan->cdr = ast_cdr_dup(chan->cdr);  /* share the love */
+			}
 			/* Make formats okay */
 			tmpchan->readformat = chan->readformat;
 			tmpchan->writeformat = chan->writeformat;

Modified: team/jrothenberger/asterisk-urgent/main/sched.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/main/sched.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/main/sched.c (original)
+++ team/jrothenberger/asterisk-urgent/main/sched.c Fri May  9 11:00:48 2008
@@ -198,34 +198,45 @@
 	int de = 0;
 	struct sched *first = AST_DLLIST_FIRST(&con->schedq);
 	struct sched *last = AST_DLLIST_LAST(&con->schedq);
+
 	if (first)
 		df = ast_tvdiff_us(s->when, first->when);
 	if (last)
 		de = ast_tvdiff_us(s->when, last->when);
+
 	if (df < 0)
 		df = -df;
 	if (de < 0)
 		de = -de;
-	if (df < de)
+
+	if (df < de) {
 		AST_DLLIST_TRAVERSE(&con->schedq, cur, list) {
 			if (ast_tvcmp(s->when, cur->when) == -1) {
 				AST_DLLIST_INSERT_BEFORE(&con->schedq, cur, s, list);
 				break;
 			}
 		}
-	else
+		if (!cur) {
+			AST_DLLIST_INSERT_TAIL(&con->schedq, s, list);
+		}
+	} else {
 		AST_DLLIST_TRAVERSE_BACKWARDS(&con->schedq, cur, list) {
 			if (ast_tvcmp(s->when, cur->when) == 1) {
 				AST_DLLIST_INSERT_AFTER(&con->schedq, cur, s, list);
 				break;
 			}
 		}
-	if (!cur)
-		AST_DLLIST_INSERT_TAIL(&con->schedq, s, list);
+		if (!cur) {
+			AST_DLLIST_INSERT_HEAD(&con->schedq, s, list);
+		}
+	}
+
 	ret = ast_hashtab_insert_safe(con->schedq_ht, s);
 	if (!ret)
 		ast_log(LOG_WARNING,"Schedule Queue entry %d is already in table!\n",s->id);
+
 	con->schedcnt++;
+
 	if (con->schedcnt > con->highwater)
 		con->highwater = con->schedcnt;
 }

Modified: team/jrothenberger/asterisk-urgent/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/res/res_config_ldap.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/res/res_config_ldap.c (original)
+++ team/jrothenberger/asterisk-urgent/res/res_config_ldap.c Fri May  9 11:00:48 2008
@@ -58,6 +58,7 @@
 #include "asterisk/linkedlists.h"
 
 #define RES_CONFIG_LDAP_CONF "res_ldap.conf"
+#define RES_CONFIG_LDAP_DEFAULT_BASEDN "asterisk"
 
 AST_MUTEX_DEFINE_STATIC(ldap_lock);
 
@@ -1400,11 +1401,14 @@
 	} else 
 		ast_copy_string(user, s, sizeof(user));
 
-	if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
-		ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
-		ast_copy_string(pass, "asterisk", sizeof(pass) - 1);
-	} else
-		ast_copy_string(pass, s, sizeof(pass));
+	if (!ast_strlen_zero(user)) {
+		if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
+			ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
+			ast_copy_string(pass, "asterisk", sizeof(pass));
+		} else {
+			ast_copy_string(pass, s, sizeof(pass));
+		}
+	}
 
 	/* URL is preferred, use host and port if not found */
 	if ((s = ast_variable_retrieve(config, "_general", "url"))) {
@@ -1423,8 +1427,8 @@
 	}
 
 	if (!(s = ast_variable_retrieve(config, "_general", "basedn"))) {
-		ast_log(LOG_ERROR, "No LDAP base dn found, using 'asterisk' as default.\n");
-		basedn[0] = '\0';
+		ast_log(LOG_ERROR, "No LDAP base dn found, using '%s' as default.\n", RES_CONFIG_LDAP_DEFAULT_BASEDN);
+		ast_copy_string(basedn, RES_CONFIG_LDAP_DEFAULT_BASEDN, sizeof(basedn));
 	} else 
 		ast_copy_string(basedn, s, sizeof(basedn));
 

Modified: team/jrothenberger/asterisk-urgent/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/res/res_odbc.c?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/res/res_odbc.c (original)
+++ team/jrothenberger/asterisk-urgent/res/res_odbc.c Fri May  9 11:00:48 2008
@@ -100,7 +100,6 @@
 	odbc_obj_disconnect(obj);
 	ast_mutex_destroy(&obj->lock);
 	ao2_ref(obj->parent, -1);
-	ast_free(obj);
 }
 
 SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struct odbc_obj *obj, void *data), void *data)

Modified: team/jrothenberger/asterisk-urgent/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/sounds/Makefile?view=diff&rev=115578&r1=115577&r2=115578
==============================================================================
--- team/jrothenberger/asterisk-urgent/sounds/Makefile (original)
+++ team/jrothenberger/asterisk-urgent/sounds/Makefile Fri May  9 11:00:48 2008
@@ -17,7 +17,7 @@
 
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.11
+CORE_SOUNDS_VERSION:=1.4.12
 EXTRA_SOUNDS_VERSION:=1.4.7
 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))




More information about the svn-commits mailing list