[asterisk-commits] seanbright: trunk r423483 - in /trunk: ./ res/res_pjsip/config_auth.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Sep 18 14:31:03 2014
New Revision: 423483

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423483
Log:
res_pjsip: Don't require a password when doing userpass authentication.

An empty password is valid for username/password authentication so we should
allow password to be empty/not supplied.

Review: https://reviewboard.asterisk.org/r/3988
........

Merged revisions 423481 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 423482 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip/config_auth.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip/config_auth.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/config_auth.c?view=diff&rev=423483&r1=423482&r2=423483
==============================================================================
--- trunk/res/res_pjsip/config_auth.c (original)
+++ trunk/res/res_pjsip/config_auth.c Thu Sep 18 14:31:03 2014
@@ -94,13 +94,6 @@
 	}
 
 	switch (auth->type) {
-	case AST_SIP_AUTH_TYPE_USER_PASS:
-		if (ast_strlen_zero(auth->auth_pass)) {
-			ast_log(LOG_ERROR, "'userpass' authentication specified but no "
-					"password specified for auth '%s'\n", ast_sorcery_object_get_id(auth));
-			res = -1;
-		}
-		break;
 	case AST_SIP_AUTH_TYPE_MD5:
 		if (ast_strlen_zero(auth->md5_creds)) {
 			ast_log(LOG_ERROR, "'md5' authentication specified but no md5_cred "
@@ -113,6 +106,7 @@
 			res = -1;
 		}
 		break;
+	case AST_SIP_AUTH_TYPE_USER_PASS:
 	case AST_SIP_AUTH_TYPE_ARTIFICIAL:
 		break;
 	}