summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-14 13:43:25 +1000
committerDamien Miller <djm@mindrot.org>2003-05-14 13:43:25 +1000
commit8ce778a9f040d04b6fe28f24dc8c5fac5dd5797c (patch)
treef5df07ff4cc6428672d85b73b68dd9cc12b28b48
parent5d421c04e6eb1b1a62f633beca356d9d8bfc6041 (diff)
- markus@cvs.openbsd.org 2003/04/16 14:35:27
[auth.h] document struct Authctxt; with solar
-rw-r--r--ChangeLog9
-rw-r--r--auth.h17
2 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d22a9f81..4f54c69b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,13 @@
18 - markus@cvs.openbsd.org 2003/04/14 14:17:50 18 - markus@cvs.openbsd.org 2003/04/14 14:17:50
19 [channels.c sshconnect.c sshd.c ssh-keyscan.c] 19 [channels.c sshconnect.c sshd.c ssh-keyscan.c]
20 avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP 20 avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP
21 - mouring@cvs.openbsd.org 2003/04/14 21:31:27
22 [sftp-int.c]
23 Missing globfree(&g) in process_put() spotted by Vince Brimhall
24 <VBrimhall@novell.com>. ok@ Theo
25 - markus@cvs.openbsd.org 2003/04/16 14:35:27
26 [auth.h]
27 document struct Authctxt; with solar
21 28
2220030512 2920030512
23 - (djm) Redhat spec: Don't install profile.d scripts when not 30 - (djm) Redhat spec: Don't install profile.d scripts when not
@@ -1405,4 +1412,4 @@
1405 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1412 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1406 ok provos@ 1413 ok provos@
1407 1414
1408$Id: ChangeLog,v 1.2682 2003/05/14 03:42:23 djm Exp $ 1415$Id: ChangeLog,v 1.2683 2003/05/14 03:43:25 djm Exp $
diff --git a/auth.h b/auth.h
index 81d9655f7..776e4195c 100644
--- a/auth.h
+++ b/auth.h
@@ -1,5 +1,4 @@
1/* $OpenBSD: auth.h,v 1.41 2002/09/26 11:38:43 markus Exp $ */ 1/* $OpenBSD: auth.h,v 1.42 2003/04/16 14:35:27 markus Exp $ */
2/* $FreeBSD: src/crypto/openssh/auth.h,v 1.10 2003/03/31 13:45:36 des Exp $ */
3 2
4/* 3/*
5 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -49,13 +48,13 @@ typedef struct KbdintDevice KbdintDevice;
49 48
50struct Authctxt { 49struct Authctxt {
51 int success; 50 int success;
52 int postponed; 51 int postponed; /* authentication needs another step */
53 int valid; 52 int valid; /* user exists and is allowed to login */
54 int attempt; 53 int attempt;
55 int failures; 54 int failures;
56 char *user; 55 char *user; /* username sent by the client */
57 char *service; 56 char *service;
58 struct passwd *pw; 57 struct passwd *pw; /* set if 'valid' */
59 char *style; 58 char *style;
60 void *kbdintctxt; 59 void *kbdintctxt;
61#ifdef BSD_AUTH 60#ifdef BSD_AUTH
@@ -72,6 +71,12 @@ struct Authctxt {
72 char *krb5_ticket_file; 71 char *krb5_ticket_file;
73#endif 72#endif
74}; 73};
74/*
75 * Every authentication method has to handle authentication requests for
76 * non-existing users, or for users that are not allowed to login. In this
77 * case 'valid' is set to 0, but 'user' points to the username requested by
78 * the client.
79 */
75 80
76struct Authmethod { 81struct Authmethod {
77 char *name; 82 char *name;