From: Malcolm Davenport <malcolmd@digium.com>
Date: Wed, 7 Jan 2004 23:41:21 +0000 (+0000)
Subject: PostgreSQL Voicemail NULL password..Bug #546
X-Git-Tag: 0.7.0~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee480fecae069fb9006bedd90149ca3e62b8917e;p=thirdparty%2Fasterisk.git

PostgreSQL Voicemail NULL password..Bug #546


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f127bb2dee..dc8dbdec85 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -269,7 +269,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 	if (retval) {
 		*retval->mailbox='\0';
 		*retval->context='\0';
-		*retval->password='\0';
+		strcpy(retval->password, "NULL");
 		*retval->fullname='\0';
 		*retval->email='\0';
 		*retval->pager='\0';
@@ -319,7 +319,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 			}
 			for (i=0; i<numFields; i++) {
 				fname = PQfname(PGSQLres,i);
-				if (!strcmp(fname, "password")) {
+				if (!strcmp(fname, "password") && !PQgetisnull (PGSQLres,0,i)) {
 					strncpy(retval->password, PQgetvalue(PGSQLres,0,i),sizeof(retval->password) - 1);
 				} else if (!strcmp(fname, "fullname")) {
 					strncpy(retval->fullname, PQgetvalue(PGSQLres,0,i),sizeof(retval->fullname) - 1);