← Back to branch summary

~ubuntu-branches/ubuntu/precise/rsyslog/precise

« back to all changes in this revision

Viewing changes to runtime/nsd_gtls.c

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2011-11-07 13:54:56 UTC
  • mfrom: (16.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20111107135456-cwt6mu19ski1h2qf
Tags: 5.8.6-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Run as rsyslog:rsyslog, set $FileOwner to syslog
  - Replace init script with debian/rsyslog.upstart.
  - debian/rsyslog.logrotate: Use reload command to restart rsyslog
  - debian/rsyslog.conf: enable $RepeatedMsgReduction 
    to avoid bloating the syslog file (LP #453444)
  - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
    Install it in debian/rules.
  - debian/50-default.conf: set of default rules for syslog (forwarded to
    Debian #603160). remove file in postrm on purge. manage with ucf.
  - debian/rules: build with LDFLAGS=""
* Dropped:
  - debian/patches/02-CVE-2011-3200.patch (fixed in upstream release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
runtime/nsd_gtls.c
1121
1121
                        }
1122
1122
                }
1123
1123
                gnutls_deinit(pThis->sess);
 
1124
                pThis->bHaveSess = 0;
1124
1125
        }
1125
1126
        RETiRet;
1126
1127
}
1174
1175
                gnutls_x509_crt_deinit(pThis->ourCert);
1175
1176
        if(pThis->bOurKeyIsInit)
1176
1177
                gnutls_x509_privkey_deinit(pThis->ourKey);
 
1178
        if(pThis->bHaveSess)
 
1179
                gnutls_deinit(pThis->sess);
1177
1180
ENDobjDestruct(nsd_gtls)
1178
1181
 
1179
1182