diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /sshconnect2.c | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 3ddef328b..11dd3e720 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.188 2011/05/24 07:15:47 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.189 2012/06/22 12:30:26 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -2009,8 +2009,6 @@ authmethod_get(char *authlist) | |||
2009 | return current; | 2009 | return current; |
2010 | } | 2010 | } |
2011 | } | 2011 | } |
2012 | if (name != NULL) | ||
2013 | xfree(name); | ||
2014 | } | 2012 | } |
2015 | 2013 | ||
2016 | static char * | 2014 | static char * |