summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-22 16:11:06 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-22 16:11:06 +1000
commit821d3dbe36faa1e53a269e434487d0617a0a1578 (patch)
tree13d01c35cf1abf4add3aece93843d0ddd262895f
parent828c96d48fce9040a75b0e9e66ecd02c96dee11e (diff)
- dtucker@cvs.openbsd.org 2009/06/22 05:39:28
[monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] alphabetize includes; reduces diff vs portable and style(9). ok stevesk djm (Id sync only; these were already in order in -portable)
-rw-r--r--ChangeLog8
-rw-r--r--auth2.c2
-rw-r--r--gss-genr.c2
-rw-r--r--monitor_mm.c2
-rw-r--r--monitor_wrap.c2
-rw-r--r--sftp-client.c2
-rw-r--r--ssh-keygen.c2
7 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c801521bc..0f39fa215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
120090622
2 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
4 [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
5 alphabetize includes; reduces diff vs portable and style(9).
6 ok stevesk djm
7 (Id sync only; these were already in order in -portable)
8
120090621 920090621
2 - (dtucker) OpenBSD CVS Sync 10 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2009/03/17 21:37:00 11 - markus@cvs.openbsd.org 2009/03/17 21:37:00
diff --git a/auth2.c b/auth2.c
index 92e6f5842..5d5468559 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker 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/gss-genr.c b/gss-genr.c
index e9190575d..842f38582 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-genr.c,v 1.19 2007/06/12 11:56:15 dtucker Exp $ */ 1/* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
diff --git a/monitor_mm.c b/monitor_mm.c
index dab747532..faf9f3dcb 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_mm.c,v 1.15 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: monitor_mm.c,v 1.16 2009/06/22 05:39:28 dtucker Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved. 4 * All rights reserved.
diff --git a/monitor_wrap.c b/monitor_wrap.c
index b696d7821..b8e8710f7 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.67 2009/05/28 16:50:16 andreas Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.68 2009/06/22 05:39:28 dtucker Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
diff --git a/sftp-client.c b/sftp-client.c
index 5e39aa7d2..0990b7912 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.86 2008/06/26 06:10:09 djm Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.87 2009/06/22 05:39:28 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 5765cff08..da5db9845 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.173 2009/02/21 19:32:04 tobias Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.174 2009/06/22 05:39:28 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland