libopenssh/ssh at df7bb23744d35804e144f4257c812994afcb22e8 - libopenssh - Steepath Git Private Instance

openbsd/libopenssh

mirror of https://github.com/openssh/libopenssh synced 2026-04-17 10:16:53 +00:00

Files

History

Damien Miller df7bb23744 defatal kex_send_kexinit

2012-01-17 14:45:06 +01:00

..

sync to openssh cvs as of 2012/01/08

2012-01-17 14:32:47 +01:00

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-pkcs11-helper

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

add a libevent based ssh proxy

2012-01-17 14:32:48 +01:00

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

addrmatch.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

atomicio.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

atomicio.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth1.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth2-chall.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

auth2-gss.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

auth2-hostbased.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth2-jpake.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

auth2-kbdint.c

switch sshd-auth2 to ssh_packet_*

2012-01-17 14:32:48 +01:00

auth2-none.c

switch sshd-auth2 to ssh_packet_*

2012-01-17 14:32:48 +01:00

auth2-passwd.c

switch sshd-auth2 to ssh_packet_*

2012-01-17 14:32:48 +01:00

auth2-pubkey.c

key_verify now returns 0 on success and < 0 on error

2012-01-17 14:32:49 +01:00

auth2.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

auth-bsdauth.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth-chall.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth-krb5.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth-options.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth-options.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth-passwd.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth-rh-rsa.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth-rhosts.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

auth-rsa.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

auth.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

authfd.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

authfd.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

authfile.c

defatal cipher.[ch]

2012-01-17 14:37:27 +01:00

authfile.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

bufaux.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

bufbn.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

bufec.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

buffer.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

buffer.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

canohost.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

canohost.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

channels.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

channels.h

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

cipher-3des1.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

cipher-bf1.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

cipher-ctr.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

cipher.c

defatal cipher.[ch]

2012-01-17 14:37:27 +01:00

cipher.h

defatal cipher.[ch]

2012-01-17 14:37:27 +01:00

cleanup.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

clientloop.c

defatal kex_send_kexinit

2012-01-17 14:45:06 +01:00

clientloop.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

compat.c

Move the key exchange state and other global variables into

2012-01-17 14:32:46 +01:00

compat.h

Move the key exchange state and other global variables into

2012-01-17 14:32:46 +01:00

crc32.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

crc32.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

deattack.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

deattack.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

dh.c

de-fatal kex dh (test for de-fatal of packet.c)

2012-01-17 14:37:27 +01:00

dh.h

de-fatal kex dh (test for de-fatal of packet.c)

2012-01-17 14:37:27 +01:00

dispatch.c

deal with error-codes returned by dispatch function (fatal for now)

2012-01-17 14:37:27 +01:00

dispatch.h

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

dns.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

dns.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

err.c

de-fatal ssh_packet_{start,stop}_discard()

2012-01-17 14:44:19 +01:00

err.h

de-fatal ssh_packet_{start,stop}_discard()

2012-01-17 14:44:19 +01:00

fatal.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

groupaccess.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

groupaccess.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

gss-genr.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

gss-serv-krb5.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

gss-serv.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

hostfile.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

hostfile.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

jpake.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

jpake.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

kex.c

defatal kex_send_kexinit

2012-01-17 14:45:06 +01:00

kex.h

defatal kex_send_kexinit

2012-01-17 14:45:06 +01:00

kexdh.c

de-fatal kex-gex, add matching error codes, minimize diff to kex-dh

2012-01-17 14:44:18 +01:00

kexdhc.c

pass kex-setup errors back to kex_input_kexinit()

2012-01-17 14:44:19 +01:00

kexdhs.c

pass kex-setup errors back to kex_input_kexinit()

2012-01-17 14:44:19 +01:00

kexecdh.c

de-fatal kex-ecdh

2012-01-17 14:44:19 +01:00

kexecdhc.c

remove kex_kexinit_finish; unbreak kex-ecdh

2012-01-17 14:44:19 +01:00

kexecdhs.c

pass kex-setup errors back to kex_input_kexinit()

2012-01-17 14:44:19 +01:00

kexgex.c

de-fatal kex-gex, add matching error codes, minimize diff to kex-dh

2012-01-17 14:44:18 +01:00

kexgexc.c

pass kex-setup errors back to kex_input_kexinit()

2012-01-17 14:44:19 +01:00

kexgexs.c

pass kex-setup errors back to kex_input_kexinit()

2012-01-17 14:44:19 +01:00

key.c

better parameter checking for RSA key generation

2012-01-17 14:32:49 +01:00

key.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

LICENCE

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

log.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

log.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

mac.c

defatal mac.[ch]

2012-01-17 14:42:52 +01:00

