Commit d7834353 authored by Damien Miller's avatar Damien Miller

- deraadt@cvs.openbsd.org 2006/08/03 03:34:42

     [OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
     [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
     [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
     [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
     [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
     [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
     [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
     [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
     [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
     [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
     [serverloop.c session.c session.h sftp-client.c sftp-common.c]
     [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
     [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
     [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
     [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
     [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
     [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
     almost entirely get rid of the culture of ".h files that include .h files"
     ok djm, sort of ok stevesk
     makes the pain stop in one easy step
     NB. portable commit contains everything *except* removing includes.h, as
     that will take a fair bit more work as we move headers that are required
     for portability workarounds to defines.h. (also, this step wasn't "easy")
parent 4dec5d75
...@@ -54,6 +54,34 @@ ...@@ -54,6 +54,34 @@
- stevesk@cvs.openbsd.org 2006/08/01 23:36:12 - stevesk@cvs.openbsd.org 2006/08/01 23:36:12
[authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c] [authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
clean extra spaces clean extra spaces
- deraadt@cvs.openbsd.org 2006/08/03 03:34:42
[OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
[auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
[auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
[auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
[buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
[cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
[compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
[groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
[kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
[key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
[monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
[monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
[readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
[serverloop.c session.c session.h sftp-client.c sftp-common.c]
[sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
[ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
[ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
[sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
[uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
[loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step
NB. portable commit contains everything *except* removing includes.h, as
that will take a fair bit more work as we move headers that are required
for portability workarounds to defines.h. (also, this step wasn't "easy")
20060804 20060804
- (dtucker) [configure.ac] The "crippled AES" test does not work on recent - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
...@@ -5124,4 +5152,4 @@ ...@@ -5124,4 +5152,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4451 2006/08/05 01:38:40 djm Exp $ $Id: ChangeLog,v 1.4452 2006/08/05 02:39:39 djm Exp $
...@@ -162,8 +162,7 @@ these programs. ...@@ -162,8 +162,7 @@ these programs.
- There are several other files in the distribution that contain - There are several other files in the distribution that contain
various auxiliary routines: various auxiliary routines:
ssh.h the main header file for ssh (various definitions) ssh.h the main header file for ssh (various definitions)
includes.h includes most system headers. Lots of #ifdefs.
uidswap.c uid-swapping uidswap.c uid-swapping
xmalloc.c "safe" malloc routines xmalloc.c "safe" malloc routines
$OpenBSD: OVERVIEW,v 1.10 2006/04/01 05:37:46 djm Exp $ $OpenBSD: OVERVIEW,v 1.11 2006/08/03 03:34:41 deraadt Exp $
/* $OpenBSD: atomicio.c,v 1.22 2006/07/26 02:35:17 stevesk Exp $ */ /* $OpenBSD: atomicio.c,v 1.23 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "includes.h" #include "includes.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
......
/* $OpenBSD: atomicio.h,v 1.9 2006/07/30 20:15:19 stevesk Exp $ */ /* $OpenBSD: atomicio.h,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2006 Damien Miller. All rights reserved.
...@@ -29,11 +29,6 @@ ...@@ -29,11 +29,6 @@
#ifndef _ATOMICIO_H #ifndef _ATOMICIO_H
#define _ATOMICIO_H #define _ATOMICIO_H
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
/* /*
* Ensure all of data on socket comes through. f==read || f==vwrite * Ensure all of data on socket comes through. f==read || f==vwrite
*/ */
......
/* $OpenBSD: auth-bsdauth.c,v 1.9 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-bsdauth.c,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
...@@ -22,12 +22,21 @@ ...@@ -22,12 +22,21 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#ifdef BSD_AUTH #ifdef BSD_AUTH
#include "xmalloc.h" #include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
static void * static void *
......
/* $OpenBSD: auth-chall.c,v 1.11 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
...@@ -25,9 +25,13 @@ ...@@ -25,9 +25,13 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "log.h" #include "log.h"
#include "xmalloc.h"
#include "servconf.h" #include "servconf.h"
/* limited protocol v1 interface to kbd-interactive authentication */ /* limited protocol v1 interface to kbd-interactive authentication */
......
/* $OpenBSD: auth-krb5.c,v 1.18 2006/05/06 08:35:40 dtucker Exp $ */ /* $OpenBSD: auth-krb5.c,v 1.19 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Kerberos v5 authentication and ticket-passing routines. * Kerberos v5 authentication and ticket-passing routines.
* *
...@@ -30,13 +30,20 @@ ...@@ -30,13 +30,20 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <pwd.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "uidswap.h" #include "uidswap.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#ifdef KRB5 #ifdef KRB5
......
/* $OpenBSD: auth-options.c,v 1.39 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth-options.c,v 1.40 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -17,17 +17,25 @@ ...@@ -17,17 +17,25 @@
#include <netdb.h> #include <netdb.h>
#include <pwd.h> #include <pwd.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "match.h" #include "match.h"
#include "log.h" #include "log.h"
#include "canohost.h" #include "canohost.h"
#include "buffer.h"
#include "channels.h" #include "channels.h"
#include "auth-options.h" #include "auth-options.h"
#include "servconf.h" #include "servconf.h"
#include "misc.h" #include "misc.h"
#include "monitor_wrap.h" #include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h"
/* Flags set authorized_keys flags */ /* Flags set authorized_keys flags */
int no_port_forwarding_flag = 0; int no_port_forwarding_flag = 0;
......
/* $OpenBSD: auth-options.h,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */ /* $OpenBSD: auth-options.h,v 1.16 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
#ifndef AUTH_OPTIONS_H #ifndef AUTH_OPTIONS_H
#define AUTH_OPTIONS_H #define AUTH_OPTIONS_H
#include <sys/types.h>
#include <pwd.h>
/* Linked list of custom environment strings */ /* Linked list of custom environment strings */
struct envstring { struct envstring {
struct envstring *next; struct envstring *next;
......
/* $OpenBSD: auth-passwd.c,v 1.39 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-passwd.c,v 1.40 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -43,11 +43,14 @@ ...@@ -43,11 +43,14 @@
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"
......
/* $OpenBSD: auth-rh-rsa.c,v 1.41 2006/07/06 16:03:53 stevesk Exp $ */ /* $OpenBSD: auth-rh-rsa.c,v 1.42 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -18,17 +18,21 @@ ...@@ -18,17 +18,21 @@
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "uidswap.h" #include "uidswap.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "key.h" #include "key.h"
#include "hostfile.h" #include "hostfile.h"
#include "pathnames.h" #include "pathnames.h"
#include "auth.h" #include "auth.h"
#include "canohost.h" #include "canohost.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
/* import */ /* import */
......
/* $OpenBSD: auth-rhosts.c,v 1.40 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-rhosts.c,v 1.41 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -25,13 +25,17 @@ ...@@ -25,13 +25,17 @@
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "packet.h" #include "packet.h"
#include "buffer.h"
#include "uidswap.h" #include "uidswap.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "canohost.h" #include "canohost.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
/* import */ /* import */
......
/* $OpenBSD: auth-rsa.c,v 1.70 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth-rsa.c,v 1.71 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -26,18 +26,23 @@ ...@@ -26,18 +26,23 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "ssh1.h" #include "ssh1.h"
#include "uidswap.h" #include "uidswap.h"
#include "match.h" #include "match.h"
#include "buffer.h"
#include "auth-options.h" #include "auth-options.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "auth.h" #include "key.h"
#include "hostfile.h" #include "hostfile.h"
#include "auth.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "ssh.h" #include "ssh.h"
#include "misc.h" #include "misc.h"
......
/* $OpenBSD: auth-skey.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth-skey.c,v 1.24 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
...@@ -22,10 +22,13 @@ ...@@ -22,10 +22,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#ifdef SKEY #ifdef SKEY
#include <sys/types.h>
#include <skey.h> #include <skey.h>
#include "xmalloc.h" #include "xmalloc.h"
......
/* $OpenBSD: auth.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth.c,v 1.75 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
...@@ -51,17 +51,21 @@ ...@@ -51,17 +51,21 @@
#include "match.h" #include "match.h"
#include "groupaccess.h" #include "groupaccess.h"
#include "log.h" #include "log.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"
#include "canohost.h" #include "canohost.h"
#include "buffer.h"
#include "bufaux.h"
#include "uidswap.h" #include "uidswap.h"
#include "misc.h" #include "misc.h"
#include "bufaux.h" #include "bufaux.h"
#include "packet.h" #include "packet.h"
#include "loginrec.h" #include "loginrec.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
/* import */ /* import */
......
/* $OpenBSD: auth.h,v 1.56 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth.h,v 1.57 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
...@@ -28,14 +28,8 @@ ...@@ -28,14 +28,8 @@
#ifndef AUTH_H #ifndef AUTH_H
#define AUTH_H #define AUTH_H
#include <sys/types.h>
#include <signal.h>
#include <pwd.h>
#include <signal.h> #include <signal.h>
#include <stdio.h>
#include "buffer.h"
#include <openssl/rsa.h> #include <openssl/rsa.h>
#ifdef HAVE_LOGIN_CAP #ifdef HAVE_LOGIN_CAP
...@@ -48,9 +42,6 @@ ...@@ -48,9 +42,6 @@
#include <krb5.h> #include <krb5.h>
#endif #endif
#include "key.h"
#include "hostfile.h"
typedef struct Authctxt Authctxt; typedef struct Authctxt Authctxt;
typedef struct Authmethod Authmethod; typedef struct Authmethod Authmethod;
typedef struct KbdintDevice KbdintDevice; typedef struct KbdintDevice KbdintDevice;
......
/* $OpenBSD: auth1.c,v 1.69 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth1.c,v 1.70 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <pwd.h>
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
...@@ -26,10 +27,15 @@ ...@@ -26,10 +27,15 @@
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "channels.h" #include "channels.h"
#include "session.h" #include "session.h"
#include "uidswap.h" #include "uidswap.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "buffer.h" #include "buffer.h"
......
/* $OpenBSD: auth2-chall.c,v 1.29 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: auth2-chall.c,v 1.30 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Per Allansson. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved.
...@@ -23,16 +23,21 @@ ...@@ -23,16 +23,21 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "xmalloc.h"
#include "ssh2.h" #include "ssh2.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "buffer.h" #include "buffer.h"
#include "packet.h" #include "packet.h"
#include "xmalloc.h"
#include "dispatch.h" #include "dispatch.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
......
/* $OpenBSD: auth2-gss.c,v 1.14 2006/03/25 22:22:42 djm Exp $ */ /* $OpenBSD: auth2-gss.c,v 1.15 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
...@@ -26,18 +26,20 @@ ...@@ -26,18 +26,20 @@
#include "includes.h" #include "includes.h"
#ifdef GSSAPI #include <sys/types.h>
#include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h" #include "auth.h"
#include "ssh2.h" #include "ssh2.h"
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "dispatch.h" #include "dispatch.h"
#include "buffer.h"
#include "servconf.h" #include "servconf.h"
#include "packet.h" #include "packet.h"
#include "monitor_wrap.h"
#include "ssh-gss.h" #include "ssh-gss.h"
#include "monitor_wrap.h"
extern ServerOptions options; extern ServerOptions options;
...@@ -291,5 +293,3 @@ Authmethod method_gssapi = { ...@@ -291,5 +293,3 @@ Authmethod method_gssapi = {
userauth_gssapi, userauth_gssapi,
&options.gss_authentication &options.gss_authentication
}; };
#endif /* GSSAPI */
/* $OpenBSD: auth2-hostbased.c,v 1.10 2006/07/22 20:48:22 stevesk Exp $ */ /* $OpenBSD: auth2-hostbased.c,v 1.11 2006/08/03 03:34:41 deraadt Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
...@@ -29,18 +29,22 @@ ...@@ -29,18 +29,22 @@
#include <pwd.h> #include <pwd.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include "ssh2.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh2.h"
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "bufaux.h"
#include "auth.h"
#include "key.h" #include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "canohost.h" #include "canohost.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
#include "monitor_wrap.h" #include "monitor_wrap.h"
#include "pathnames.h" #include "pathnames.h"
......
/* $OpenBSD: auth2-kbdint.c,v 1.4 2006/03/25 13:17:01 djm Exp $ */ /* $OpenBSD: auth2-kbdint.c,v 1.5 2006/08/03 03:34:41 deraadt Exp $ */