summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMalcolm Davenport <malcolmd@digium.com>2004-01-07 23:41:21 +0000
committerMalcolm Davenport <malcolmd@digium.com>2004-01-07 23:41:21 +0000
commitee480fecae069fb9006bedd90149ca3e62b8917e (patch)
tree5091bc4aa539f37d5d1189de8a9aed86150cc7d0 /apps
parentb4141f7e9151a37d02e670c874bb75d8b190638a (diff)
PostgreSQL Voicemail NULL password..Bug #546
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_voicemail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f127bb2de..dc8dbdec8 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);