diff options
| author | Timo Weingärtner <timo@tiwe.de> | 2013-10-27 15:39:41 +0100 |
|---|---|---|
| committer | Timo Weingärtner <timo@tiwe.de> | 2013-10-27 16:13:04 +0100 |
| commit | 116b90ec29b8e0911aa1eb8dfa5d9c185742ab85 (patch) | |
| tree | 4d55ff636da9a65822561b166e1e20320332a9c0 /debian/patches | |
| parent | 127998372577ce6f9640d080bc0e208ddc53f8a9 (diff) | |
| download | ssh-agent-filter-debian-bpo-wheezy.tar.gz | |
release 0.3-1~bpo70+1debian/0.3-1_bpo70+1debian-bpo-wheezy
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/backport | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/backport b/debian/patches/backport new file mode 100644 index 0000000..9e2ccdd --- /dev/null +++ b/debian/patches/backport @@ -0,0 +1,23 @@ +Description: Replace (map|set)::emplace with insert. +Author: Timo Weingärtner <timo@tiwe.de> + +--- ssh-agent-filter-0.3.orig/ssh-agent-filter.C ++++ ssh-agent-filter-0.3/ssh-agent-filter.C +@@ -245,7 +245,7 @@ void setup_filters () { + if (debug) std::clog << "key allowed by matching comment" << std::endl; + } + +- if (allow) allowed_pubkeys.emplace(std::move(key)); ++ if (allow) allowed_pubkeys.insert(std::move(key)); + else { + bool confirm{false}; + +@@ -266,7 +266,7 @@ void setup_filters () { + if (debug) std::clog << "key allowed with confirmation by catch-all (-A)" << std::endl; + } + +- if (confirm) confirmed_pubkeys.emplace(std::move(key), std::move(comm)); ++ if (confirm) confirmed_pubkeys.insert(make_pair(std::move(key), std::move(comm))); + } + + if (debug) std::clog << std::endl; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6fce45f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +backport |