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/gssapi.patch | |
| parent | 5c4cc02836ec0e74636a69c2ba85e7b37e97bd6d (diff) | |
| parent | db4cdf7b763414af951c7f4031b10679c54d7988 (diff) | |
merge patched into master
Diffstat (limited to 'debian/patches/gssapi.patch')
| -rw-r--r-- | debian/patches/gssapi.patch | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch index d8439bf03..cf0ad8cad 100644 --- a/debian/patches/gssapi.patch +++ b/debian/patches/gssapi.patch | |||
| @@ -21,39 +21,39 @@ Last-Updated: 2014-03-19 | |||
| 21 | 21 | ||
| 22 | Patch-Name: gssapi.patch | 22 | Patch-Name: gssapi.patch |
| 23 | --- | 23 | --- |
| 24 | ChangeLog.gssapi | 113 +++++++++++++++++++ | 24 | ChangeLog.gssapi | 113 +++++++++++++++++++ |
| 25 | Makefile.in | 3 +- | 25 | Makefile.in | 3 +- |
| 26 | auth-krb5.c | 17 ++- | 26 | auth-krb5.c | 17 ++- |
| 27 | auth2-gss.c | 48 +++++++- | 27 | auth2-gss.c | 48 +++++++- |
| 28 | auth2.c | 2 + | 28 | auth2.c | 2 + |
| 29 | clientloop.c | 13 +++ | 29 | clientloop.c | 13 +++ |
| 30 | config.h.in | 6 + | 30 | config.h.in | 6 + |
| 31 | configure | 57 ++++++++++ | 31 | configure | 57 ++++++++++ |
| 32 | configure.ac | 24 ++++ | 32 | configure.ac | 24 ++++ |
| 33 | gss-genr.c | 275 ++++++++++++++++++++++++++++++++++++++++++++- | 33 | gss-genr.c | 275 +++++++++++++++++++++++++++++++++++++++++++- |
| 34 | gss-serv-krb5.c | 85 ++++++++++++-- | 34 | gss-serv-krb5.c | 85 ++++++++++++-- |
| 35 | gss-serv.c | 221 +++++++++++++++++++++++++++++++----- | 35 | gss-serv.c | 221 +++++++++++++++++++++++++++++++----- |
| 36 | kex.c | 16 +++ | 36 | kex.c | 16 +++ |
| 37 | kex.h | 14 +++ | 37 | kex.h | 14 +++ |
| 38 | kexgssc.c | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 38 | kexgssc.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 39 | kexgsss.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++ | 39 | kexgsss.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++ |
| 40 | key.c | 3 +- | 40 | key.c | 3 +- |
| 41 | key.h | 1 + | 41 | key.h | 1 + |
| 42 | monitor.c | 108 +++++++++++++++++- | 42 | monitor.c | 108 +++++++++++++++++- |
| 43 | monitor.h | 3 + | 43 | monitor.h | 3 + |
| 44 | monitor_wrap.c | 47 +++++++- | 44 | monitor_wrap.c | 47 +++++++- |
| 45 | monitor_wrap.h | 4 +- | 45 | monitor_wrap.h | 4 +- |
| 46 | readconf.c | 42 +++++++ | 46 | readconf.c | 42 +++++++ |
| 47 | readconf.h | 5 + | 47 | readconf.h | 5 + |
| 48 | servconf.c | 38 ++++++- | 48 | servconf.c | 38 ++++++- |
| 49 | servconf.h | 3 + | 49 | servconf.h | 3 + |
| 50 | ssh-gss.h | 41 ++++++- | 50 | ssh-gss.h | 41 ++++++- |
| 51 | ssh_config | 2 + | 51 | ssh_config | 2 + |
| 52 | ssh_config.5 | 34 +++++- | 52 | ssh_config.5 | 34 +++++- |
| 53 | sshconnect2.c | 124 ++++++++++++++++++++- | 53 | sshconnect2.c | 124 +++++++++++++++++++- |
| 54 | sshd.c | 110 ++++++++++++++++++ | 54 | sshd.c | 110 ++++++++++++++++++ |
| 55 | sshd_config | 2 + | 55 | sshd_config | 2 + |
| 56 | sshd_config.5 | 28 +++++ | 56 | sshd_config.5 | 28 +++++ |
| 57 | 33 files changed, 2051 insertions(+), 59 deletions(-) | 57 | 33 files changed, 2051 insertions(+), 59 deletions(-) |
| 58 | create mode 100644 ChangeLog.gssapi | 58 | create mode 100644 ChangeLog.gssapi |
| 59 | create mode 100644 kexgssc.c | 59 | create mode 100644 kexgssc.c |