summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-09-17 11:52:59 +1000
committerDamien Miller <djm@mindrot.org>2007-09-17 11:52:59 +1000
commit6572db28fdf60cf681ecc365358985ee6e8172d8 (patch)
treef1771f98051d5f316181780cdf1542ff9baf94b5
parent84287b831ecbe105cea14294c8f5b058546ce801 (diff)
- djm@cvs.openbsd.org 2007/08/23 02:49:43
[auth-passwd.c auth.c session.c] unifdef HAVE_LOGIN_CAP; ok deraadt@ millert@ NB. RCS ID sync only for portable
-rw-r--r--ChangeLog9
-rw-r--r--auth-passwd.c2
-rw-r--r--auth.c2
-rw-r--r--session.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fa6eb1c6e..2f3dd8610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120070917
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2007/08/23 02:49:43
4 [auth-passwd.c auth.c session.c]
5 unifdef HAVE_LOGIN_CAP; ok deraadt@ millert@
6 NB. RCS ID sync only for portable
7
120070914 820070914
2 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. 9 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
3 Patch from Jan.Pechanec at sun com. 10 Patch from Jan.Pechanec at sun com.
@@ -3194,4 +3201,4 @@
3194 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3201 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3195 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3202 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3196 3203
3197$Id: ChangeLog,v 1.4742 2007/09/14 00:04:15 dtucker Exp $ 3204$Id: ChangeLog,v 1.4743 2007/09/17 01:52:59 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index be6283796..33364363a 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-passwd.c,v 1.40 2006/08/03 03:34:41 deraadt Exp $ */ 1/* $OpenBSD: auth-passwd.c,v 1.41 2007/08/23 02:49:43 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth.c b/auth.c
index c1e0f4812..e4e145c8f 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.75 2006/08/03 03:34:41 deraadt Exp $ */ 1/* $OpenBSD: auth.c,v 1.76 2007/08/23 02:49:43 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
diff --git a/session.c b/session.c
index 9a606ef8f..825bf3d0b 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.221 2007/01/21 01:41:54 stevesk Exp $ */ 1/* $OpenBSD: session.c,v 1.222 2007/08/23 02:49:43 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved