summaryrefslogtreecommitdiffstats
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 0d22a9f8..4f54c69b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,13 @@
- markus@cvs.openbsd.org 2003/04/14 14:17:50
[channels.c sshconnect.c sshd.c ssh-keyscan.c]
avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP
+ - mouring@cvs.openbsd.org 2003/04/14 21:31:27
+ [sftp-int.c]
+ Missing globfree(&g) in process_put() spotted by Vince Brimhall
+ <VBrimhall@novell.com>. ok@ Theo
+ - markus@cvs.openbsd.org 2003/04/16 14:35:27
+ [auth.h]
+ document struct Authctxt; with solar
20030512
- (djm) Redhat spec: Don't install profile.d scripts when not
@@ -1405,4 +1412,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2682 2003/05/14 03:42:23 djm Exp $
+$Id: ChangeLog,v 1.2683 2003/05/14 03:43:25 djm Exp $
diff --git a/auth.h b/auth.h
index 81d9655f..776e4195 100644
--- a/auth.h
+++ b/auth.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: auth.h,v 1.41 2002/09/26 11:38:43 markus Exp $ */
-/* $FreeBSD: src/crypto/openssh/auth.h,v 1.10 2003/03/31 13:45:36 des Exp $ */
+/* $OpenBSD: auth.h,v 1.42 2003/04/16 14:35:27 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -49,13 +48,13 @@ typedef struct KbdintDevice KbdintDevice;
struct Authctxt {
int success;
- int postponed;
- int valid;
+ int postponed; /* authentication needs another step */
+ int valid; /* user exists and is allowed to login */
int attempt;
int failures;
- char *user;
+ char *user; /* username sent by the client */
char *service;
- struct passwd *pw;
+ struct passwd *pw; /* set if 'valid' */
char *style;
void *kbdintctxt;
#ifdef BSD_AUTH
@@ -72,6 +71,12 @@ struct Authctxt {
char *krb5_ticket_file;
#endif
};
+/*
+ * Every authentication method has to handle authentication requests for
+ * non-existing users, or for users that are not allowed to login. In this
+ * case 'valid' is set to 0, but 'user' points to the username requested by
+ * the client.
+ */
struct Authmethod {
char *name;