From: Sean Bright <sean@malleable.com>
Date: Thu, 18 Sep 2014 19:31:03 +0000 (+0000)
Subject: res_pjsip: Don't require a password when doing userpass authentication.
X-Git-Tag: 14.0.0-beta1~1643
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40e033a6b6022acd3fa0807b9b135f72cd8351e0;p=thirdparty%2Fasterisk.git

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


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

diff --git a/res/res_pjsip/config_auth.c b/res/res_pjsip/config_auth.c
index b8c9bc9d1e..fcab6a84b4 100644
--- a/res/res_pjsip/config_auth.c
+++ b/res/res_pjsip/config_auth.c
@@ -94,13 +94,6 @@ static int auth_apply(const struct ast_sorcery *sorcery, void *obj)
 	}
 
 	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 @@ static int auth_apply(const struct ast_sorcery *sorcery, void *obj)
 			res = -1;
 		}
 		break;
+	case AST_SIP_AUTH_TYPE_USER_PASS:
 	case AST_SIP_AUTH_TYPE_ARTIFICIAL:
 		break;
 	}