summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--auth2.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 18098254c..8358f0446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120070520
2 - (dtucker) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2007/04/14 22:01:58
4 [auth2.c]
5 remove unused macro; from Dmitry V. Levin <ldv@altlinux.org>
6
120070509 720070509
2 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. 8 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
3 9
@@ -2897,4 +2903,4 @@
2897 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2903 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2898 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2904 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2899 2905
2900$Id: ChangeLog,v 1.4660 2007/05/09 22:57:43 tim Exp $ 2906$Id: ChangeLog,v 1.4661 2007/05/20 04:58:41 dtucker Exp $
diff --git a/auth2.c b/auth2.c
index b1a4e3635..bded8c2f8 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.114 2007/03/01 10:28:02 dtucker Exp $ */ 1/* $OpenBSD: auth2.c,v 1.115 2007/04/14 22:01:58 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -281,8 +281,6 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
281 } 281 }
282} 282}
283 283
284#define DELIM ","
285
286static char * 284static char *
287authmethods_get(void) 285authmethods_get(void)
288{ 286{