automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42169 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index f273c65926cc1c27c930b04f622d4544d51c8497..e0921fdf8448d2408bf4186dd656bdd2891775b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -593,7 +593,7 @@ datafiles: all
                        exit 1; \
                fi; \
        done
-       for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
+       for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
                        $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
                else \

diff --git a/res/res_agi.c b/res/res_agi.c
index e9b275ed0b8e2b7a9d7d605315ccfbdfe033df1a..de4c7be39378527281c0f2b146a5c12e87583e12 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2047,7 +2047,8 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
                agi.ctrl = fds[0];
                agi.audio = efd;
                res = run_agi(chan, argv[0], &agi, pid, dead);
-               close(fds[1]);
+               if (fds[1] != fds[0])
+                       close(fds[1]);
                if (efd > -1)
                        close(efd);
        }