automerge commit

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

diff --git a/devicestate.c b/devicestate.c
index b1970915213a2c744be15d548cffb00c23f59520..71a1bae0d6b104e7285de7db60d8b7ca6a00047c 100644 (file)
--- a/devicestate.c
+++ b/devicestate.c
@@ -196,13 +196,17 @@ static void do_state_change(const char *device)
 
 static int __ast_device_state_changed_literal(char *buf)
 {
-       char *device, *tmp;
+       char *device;
        struct state_change *change = NULL;
 
        device = buf;
-       tmp = strrchr(device, '-');
-       if (tmp)
-               *tmp = '\0';
+
+       if (!strncasecmp(device, "Zap", 3)) {
+               char *tmp = strrchr(device, '-');
+               if (tmp)
+                       *tmp = '\0';
+       }
+
        if (change_thread != AST_PTHREADT_NULL)
                change = calloc(1, sizeof(*change) + strlen(device));