← Back to branch summary

~ubuntu-branches/ubuntu/feisty/asterisk/feisty-security

« back to all changes in this revision

Viewing changes to channels/chan_skinny.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Porcheron
  • Date: 2007-01-28 01:08:48 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070128010848-fd6k14jk4nw0drs5
Tags: 1:1.2.14~dfsg-4ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/asterisk.init:
    + create /var/run/ directory if necessary and set proper permissions
  - debian/asterisk.default - fix -D/-d typo in PARAMS (Closes LP#68169)
  - debian/patches/ubuntu_safe_asterisk - remove bashism (Closes LP#68742)
* debian/asterisk.init - fixed stopping stop while RUNASTSAFE=yes

Show diffs side-by-side

added added

removed removed

Lines of Context:
channels/chan_skinny.c
44
44
 
45
45
#include "asterisk.h"
46
46
 
47
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 45332 $")
 
47
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 46332 $")
48
48
 
49
49
#include "asterisk/lock.h"
50
50
#include "asterisk/channel.h"
2872
2872
                }
2873
2873
                *(int *)s->inbuf = htolel(dlen);
2874
2874
                res = read(s->fd, s->inbuf+4, dlen+4);
2875
 
                ast_mutex_unlock(&s->lock);
2876
2875
                if (res != (dlen+4)) {
2877
2876
                        ast_log(LOG_WARNING, "Skinny Client sent less data than expected.\n");
2878
2877
                        return -1;