[Asterisk-cvs] asterisk/apps app_voicemail.c,1.48,1.49

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv816/apps

Modified Files:
	app_voicemail.c 
Log Message:
PostgreSQL Voicemail NULL password..Bug #546


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- app_voicemail.c	22 Dec 2003 18:30:24 -0000	1.48
+++ app_voicemail.c	7 Jan 2004 23:41:21 -0000	1.49
@@ -269,7 +269,7 @@
 	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 @@
 			}
 			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);