aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-12 18:12:56 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-12 18:12:56 +0000
commit0b178b776f11ff1805863957044d1c4bd5ba4ea2 (patch)
treea403fd0d84fc3fec81aaa45011c670f98dd7b7c4 /main/manager.c
parent82ef5c6d36ff6c0b8630543f82b12d48e0417a20 (diff)
Conversion to load manager.conf into memory did not convert the password
functions correctly. (Closes issue #11749) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98536 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c
index a2ed42885..0016cd903 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -997,8 +997,7 @@ static int authenticate(struct mansession *s, const struct message *m)
ast_log(LOG_NOTICE, "%s failed to pass IP ACL as '%s'\n", ast_inet_ntoa(s->sin.sin_addr), username);
} else if (!strcasecmp(astman_get_header(m, "AuthType"), "MD5")) {
const char *key = astman_get_header(m, "Key");
- if (!ast_strlen_zero(key) && !ast_strlen_zero(s->challenge) &&
- !ast_strlen_zero(password)) {
+ if (!ast_strlen_zero(key) && !ast_strlen_zero(s->challenge)) {
int x;
int len = 0;
char md5key[256] = "";
@@ -1007,7 +1006,7 @@ static int authenticate(struct mansession *s, const struct message *m)
MD5Init(&md5);
MD5Update(&md5, (unsigned char *) s->challenge, strlen(s->challenge));
- MD5Update(&md5, (unsigned char *) password, strlen(password));
+ MD5Update(&md5, (unsigned char *) user->secret, strlen(user->secret));
MD5Final(digest, &md5);
for (x=0; x<16; x++)
len += sprintf(md5key + len, "%2.2x", digest[x]);