Index: apps/app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.15
diff -u -r1.15 app_directory.c
--- apps/app_directory.c	23 Mar 2004 05:32:36 -0000	1.15
+++ apps/app_directory.c	22 Apr 2004 18:05:32 -0000
@@ -236,6 +236,7 @@
 static int directory_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
+	char *s;
 	struct localuser *u;
 	struct ast_config *cfg;
 	if (!data) {
@@ -251,8 +252,15 @@
 top:
 	if (chan->_state != AST_STATE_UP) 
 		res = ast_answer(chan);
-	if (!res)
-		res = ast_streamfile(chan, "dir-intro", chan->language);
+	s = ast_variable_retrieve(cfg, "general", "directoryintro");
+	if(s)
+	{
+		if (!res)
+			res = ast_streamfile(chan, s, chan->language);
+	} else {
+		if (!res)
+			res = ast_streamfile(chan, "dir-intro", chan->language);
+	}
 	if (!res)
 		res = ast_waitstream(chan, AST_DIGIT_ANY);
 	ast_stopstream(chan);