mac.h

defatal mac.[ch]

2012-01-17 14:42:52 +01:00

Makefile

Move the key exchange state and other global variables into

2012-01-17 14:32:46 +01:00

Makefile.inc

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

match.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

match.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

misc.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

misc.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

moduli.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

monitor_fdpass.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

monitor_fdpass.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

monitor_mm.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

monitor_mm.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

monitor_wrap.c

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

monitor_wrap.h

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

monitor.c

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

monitor.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

msg.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

msg.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

mux.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

myproposal.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

nchan2.ms

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

nchan.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

nchan.ms

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

opacket.c

let packet_set_connection create the active_state, again

2012-01-17 14:32:47 +01:00

OVERVIEW

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

packet.c

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

packet.h

defatal compression code by merging it into packet.c

2012-01-17 14:45:00 +01:00

pathnames.h

unifdef ETCDIR

2012-01-17 14:32:47 +01:00

pkcs11.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

progressmeter.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

progressmeter.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

PROTOCOL

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

PROTOCOL.agent

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

PROTOCOL.certkeys

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

PROTOCOL.mux

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

readconf.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

readconf.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

README

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

readpass.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

roaming_client.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

roaming_common.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

roaming_dummy.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

roaming_serv.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

roaming.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

rsa.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

rsa.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sandbox-rlimit.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sandbox-systrace.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

schnorr.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

schnorr.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

scp.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

scp.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

servconf.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

servconf.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

serverloop.c

defatal kex_send_kexinit

2012-01-17 14:45:06 +01:00

serverloop.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

session.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

session.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-client.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-client.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-common.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-common.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-glob.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-server-main.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-server.8

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp-server.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sftp.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh1.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh2.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh_api.c

deal with error-codes returned by dispatch function (fatal for now)

2012-01-17 14:37:27 +01:00

ssh_api.h

rename ssh_packet_get() to ssh_packet_next() and document resulting API

2012-01-17 14:37:26 +01:00

ssh_config

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh_config.5

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-add.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-add.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-agent.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-agent.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-dss.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-ecdsa.c

fix ecdsa signatures from Markus

2012-01-17 14:32:49 +01:00

ssh-gss.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-keygen.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-keygen.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-keyscan.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-keyscan.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-keysign.8

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-keysign.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-pkcs11-client.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-pkcs11-helper.8

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh-pkcs11-helper.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-pkcs11.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-pkcs11.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-proxy.c

rename ssh_packet_get() to ssh_packet_next() and document resulting API

2012-01-17 14:37:26 +01:00

ssh-proxy.txt

ssh_api.c: offer hostkey algorithms depending on registered keys

2012-01-17 14:36:45 +01:00

ssh-rsa.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh-sandbox.h

move packet state internals back from packet.h to packet.c

2012-01-17 14:32:46 +01:00

ssh.1

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ssh.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

ssh.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshbuf-getput-basic.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshbuf-getput-crypto.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshbuf-misc.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshbuf.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshbuf.h

disable SSHBUF_ABORT and fix compilation with it turned off

2012-01-17 14:37:27 +01:00

sshconnect1.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshconnect2.c

dispatch_fn() now returns an error code (int) instead of void

2012-01-17 14:37:26 +01:00

sshconnect.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshconnect.h

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshd_config

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshd_config.5

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshd.8

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshd.c

first cut at merging disentangled buffer and library code. buffer_* continue

2012-01-17 14:32:48 +01:00

sshlogin.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshlogin.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshpty.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshpty.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

sshtty.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ttymodes.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

ttymodes.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

uidswap.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

uidswap.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

umac.c

defatal mac.[ch]

2012-01-17 14:42:52 +01:00

umac.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

uuencode.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

uuencode.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

version.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

xmalloc.c

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

xmalloc.h

import openssh as of 2012/01/05

2012-01-05 12:08:12 +01:00

README

This release of OpenSSH is for OpenBSD systems only.

Please read
	http://www.openssh.com/portable.html
if you want to install OpenSSH on other operating systems.

To extract and install this release on your OpenBSD system use:

      # cd /usr/src/usr.bin
      # tar xvfz .../openssh-x.y.tgz
      # cd ssh
      # make obj
      # make cleandir
      # make depend
      # make
      # make install
      # cp ssh_config sshd_config /etc/ssh

OpenSSH is a derivative of the original and free ssh 1.2.12 release
by Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels
Provos, Theo de Raadt and Dug Song removed many bugs, re-added newer
features and created OpenSSH.  Markus Friedl contributed the support
for SSH protocol versions 1.5 and 2.0.

See http://www.openssh.com/ for more information.

$OpenBSD: README,v 1.7 2006/04/01 05:37:46 djm Exp $