parent
b9be60a722
commit
b54873ad24
|
@ -1,3 +1,9 @@
|
||||||
|
20010312
|
||||||
|
- OpenBSD CVS Sync
|
||||||
|
- markus@cvs.openbsd.org 2001/03/11 13:25:36
|
||||||
|
[auth2.c key.c]
|
||||||
|
debug
|
||||||
|
|
||||||
20010311
|
20010311
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
- markus@cvs.openbsd.org 2001/03/10 12:48:27
|
- markus@cvs.openbsd.org 2001/03/10 12:48:27
|
||||||
|
@ -4490,4 +4496,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.939 2001/03/11 01:49:19 mouring Exp $
|
$Id: ChangeLog,v 1.940 2001/03/11 20:01:55 mouring Exp $
|
||||||
|
|
4
auth2.c
4
auth2.c
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth2.c,v 1.45 2001/03/04 01:46:29 djm Exp $");
|
RCSID("$OpenBSD: auth2.c,v 1.46 2001/03/11 13:25:36 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
|
@ -688,5 +688,7 @@ user_key_allowed(struct passwd *pw, Key *key)
|
||||||
restore_uid();
|
restore_uid();
|
||||||
fclose(f);
|
fclose(f);
|
||||||
key_free(found);
|
key_free(found);
|
||||||
|
if (!found_key)
|
||||||
|
debug2("key not found");
|
||||||
return found_key;
|
return found_key;
|
||||||
}
|
}
|
||||||
|
|
4
key.c
4
key.c
|
@ -32,7 +32,7 @@
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: key.c,v 1.17 2001/02/04 15:32:24 stevesk Exp $");
|
RCSID("$OpenBSD: key.c,v 1.18 2001/03/11 13:25:36 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
|
@ -530,7 +530,7 @@ key_type_from_name(char *name)
|
||||||
} else if (strcmp(name, "ssh-dss") == 0){
|
} else if (strcmp(name, "ssh-dss") == 0){
|
||||||
return KEY_DSA;
|
return KEY_DSA;
|
||||||
}
|
}
|
||||||
debug("key_type_from_name: unknown key type '%s'", name);
|
debug2("key_type_from_name: unknown key type '%s'", name);
|
||||||
return KEY_UNSPEC;
|
return KEY_UNSPEC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue