---
- branch: MAIN
  date: Wed May 27 22:39:01 UTC 2015
  files:
  - new: '1.19'
    old: '1.18'
    path: src/external/bsd/blacklist/bin/conf.c
    pathrev: src/external/bsd/blacklist/bin/conf.c@1.19
    type: modified
  id: 20150527T223901Z.ae7863aa8e13492738c303e04ed08802f3899007
  log: |
    Merge the uid data too, so that we don't end up with multiple entries
    when we don't care about the uid in the config file. In this case sshd
    returns either uid=root|sshd depending on how we failed, so we used to
    get two entries.
  module: src
  subject: 'CVS commit: src/external/bsd/blacklist/bin'
  unixtime: '1432766341'
  user: christos