summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-29 09:02:24 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-29 09:02:24 +0000
commit6d40c0f8067713f0a152c132a03964133b40309f (patch)
tree62b62044c0d02aa33d92a56857e336ab70635ffd
parenta73335004e679a97e4b518aac61032da1ada57e8 (diff)
- (bal) Minor auth2.c resync. Whitespace and moving of an #include.
-rw-r--r--ChangeLog1
-rw-r--r--auth2.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 06a1bb1e1..5ad196efd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
31 ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config 31 ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config
32 sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h] 32 sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h]
33 $OpenBSD$ 33 $OpenBSD$
34 - (bal) Minor auth2.c resync. Whitespace and moving of an #include.
34 35
3520010126 3620010126
36 - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen 37 - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
diff --git a/auth2.c b/auth2.c
index 99be9e1ba..cff34c602 100644
--- a/auth2.c
+++ b/auth2.c
@@ -47,8 +47,8 @@ RCSID("$OpenBSD: auth2.c,v 1.34 2001/01/22 23:06:39 markus Exp $");
47#include "session.h" 47#include "session.h"
48#include "dispatch.h" 48#include "dispatch.h"
49#include "auth.h" 49#include "auth.h"
50#include "cipher.h"
51#include "key.h" 50#include "key.h"
51#include "cipher.h"
52#include "kex.h" 52#include "kex.h"
53#include "pathnames.h" 53#include "pathnames.h"
54#include "uidswap.h" 54#include "uidswap.h"
@@ -203,7 +203,7 @@ input_userauth_request(int type, int plen, void *ctxt)
203 if ((style = strchr(user, ':')) != NULL) 203 if ((style = strchr(user, ':')) != NULL)
204 *style++ = 0; 204 *style++ = 0;
205 205
206 if (authctxt->attempt++ == 0) { 206 if (authctxt->attempt++ == 0) {
207 /* setup auth context */ 207 /* setup auth context */
208 struct passwd *pw = NULL; 208 struct passwd *pw = NULL;
209 setproctitle("%s", user); 209 setproctitle("%s", user);