- dtucker@cvs.openbsd.org 2010/01/13 01:10:56

[openssh.git] / auth2-pubkey.c

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index daa751ca0aac73276bb101e154de45667da2ac12..2886f1275f025f17e2424c8252bd2c201bf28f73 100644 (file)
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.18 2008/07/02 12:03:51 dtucker Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.19 2008/07/03 21:46:58 otto Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -170,10 +170,6 @@ done:
                key_free(key);
        xfree(pkalg);
        xfree(pkblob);
-#ifdef HAVE_CYGWIN
-       if (check_nt_auth(0, authctxt->pw) == 0)
-               authenticated = 0;
-#endif
        return authenticated;
 }
 
@@ -195,7 +191,6 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
        f = auth_openkeyfile(file, pw, options.strict_modes);
 
        if (!f) {
-               xfree(file);
                restore_uid();
                return 0;
        }