Index: apps/app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.15
diff -u -r1.15 app_meetme.c
--- apps/app_meetme.c	11 Jan 2004 20:01:07 -0000	1.15
+++ apps/app_meetme.c	12 Jan 2004 19:47:00 -0000
@@ -699,13 +699,36 @@
 					strcpy(confno, "");
 			} else {
 				if (strlen(cnf->pin)) {
-					/* XXX Should prompt user for pin if pin is required XXX */
+					char pin[AST_MAX_EXTENSION];
 
-				}
-				allowretry = 0;
+					if (inpin && *inpin) {
+						strncpy(pin, inpin, sizeof(pin) - 1);
+					} else {
+						/* Prompt user for pin if pin is required */
+						res = ast_app_getdata(chan, "conf-getpin", pin, sizeof(pin) - 1, 0);
+					}
+					if (res == 0) {
+						if (!strcasecmp(pin, cnf->pin)) {
+							/* Pin correct */
+							allowretry = 0;
+							/* Run the conference */
+							res = conf_run(chan, cnf, confflags);
+						}
+					}
+					/* Pin invalid or error */
+					res = ast_streamfile(chan, "conf-invalidpin", chan->language);
+					if (!res)
+						ast_waitstream(chan, "");
+					res = -1;
+					if (allowretry)
+						strcpy(confno, "");
+				} else {
+					/* No pin required */
+					allowretry = 0;
 
-				/* Run the conference */
-				res = conf_run(chan, cnf, confflags);
+					/* Run the conference */
+					res = conf_run(chan, cnf, confflags);
+				}
 			}
 		}
 	} while (allowretry);
Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.51
diff -u -r1.51 app_voicemail.c
--- apps/app_voicemail.c	9 Jan 2004 05:45:56 -0000	1.51
+++ apps/app_voicemail.c	12 Jan 2004 19:47:04 -0000
@@ -1467,8 +1467,12 @@
 						myserveremail = vmu->serveremail;
 					sendpage(myserveremail, vmu->pager, msgnum, ext, chan->callerid, end - start, vmu);
 				}
-			} else
+			} else {
+				res = ast_streamfile(chan, "vm-mailboxfull", chan->language);
+				if (!res)
+					res = ast_waitstream(chan, "");
 				ast_log(LOG_WARNING, "No more messages possible\n");
+			}
 		} else
 			ast_log(LOG_WARNING, "No format for saving voicemail?\n");					
 		free_user(vmu);
Index: sounds.txt
===================================================================
RCS file: /usr/cvsroot/asterisk/sounds.txt,v
retrieving revision 1.17
diff -u -r1.17 sounds.txt
--- sounds.txt	19 Dec 2003 18:06:28 -0000	1.17
+++ sounds.txt	12 Jan 2004 19:47:04 -0000
@@ -28,8 +28,12 @@
 
 %conf-getchannel.gsm%Please enter your channel number followed by the pound key.
 
+%conf-getpin.gsm%Please enter the conference pin number.
+
 %conf-invalid.gsm%That is not a valid conference number.  Please try again.
 
+%conf-invalidpin.gsm%That pin is invalid for this conference.
+
 %conf-onlyperson.gsm%You are currently the only person in this conference.
 
 %demo-abouttotry.gsm%I am about to attempt an Inter-Asterisk Exchange connection to a demonstration server located at Digium.  In order for this to work you must already be connected to the Internet.  Please wait a moment while I attempt to make the connection.
@@ -109,6 +113,8 @@
 %vm-last.gsm%last
 
 %vm-login.gsm%Asterisk Mail.  Mailbox?
+
+%vm-mailboxfull.gsm%Sorry, but the user's mailbox cannot accept more messages.
 
 %vm-message.gsm%message