Deleted Added
sdiff udiff text old ( 1.186 ) new ( 1.187 )
full compact
sshconnect2.c (1.186) sshconnect2.c (1.187)
1/* $OpenBSD: sshconnect2.c,v 1.186 2010/11/29 23:45:51 djm Exp $ */
1/* $OpenBSD: sshconnect2.c,v 1.187 2011/05/06 02:05:41 djm Exp $ */
2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 1867 unchanged lines hidden (view full) ---

1877 }
1878 preferred += next;
1879 debug3("authmethod_lookup %s", name);
1880 debug3("remaining preferred: %s", preferred);
1881 if ((current = authmethod_lookup(name)) != NULL &&
1882 authmethod_is_enabled(current)) {
1883 debug3("authmethod_is_enabled %s", name);
1884 debug("Next authentication method: %s", name);
2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 1867 unchanged lines hidden (view full) ---

1877 }
1878 preferred += next;
1879 debug3("authmethod_lookup %s", name);
1880 debug3("remaining preferred: %s", preferred);
1881 if ((current = authmethod_lookup(name)) != NULL &&
1882 authmethod_is_enabled(current)) {
1883 debug3("authmethod_is_enabled %s", name);
1884 debug("Next authentication method: %s", name);
1885 xfree(name);
1885 return current;
1886 }
1887 }
1886 return current;
1887 }
1888 }
1889 if (name != NULL)
1890 xfree(name);
1888}
1889
1890static char *
1891authmethods_get(void)
1892{
1893 Authmethod *method = NULL;
1894 Buffer b;
1895 char *list;

--- 15 unchanged lines hidden --- 		1891}
1892
1893static char *
1894authmethods_get(void)
1895{
1896 Authmethod *method = NULL;
1897 Buffer b;
1898 char *list;

--- 15 unchanged lines hidden ---