Imported from conserver-8.1.9.tar.gz

This commit is contained in:
Bryan Stansell 2004-07-14 16:21:13 -07:00
parent 27475bdd30
commit faad858599
16 changed files with 114 additions and 69 deletions

11
CHANGES
View File

@ -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"
@ -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
config.guess vendored
View File

@ -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
@ -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
@ -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 ;;
@ -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 ;;
@ -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
@ -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'`
@ -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
@ -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=''
@ -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

31
config.sub vendored
View File

@ -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
@ -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
@ -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
;;
@ -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-* \
@ -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-* \
@ -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
@ -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
@ -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
;;
@ -1059,6 +1056,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
mmix)
basic_machine=mmix-knuth
;;
rs6000)
basic_machine=rs6000-ibm
;;
@ -1374,6 +1374,9 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-knuth)
os=-mmixware
;;
*-wec)
os=-proelf
;;

View File

@ -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)
@ -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

View File

@ -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)

View File

@ -182,11 +182,11 @@
<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>

View File

@ -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

View File

@ -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
*
@ -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;

View File

@ -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
*
@ -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
@ -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)

View File

@ -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
*
@ -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) {

View File

@ -1,5 +1,5 @@
/*
* $Id: readcfg.c,v 5.178 2004/06/01 23:45:47 bryan Exp $
* $Id: readcfg.c,v 5.180 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
@ -1782,8 +1782,8 @@ ProcessIdletimeout(c, id)
/* if it wasn't a number or a qualifier wasn't at the end */
if (*p != '\000') {
if (isMaster)
Error("invalid idletime specification `%s' [%s:%d]", id, file,
line);
Error("invalid idletimeout specification `%s' [%s:%d]", id,
file, line);
return;
}
c->idletimeout = (time_t)atoi(id) * (factor == 0 ? 1 : factor);
@ -3843,10 +3843,11 @@ AccessProcessACL(trust, acl)
strcasecmp((*ppa)->pcwho, pa->pcwho) == 0) {
/* already exists, so skip it */
DestroyAccessList(pa);
return;
break;
}
}
*ppa = pa; /* add to end of list */
if (*ppa == (ACCESS *)0)
*ppa = pa; /* add to end of list */
}
}
@ -3982,6 +3983,8 @@ ConfigEnd()
}
if (parserConfigTemp->defaultaccess != '\000')
pConfig->defaultaccess = parserConfigTemp->defaultaccess;
if (parserConfigTemp->autocomplete != FLAGUNKNOWN)
pConfig->autocomplete = parserConfigTemp->autocomplete;
if (parserConfigTemp->daemonmode != FLAGUNKNOWN)
pConfig->daemonmode = parserConfigTemp->daemonmode;
if (parserConfigTemp->redirect != FLAGUNKNOWN)
@ -4094,6 +4097,18 @@ ProcessYesNo(id, flag)
*flag = FLAGFALSE;
}
void
#if PROTOTYPES
ConfigItemAutocomplete(char *id)
#else
ConfigItemAutocomplete(id)
char *id;
#endif
{
CONDDEBUG((1, "ConfigItemAutocomplete(%s) [%s:%d]", id, file, line));
ProcessYesNo(id, &(parserConfigTemp->autocomplete));
}
void
#if PROTOTYPES
ConfigItemDaemonmode(char *id)
@ -4384,7 +4399,7 @@ ITEM keyDefault[] = {
/* {"flow", DefaultItemFlow}, */
{"host", DefaultItemHost},
{"idlestring", DefaultItemIdlestring},
{"idletime", DefaultItemIdletimeout},
{"idletimeout", DefaultItemIdletimeout},
{"include", DefaultItemInclude},
{"initcmd", DefaultItemInitcmd},
{"initspinmax", DefaultItemInitspinmax},
@ -4451,6 +4466,7 @@ ITEM keyAccess[] = {
};
ITEM keyConfig[] = {
{"autocomplete", ConfigItemAutocomplete},
{"defaultaccess", ConfigItemDefaultaccess},
{"daemonmode", ConfigItemDaemonmode},
{"initdelay", ConfigItemInitdelay},
@ -4652,6 +4668,14 @@ ReReadCfg(fd)
/* gets used on-the-fly */
}
if (optConf->autocomplete == FLAGUNKNOWN) {
if (pConfig->autocomplete == FLAGUNKNOWN)
config->autocomplete = defConfig.autocomplete;
else if (pConfig->autocomplete != config->autocomplete)
config->autocomplete = pConfig->autocomplete;
/* gets used on-the-fly */
}
if (optConf->loghostnames == FLAGUNKNOWN) {
if (pConfig->loghostnames == FLAGUNKNOWN)
config->loghostnames = defConfig.loghostnames;

View File

@ -1,5 +1,5 @@
/*
* $Id: readcfg.h,v 5.40 2004/05/25 23:03:01 bryan Exp $
* $Id: readcfg.h,v 5.41 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
@ -10,6 +10,7 @@
typedef struct config {
STRING *name;
FLAG autocomplete;
char defaultaccess;
FLAG daemonmode;
char *logfile;

View File

@ -1,5 +1,5 @@
/*
* $Id: version.h,v 1.64 2004/06/09 22:26:19 bryan Exp $
* $Id: version.h,v 1.65 2004/07/14 05:28:42 bryan Exp $
*
* Copyright conserver.com, 2000
*
@ -14,4 +14,4 @@
@(#) Copyright 2000 conserver.com.\n\
All rights reserved.\n"
#define THIS_VERSION "conserver.com version 8.1.8"
#define THIS_VERSION "conserver.com version 8.1.9"

View File

@ -1,5 +1,5 @@
.\" $Id: console.man,v 1.54 2004/05/28 00:02:16 bryan Exp $
.TH CONSOLE 1 "2004/05/28" "conserver-8.1.8" "conserver"
.\" $Id: console.man,v 1.55 2004/07/14 05:28:42 bryan Exp $
.TH CONSOLE 1 "2004/07/14" "conserver-8.1.9" "conserver"
.SH NAME
console \- console server client program
.SH SYNOPSIS
@ -61,7 +61,8 @@ In the first form above,
asks the user's password before
granting interactive access to a console (on a non-trusted system),
since such a session may provide single-user access.
Only as much of the console name as is required to
If the server's autocompletion feature is enabled,
only as much of the console name as is required to
identify it uniquely to the server is required.
.PP
For non-interactive options,

View File

@ -4,7 +4,7 @@
#
%define pkg conserver
%define ver 8.1.8
%define ver 8.1.9
# define the name of the machine on which the main conserver
# daemon will be running if you don't want to use the default

View File

@ -1,7 +1,7 @@
PKG="conserver"
NAME="Console server and client"
CATEGORY="system"
VERSION="8.1.8"
VERSION="8.1.9"
DESC="Console server and client"
CLASSES=none
ARCH=sparc