Skip to content

Commit

Permalink
Imported from conserver-8.1.9.tar.gz
Browse files Browse the repository at this point in the history
  • Loading branch information
bstansell committed Jul 14, 2004
1 parent 27475bd commit faad858
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 69 deletions.
11 changes: 10 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
CHANGES
=======

version 8.1.9 (Jul 14, 2004):
- fixed bug processing access lists when duplicates exist in the
list - reported by Phil Dibowitz <phil@usc.edu>
- fixed bug where 'idletimeout' was not recognized in default
blocks - reported by John Cagle <jcagle@gmail.com>
- added an 'autocomplete' config option to set the console name
autocompletion behavior - suggested by John Stoffel
<stoffel@lucent.com>

version 8.1.8 (Jun 9, 2004):
- added 'initspinmax' and 'initspintimer' console options to
help calm console initialization "spinning"
Expand Down Expand Up @@ -760,5 +769,5 @@ before version 6.05:
and enhancements of various types were applied.

#
# $Id: CHANGES,v 1.189 2004/06/09 22:25:50 bryan Exp $
# $Id: CHANGES,v 1.192 2004/07/14 18:08:28 bryan Exp $
#
42 changes: 16 additions & 26 deletions config.guess
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

timestamp='2004-03-12'
timestamp='2004-06-24'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -53,7 +53,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
Expand Down Expand Up @@ -212,6 +212,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
luna88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
Expand All @@ -227,9 +230,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pegasos:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
Expand Down Expand Up @@ -307,9 +307,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha*:OpenVMS:*:*)
echo alpha-hp-vms
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
Expand Down Expand Up @@ -764,7 +761,7 @@ EOF
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
*:UNICOS/mp:*:*)
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
Expand All @@ -787,21 +784,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
# Determine whether the default compiler uses glibc.
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <features.h>
#if __GLIBC__ >= 2
LIBC=gnu
#else
LIBC=
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
# FreeBSD's kernel, but not the complete OS.
case ${LIBC} in gnu) kernel_only='k' ;; esac
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
Expand Down Expand Up @@ -1096,7 +1079,7 @@ EOF
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
M68*:*:R3V[567]*:*)
M68*:*:R3V[5678]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL=''
Expand Down Expand Up @@ -1260,6 +1243,13 @@ EOF
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms && exit 0 ;;
I*) echo ia64-dec-vms && exit 0 ;;
V*) echo vax-dec-vms && exit 0 ;;
esac
esac

#echo '(No uname command or uname output not recognized.)' 1>&2
Expand Down
31 changes: 17 additions & 14 deletions config.sub
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

timestamp='2004-03-12'
timestamp='2004-06-24'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
Expand Down Expand Up @@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
Expand Down Expand Up @@ -145,7 +145,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis)
-apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
Expand Down Expand Up @@ -300,7 +300,7 @@ case $basic_machine in
| avr-* \
| bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | cydra-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
Expand All @@ -326,8 +326,9 @@ case $basic_machine in
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| msp430-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
Expand Down Expand Up @@ -445,6 +446,10 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
craynv)
basic_machine=craynv-cray
os=-unicosmp
;;
cr16c)
basic_machine=cr16c-unknown
os=-elf
Expand Down Expand Up @@ -659,10 +664,6 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
mmix*)
basic_machine=mmix-knuth
os=-mmixware
;;
monitor)
basic_machine=m68k-rom68k
os=-coff
Expand Down Expand Up @@ -743,10 +744,6 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem)
basic_machine=nsr-tandem
;;
Expand Down Expand Up @@ -1059,6 +1056,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
mmix)
basic_machine=mmix-knuth
;;
rs6000)
basic_machine=rs6000-ibm
;;
Expand Down Expand Up @@ -1374,6 +1374,9 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-knuth)
os=-mmixware
;;
*-wec)
os=-proelf
;;
Expand Down
11 changes: 9 additions & 2 deletions conserver.cf/conserver.cf.man
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" $Id: conserver.cf.man,v 1.67 2004/06/01 23:45:48 bryan Exp $
.TH CONSERVER.CF 5 "2004/06/01" "conserver-8.1.8" "conserver"
.\" $Id: conserver.cf.man,v 1.68 2004/07/14 05:28:42 bryan Exp $
.TH CONSERVER.CF 5 "2004/07/14" "conserver-8.1.9" "conserver"
.SH NAME
conserver.cf \- console configuration file for
.BR conserver (8)
Expand Down Expand Up @@ -283,6 +283,13 @@ If the value of ``*'' is used, the configuration block will be applied to
all conserver hosts.
.RS
.TP
\f3autocomplete\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
.br
Turn the console name autocompletion feature on or off.
If autocompletion is on, a client can use any unique leading portion of a
console name when connecting to a console.
Autocompletion is on by default.
.TP
\f3defaultaccess\fP \f3rejected\fP|\f3trusted\fP|\f3allowed\fP
.br
Set the default access permission for all hosts not matched by
Expand Down
2 changes: 1 addition & 1 deletion conserver.cf/conserver.passwd.man
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" $Id: conserver.passwd.man,v 1.10 2004/01/08 16:12:33 bryan Exp $
.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.8" "conserver"
.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.9" "conserver"
.SH NAME
conserver.passwd \- user access information for
.BR conserver (8)
Expand Down
8 changes: 4 additions & 4 deletions conserver.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ <H3>The conserver.com Distribution</H3>

