diff options
| author | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-25 11:53:50 +0000 |
|---|---|---|
| committer | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-25 11:53:51 +0000 |
| commit | 0d3be96ca152f30e4800f569b12311300064c2a9 (patch) | |
| tree | 8a40acbec1fceab9f438b179020059673d56146a /debian/patches/debian-config.patch | |
| parent | 5c4cc02836ec0e74636a69c2ba85e7b37e97bd6d (diff) | |
| parent | db4cdf7b763414af951c7f4031b10679c54d7988 (diff) | |
merge patched into master
Diffstat (limited to 'debian/patches/debian-config.patch')
| -rw-r--r-- | debian/patches/debian-config.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 9bb0c6520..ac15d90e0 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
| @@ -26,11 +26,11 @@ Last-Update: 2014-02-12 | |||
| 26 | 26 | ||
| 27 | Patch-Name: debian-config.patch | 27 | Patch-Name: debian-config.patch |
| 28 | --- | 28 | --- |
| 29 | readconf.c | 2 +- | 29 | readconf.c | 2 +- |
| 30 | ssh_config | 7 ++++++- | 30 | ssh_config | 7 ++++++- |
| 31 | ssh_config.5 | 19 ++++++++++++++++++- | 31 | ssh_config.5 | 19 ++++++++++++++++++- |
| 32 | sshd_config | 1 + | 32 | sshd_config | 1 + |
| 33 | sshd_config.5 | 25 +++++++++++++++++++++++++ | 33 | sshd_config.5 | 25 +++++++++++++++++++++++++ |
| 34 | 5 files changed, 51 insertions(+), 3 deletions(-) | 34 | 5 files changed, 51 insertions(+), 3 deletions(-) |
| 35 | 35 | ||
| 36 | diff --git a/readconf.c b/readconf.c | 36 | diff --git a/readconf.c b/readconf.c |