diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-01-28 21:08:14 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-01-28 21:08:14 +0000 |
| commit | 8ad4ccb85025e0bd3423e19cb57ca23991439858 (patch) | |
| tree | e9c7660807c03209b5c43d982c31109781f4e2d1 | |
| parent | 4f1488181b20b2305d659f27eceb9e066619afda (diff) | |
Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)
svn path=/trunk/; revision=47328
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index d09a3b82e8..70ec9d5ed5 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -2023,7 +2023,7 @@ snmp_users_update_cb(void* p _U_, const char** err) if ( u->user.userName.len == ue->user.userName.len - && u->engine.len == ue->engine.len ) { + && u->engine.len == ue->engine.len && (u != ue)) { if (u->engine.len > 0 && memcmp( u->engine.data, ue->engine.data, u->engine.len ) == 0) { if ( memcmp( u->user.userName.data, ue->user.userName.data, ue->user.userName.len ) == 0 ) { diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index d036d33ac3..3556271ef5 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3247,7 +3247,7 @@ snmp_users_update_cb(void* p _U_, const char** err) if ( u->user.userName.len == ue->user.userName.len - && u->engine.len == ue->engine.len ) { + && u->engine.len == ue->engine.len && (u != ue)) { if (u->engine.len > 0 && memcmp( u->engine.data, ue->engine.data, u->engine.len ) == 0) { if ( memcmp( u->user.userName.data, ue->user.userName.data, ue->user.userName.len ) == 0 ) { |