← Back to branch summary

~clint-fewbar/ubuntu/natty/php5/merge-5.3.3-3

« back to all changes in this revision

Viewing changes to ext/snmp/snmp.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-26 14:09:58 UTC
  • mfrom: (1.1.16 upstream) (0.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing.  Remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mcrypt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - main/php_version.h: updated with Ubuntu version info
  - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch
  - debian/rules, debian/source_php5.py: Install apport hook. 
* Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/snmp/snmp.c
20
20
   +----------------------------------------------------------------------+
21
21
 */
22
22
 
23
 
/* $Id: snmp.c 281502 2009-06-01 13:10:57Z iliaa $ */
 
23
/* $Id: snmp.c 289918 2009-10-25 20:17:04Z jani $ */
24
24
 
25
25
#ifdef HAVE_CONFIG_H
26
26
#include "config.h"
817
817
                        s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV;
818
818
                        return (0);
819
819
                }
820
 
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", level);
821
820
        }
822
821
        return (-1);
823
822
}
836
835
                        s->securityAuthProto = usmHMACSHA1AuthProtocol;
837
836
                        s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol);
838
837
                        return (0);
839
 
                } else if (strlen(prot)) {
840
 
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", prot);
841
838
                }
842
839
        }
843
840
        return (-1);
889
886
                        return (0);
890
887
#endif
891
888
#endif
892
 
                } else if (strlen(prot)) {
893
 
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid privacy protocol: %s", prot);
894
889
                }
895
890
        }
896
891
        return (-1);