<H3>Downloading</H3>

<P>The current version, released on Jun 9, 2004, is <A
href="8.1.8.tar.gz">8.1.8.tar.gz</A>. You can get it via
<P>The current version, released on Jul 14, 2004, is <A
href="8.1.9.tar.gz">8.1.9.tar.gz</A>. You can get it via
<A href=
"ftp://ftp.conserver.com/conserver/8.1.8.tar.gz">FTP</A>
or <A href="8.1.8.tar.gz">HTTP</A>. See the <A href=
"ftp://ftp.conserver.com/conserver/8.1.9.tar.gz">FTP</A>
or <A href="8.1.9.tar.gz">HTTP</A>. See the <A href=
"CHANGES">CHANGES</A> file for information on the latest
updates.</P>

Expand Down
2 changes: 1 addition & 1 deletion conserver/conserver.man
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine
.\" $Id: conserver.man,v 1.50 2004/06/08 16:19:46 bryan Exp $
.TH CONSERVER 8 "2004/06/08" "conserver-8.1.8" "conserver"
.TH CONSERVER 8 "2004/06/08" "conserver-8.1.9" "conserver"
.SH NAME
conserver \- console server daemon
.SH SYNOPSIS
Expand Down
5 changes: 3 additions & 2 deletions conserver/group.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* $Id: group.c,v 5.304 2004/06/03 21:53:42 bryan Exp $
* $Id: group.c,v 5.305 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
Expand Down Expand Up @@ -2938,7 +2938,8 @@ DoClientRead(pGE, pCLServing)
if (n != (NAMES *)0)
break;
}
if (pCEwant == (CONSENT *)0) {
if (pCEwant == (CONSENT *)0 &&
config->autocomplete == FLAGTRUE) {
NAMES *n = (NAMES *)0;
int len = strlen(pcArgs);
for (pCE = pGE->pCElist; pCE != (CONSENT *)0;
Expand Down
12 changes: 10 additions & 2 deletions conserver/main.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* $Id: main.c,v 5.185 2004/05/25 23:03:01 bryan Exp $
* $Id: main.c,v 5.186 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
Expand Down Expand Up @@ -59,7 +59,8 @@ CONFIG *optConf = (CONFIG *)0;
CONFIG *config = (CONFIG *)0;
char *interface = (char *)0;
CONFIG defConfig =
{ (STRING *)0, 'r', FLAGFALSE, LOGFILEPATH, PASSWDFILE, DEFPORT,
{ (STRING *)0, FLAGTRUE, 'r', FLAGFALSE, LOGFILEPATH, PASSWDFILE,
DEFPORT,
FLAGTRUE, FLAGTRUE, 0, DEFBASEPORT, (char *)0, 0
#if HAVE_SETPROCTITLE
, FLAGFALSE
Expand Down Expand Up @@ -1457,6 +1458,13 @@ main(argc, argv)
else
config->redirect = defConfig.redirect;

if (optConf->autocomplete != FLAGUNKNOWN)
config->autocomplete = optConf->autocomplete;
else if (pConfig->autocomplete != FLAGUNKNOWN)
config->autocomplete = pConfig->autocomplete;
else
config->autocomplete = defConfig.autocomplete;

if (optConf->loghostnames != FLAGUNKNOWN)
config->loghostnames = optConf->loghostnames;
else if (pConfig->loghostnames != FLAGUNKNOWN)
Expand Down
5 changes: 3 additions & 2 deletions conserver/master.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* $Id: master.c,v 5.127 2004/06/03 21:53:59 bryan Exp $
* $Id: master.c,v 5.128 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
Expand Down Expand Up @@ -292,7 +292,8 @@ CommandCall(pCL, args)
pRCFound = pRC;
}
}
if (found == 0) { /* Then look for substring matches */
if (found == 0 && config->autocomplete == FLAGTRUE) {
/* Then look for substring matches */
NAMES *name = (NAMES *)0;
int foundOne = 0;
for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
Expand Down
Loading

0 comments on commit faad858

Please sign in to comment.