summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-03-20 00:24:29 +0000
committerColin Watson <cjwatson@debian.org>2014-03-20 00:24:29 +0000
commit796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (patch)
tree98105bf1621565a2679d5f7f4d650561be2d7666 /auth.h
parent9a975a9faed7c4f334e8c8490db3e77e102f2b21 (diff)
parent19158b2447e35838d69b2b735fb640d1e86061ea (diff)
Import openssh_6.6p1.orig.tar.gz
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/auth.h b/auth.h
index 80f089869..124e59743 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.76 2013/07/19 07:37:48 markus Exp $ */ 1/* $OpenBSD: auth.h,v 1.77 2014/01/29 06:18:35 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -61,7 +61,6 @@ struct Authctxt {
61 char *style; 61 char *style;
62 void *kbdintctxt; 62 void *kbdintctxt;
63 char *info; /* Extra info for next auth_log */ 63 char *info; /* Extra info for next auth_log */
64 void *jpake_ctx;
65#ifdef BSD_AUTH 64#ifdef BSD_AUTH
66 auth_session_t *as; 65 auth_session_t *as;
67#endif 66#endif
@@ -175,9 +174,6 @@ int bsdauth_respond(void *, u_int, char **);
175int skey_query(void *, char **, char **, u_int *, char ***, u_int **); 174int skey_query(void *, char **, char **, u_int *, char ***, u_int **);
176int skey_respond(void *, u_int, char **); 175int skey_respond(void *, u_int, char **);
177 176
178void auth2_jpake_get_pwdata(Authctxt *, BIGNUM **, char **, char **);
179void auth2_jpake_stop(Authctxt *);
180
181int allowed_user(struct passwd *); 177int allowed_user(struct passwd *);
182struct passwd * getpwnamallow(const char *user); 178struct passwd * getpwnamallow(const char *user);
183 179