Release v8.2.5

Issue 38 task execution

.cirrus.yml

@@ -0,0 +1,48 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+
+freebsd_12_task:
+  freebsd_instance:
+    image_family: freebsd-12-1
+  install_script:
+    - pkg install -y autoconf automake
+    - ./package/setup-configure
+  basic_script: &basic
+    - "[ -f Makefile ] && make distclean"
+    - ./configure || { cat config.log; exit 1; }
+    - make
+    - make test
+  uds_script: &uds
+    - "[ -f Makefile ] && make distclean"
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+    - make
+    - make test
+  pam_ssl_script: &pamssl
+    - "[ -f Makefile ] && make distclean"
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
+    - make test
+  gssapi_script: &gssapi
+    - "[ -f Makefile ] && make distclean"
+    - ./configure --with-gssapi || { cat config.log; exit 1; }
+    - make
+    - make test
+
+linux_gcc_task:
+  container:
+    image: gcc:latest
+  install_script:
+    - ./package/setup-configure
+  basic_script: *basic
+  uds_script: *uds
+  pam_ssl_script: *pamssl
+
+#macos_task:
+#  osx_instance:
+#    image: mojave-xcode-10.1
+#  install_script:
+#    - brew install autoconf automake
+#    - ./package/setup-configure
+#  basic_script: *basic
+#  uds_script: *uds
+#  pam_ssl_script: *pamssl

.gitignore

@@ -0,0 +1 @@
+*.[ch]~

FAQ

@@ -184,7 +184,3 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
     - Have you tried a search on the conserver site (it searches
       mailing list traffic as well) to see if someone else has gone
       through the same problem?
-
-#
-#  $Id: FAQ,v 1.9 2003/08/23 19:27:10 bryan Exp $
-#

INSTALL

@@ -286,8 +286,3 @@ Other Information And Gotchas
         connecting to servers, you might be tickling this bug and you
         can upgrade the compiler, turn off the optimization, or apply
         this code change.
-
-
-#
-#  $Id: INSTALL,v 1.41 2014/04/20 06:45:07 bryan Exp $
-#

LICENSE

@@ -1,115 +1,29 @@
-Since this piece of software has had many contiributors, there is a
-"chain" of licensing information embedded in the files.  I've copied
-what I could find here so that it's easy to reference.  The entire
-bundle of software is guided by these licensing statements.
-
-----------------------------------------------------------------------------
+BSD 3-Clause License
 
 Copyright (c) 2000, conserver.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the
-    distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-  - Neither the name of conserver.com nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------------
-
-Copyright (c) 1998, GNAC, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the
-    distribution.
-
-  - Neither the name of GNAC, Inc. nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------------
-
-Copyright 1992 Purdue Research Foundation, West Lafayette, Indiana
-47907.  All rights reserved.
-
-This software is not subject to any license of the American Telephone
-and Telegraph Company or the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-1. Neither the authors nor Purdue University are responsible for any
-   consequences of the use of this software.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Credit to the authors and Purdue
-   University must appear in documentation and sources.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-4. This notice may not be removed or altered.
-
-----------------------------------------------------------------------------
-
-Copyright (c) 1990 The Ohio State University.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that: (1) source distributions retain this entire copyright
-notice and comment, and (2) distributions including binaries display
-the following acknowledgement:  ``This product includes software
-developed by The Ohio State University and its contributors''
-in the documentation or other materials provided with the distribution
-and in all advertising materials mentioning features or use of this
-software. Neither the name of the University nor the names of its
-contributors may be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-----------------------------------------------------------------------------
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES

@@ -0,0 +1,115 @@
+Since this piece of software has had many contiributors, there is a
+"chain" of licensing information embedded in the files.  I've copied
+what I could find here so that it's easy to reference.  The entire
+bundle of software is guided by these licensing statements.
+
+----------------------------------------------------------------------------
+
+Copyright (c) 2000, conserver.com
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+  - Neither the name of conserver.com nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------------
+
+Copyright (c) 1998, GNAC, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+  - Neither the name of GNAC, Inc. nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------------
+
+Copyright 1992 Purdue Research Foundation, West Lafayette, Indiana
+47907.  All rights reserved.
+
+This software is not subject to any license of the American Telephone
+and Telegraph Company or the Regents of the University of California.
+
+Permission is granted to anyone to use this software for any purpose on
+any computer system, and to alter it and redistribute it freely, subject
+to the following restrictions:
+
+1. Neither the authors nor Purdue University are responsible for any
+   consequences of the use of this software.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission.  Credit to the authors and Purdue
+   University must appear in documentation and sources.
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+4. This notice may not be removed or altered.
+
+----------------------------------------------------------------------------
+
+Copyright (c) 1990 The Ohio State University.
+All rights reserved.
+
+Redistribution and use in source and binary forms are permitted
+provided that: (1) source distributions retain this entire copyright
+notice and comment, and (2) distributions including binaries display
+the following acknowledgement:  ``This product includes software
+developed by The Ohio State University and its contributors''
+in the documentation or other materials provided with the distribution
+and in all advertising materials mentioning features or use of this
+software. Neither the name of the University nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+----------------------------------------------------------------------------

PROTOCOL

@@ -7,7 +7,7 @@ What Is This?
 
 The following is an attempt to describe the client/server protocol used
 between the server (conserver) and the client (console).  This document
-bases it's information on conserver version 8.1.4, as it's the release
+bases its information on conserver version 8.1.4, as it's the release
 currently available.  If there are changes to the client/server
 protocol, the INSTALL file should reference them and, ideally, this
 document will be updated.
@@ -300,7 +300,3 @@ The more "interesting" escape sequences are the following.
 	    " -- attached (nologging)]"
 	    " -- attached]"
 	    " -- spy mode]"
-
-#
-#  $Id: PROTOCOL,v 1.2 2005/09/05 21:54:03 bryan Exp $
-#

README

@@ -1,70 +0,0 @@
-				README
-				======
-
-
-Maintainer/Enhancer
-
-    Bryan Stansell (bryan@conserver.com)
-
-
-Documentation
-
-    See the INSTALL file for installation, the conserver.html file for
-    an overview, and the man pages for specifics.
-
-
-Downloading
-
-    The latest version can be found at http://www.conserver.com/
-    (US-West).
-
-    Mirrors of the site are at:
-
-	Australia	http://planetmirror.com/pub/conserver/
-	Ireland		http://conserver.oss-mirror.org/
-	Germany		http://conserver.linux-mirror.org/
-	Russia		http://conserver.rinet.ru/
-
-
-Systems Tested
-
-    Here's a list of systems that I've been told can successfully
-    compile conserver.  If anyone has more to add to this list (or
-    something on the list doesn't work any more), please let me know.
-
-	AIX 4.3.3/5.1/5.2, native cc
-	BSDI BSD/OS 3.X, gcc
-	Cygwin (w2k),gcc 2.95.3
-	DEC Tru64 4.0, gcc
-	DEC Tru64 4.0/5.1, native cc
-	FreeBSD 4.x (i386) gcc
-	FreeBSD 5.x (i386/amd64/sparc64) gcc
-	FreeBSD 6.x/7.x (i386/amd64/sparc64/ia64) gcc
-	HP-UX 10.20, gcc
-	HP-UX 11.10 parisc and ia64, native cc
-	Irix 6.15, native cc
-	Linux 2.2.18 (x86), gcc
-	Linux 2.4.2 (x86), gcc
-	Linux ia64, native gcc
-	Linux RedHat 6.2 and 7.2 (x86), native gcc
-	MacOS X, native gcc
-	Solaris 2.5.1 thru 9 (sparc/x86), gcc
-	Solaris 7/8, native cc
-	Solaris 10 and Solaris Express (build 33) (x86), gcc and native cc
-
-
-Contributions
-
-    Contributions distributed with the code can be found in the contrib
-    subdirectory.  Other tools that complement conserver are listed
-    below.
-
-    Zinc
-    ----
-    According to the website, Zinc is a console log output management
-    program.  For more information, visit the website at:
-    http://www.columbia.edu/acis/sy/unixdev/zinc
-
-#
-#  $Id: README,v 1.26 2006/04/16 17:45:08 bryan Exp $
-#

README.md

@@ -0,0 +1,35 @@
+Conserver
+=========
+
+[![Build Status](https://api.cirrus-ci.com/github/conserver/conserver.svg)](https://cirrus-ci.com/github/conserver/conserver)
+
+Conserver is an application that allows multiple users to watch a
+serial console at the same time. It can log the data, allows users to
+take write-access of a console (one at a time), and has a variety of
+bells and whistles to accentuate that basic functionality. The idea is
+that conserver will log all your serial traffic so you can go back and
+review why something crashed, look at changes (if done on the console),
+or tie the console logs into a monitoring system (just watch the
+logfiles it creates).  With multi-user capabilities you can work on
+equipment with others, mentor, train, etc. It also does all that
+client-server stuff so that, assuming you have a network connection,
+you can interact with any of the equipment from home or wherever.
+
+
+Documentation
+-------------
+
+See the `INSTALL` file for installation and the man pages for specifics.
+
+
+Downloading
+-----------
+
+The latest version can be found on [GitHub](https://github.com/conserver/conserver/releases).
+
+
+Contributions
+-------------
+
+Contributions distributed with the code can be found in the `contrib`
+subdirectory.

TODO

@@ -106,7 +106,3 @@ Bryan Stansell
 
 - quick-recheck of down consoles (for uds) and possibly only log state
   changes (instead of each try) : DJ Gregor <dj@gregor.com>
-
-#
-#  $Id: TODO,v 1.56 2006/04/03 22:20:34 bryan Exp $
-#

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

autologin/INSTALL.old

@@ -1,5 +1,3 @@
-# $Id: INSTALL.old,v 1.1 2003/11/04 02:36:24 bryan Exp $
-
 To install this program you need root access and access to the physical
 console of the machine (either through the console server or via the physical
 world).

autologin/README

@@ -15,7 +15,3 @@ No one I've ever talked to found a need for something like autologin.
 Good luck.
 
 Bryan Stansell
-
-#
-#  $Id: README,v 1.2 2002/09/23 21:08:42 bryan Exp $
-#

autologin/README.old

@@ -1,5 +1,3 @@
-# $Id: README.old,v 1.1 2003/11/04 02:36:24 bryan Exp $
-
 This program can be used to put a root shell on the console at boot time.
 See the manual page.
 

autologin/autologin.c

@@ -68,9 +68,6 @@
  * Global variables
  */
 
-#ifndef	lint
-char *rcsid = "$Id: autologin.c,v 1.28 2014/04/20 06:45:07 bryan Exp $";
-#endif /* not lint */
 extern char *progname;
 gid_t awGrps[NGROUPS_MAX];
 int iGrps = 0;
@@ -209,9 +206,13 @@ Process(void)
 
     /* Close open files
      */
+#if HAVE_CLOSEFROM
+    closefrom((char *)0 == pcTty ? 3 : 0);
+#else
     for (i = (char *)0 == pcTty ? 3 : 0; i < getdtablesize(); ++i) {
 	(void)close(i);
     }
+#endif
 
     /* Make us a session leader so that when we open /dev/tty
      * it will become our controlling terminal.

autologin/autologin.m

@@ -1,7 +1,5 @@
 # mkcmd parser for autologin program
 %%
-static char *rcsid =
-	"$Id: autologin.m,v 1.1 2003/11/04 02:36:24 bryan Exp $";
 %%
 
 integer variable "iErrs" {

autologin/autologin.man

@@ -1,4 +1,3 @@
-.\" $Id: autologin.man,v 1.2 2004/03/23 18:32:06 bryan Exp $
 .TH AUTOLOGIN 8L PUCC
 .SH NAME
 autologin \- create an automatic login session from /etc/inittab

autologin/main.c

@@ -81,23 +81,23 @@ getopt(int nargc, char **nargv, char *ostr)
 #endif /* ! HAVE_GETOPT */
 
 char
- *progname =
-    "$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $", *au_terse[] = {
+ *progname = "", *au_terse[] = {
     " [-u] [-c cmd] [-e env=value] [-g group] [-l login] [-t tty]",
     " -h",
     " -V",
     (char *)0
 }, *u_help[] = {
-"c cmd       command to run",
-	"e env=value environment variable to set",
-	"g group     initial group",
-	"h           print this help message",
-	"l login     login name",
-	"t tty       attach to this terminal",
-	"u           do no make utmp entry",
-	"V           show version information", (char *)0}, *pcCommand =
-    (char *)0, *pcGroup = (char *)0, *pcLogin = (char *)0, *pcTty =
-    (char *)0;
+
+    "c cmd       command to run",
+    "e env=value environment variable to set",
+    "g group     initial group",
+    "h           print this help message",
+    "l login     login name",
+    "t tty       attach to this terminal",
+    "u           do no make utmp entry",
+    "V           show version information", (char *)0
+}, *pcCommand = (char *)0, *pcGroup = (char *)0, *pcLogin =
+    (char *)0, *pcTty = (char *)0;
 int
   fMakeUtmp = 1, iErrs = 0;
 
@@ -105,8 +105,6 @@ int
 # define u_terse	(au_terse[0])
 #endif
 
-static char *rcsid = "$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $";
-
 /*
  * parser
  */
@@ -174,7 +172,7 @@ main(int argc, char **argv)
 		fMakeUtmp = 0;
 		continue;
 	    case 'V':
-		printf("%s: %s\n", progname, rcsid);
+		printf("%s\n", progname);
 		exit(0);
 	}
 	break;

config.h.in

@@ -1,429 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Client config file path */
-#undef CLIENTCONFIGFILE
-
-/* Config file path */
-#undef CONFIGFILE
-
-/* ./configure invocation */
-#undef CONFIGINVOCATION
-
-/* TCP connection timeout */
-#undef CONNECTTIMEOUT
-
-/* Base socket used for secondary channel */
-#undef DEFBASEPORT
-
-/* Socket used to communicate */
-#undef DEFPORT
-
-/* Defined if building for a Cyclades TS */
-#undef FOR_CYCLADES_TS
-
-/* Define to 1 if you have the `bigcrypt' function. */
-#undef HAVE_BIGCRYPT
-
-/* Define to 1 if you have the <bsm/audit.h> header file. */
-#undef HAVE_BSM_AUDIT_H
-
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
-
-/* have dmalloc support */
-#undef HAVE_DMALLOC
-
-/* have freeipmi support */
-#undef HAVE_FREEIPMI
-
-/* Define to 1 if you have the `getaudit' function. */
-#undef HAVE_GETAUDIT
-
-/* Define to 1 if you have the `getaudit_addr' function. */
-#undef HAVE_GETAUDIT_ADDR
-
-/* Define to 1 if you have the `getdtablesize' function. */
-#undef HAVE_GETDTABLESIZE
-
-/* Define to 1 if you have the `getlogin' function. */
-#undef HAVE_GETLOGIN
-
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the `getprpwnam' function. */
-#undef HAVE_GETPRPWNAM
-
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
-
-/* Define to 1 if you have the `getsid' function. */
-#undef HAVE_GETSID
-
-/* Define to 1 if you have the `getspnam' function. */
-#undef HAVE_GETSPNAM
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `getuserattr' function. */
-#undef HAVE_GETUSERATTR
-
-/* Define to 1 if you have the `getutent' function. */
-#undef HAVE_GETUTENT
-
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
-
-/* have gss-api support */
-#undef HAVE_GSSAPI
-
-/* Define to 1 if you have the <hpsecurity.h> header file. */
-#undef HAVE_HPSECURITY_H
-
-/* Define to 1 if you have the `inet_aton' function. */
-#undef HAVE_INET_ATON
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Defined if in_addr_t exists */
-#undef HAVE_IN_ADDR_T
-
-/* Define to 1 if you have the `iscomsec' function. */
-#undef HAVE_ISCOMSEC
-
-/* Define to 1 if you have the `bsm' library (-lbsm). */
-#undef HAVE_LIBBSM
-
-/* Define to 1 if you have the `sec' library (-lsec). */
-#undef HAVE_LIBSEC
-
-/* Define to 1 if you have the `util' library (-lutil). */
-#undef HAVE_LIBUTIL
-
-/* Define to 1 if you have the <libutil.h> header file. */
-#undef HAVE_LIBUTIL_H
-
-/* Define to 1 if you have the `xnet' library (-lxnet). */
-#undef HAVE_LIBXNET
-
-/* Define to 1 if you have the `memcmp' function. */
-#undef HAVE_MEMCMP
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `openpty' function. */
-#undef HAVE_OPENPTY
-
-/* have openssl support */
-#undef HAVE_OPENSSL
-
-/* have PAM support */
-#undef HAVE_PAM
-
-/* Define to 1 if you have the <prot.h> header file. */
-#undef HAVE_PROT_H
-
-/* Define to 1 if you have the `ptsname' function. */
-#undef HAVE_PTSNAME
-
-/* Define to 1 if you have the <pty.h> header file. */
-#undef HAVE_PTY_H
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Defined if sa_len member exists in struct sockaddr */
-#undef HAVE_SA_LEN
-
-/* Define to 1 if you have the `setgroups' function. */
-#undef HAVE_SETGROUPS
-
-/* Define to 1 if you have the `setlinebuf' function. */
-#undef HAVE_SETLINEBUF
-
-/* Define to 1 if you have the `setpgrp' function. */
-#undef HAVE_SETPGRP
-
-/* Define to 1 if you have the `setproctitle' function. */
-#undef HAVE_SETPROCTITLE
-
-/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
-
-/* Define to 1 if you have the `setsockopt' function. */
-#undef HAVE_SETSOCKOPT
-
-/* Define to 1 if you have the `setttyent' function. */
-#undef HAVE_SETTTYENT
-
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
-
-/* Define to 1 if you have the <shadow.h> header file. */
-#undef HAVE_SHADOW_H
-
-/* Define to 1 if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Defined if socklen_t exists */
-#undef HAVE_SOCKLEN_T
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define if strcasecmp is available */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define if stricmp is available */
-#undef HAVE_STRICMP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Define to 1 if you have the <stropts.h> header file. */
-#undef HAVE_STROPTS_H
-
-/* Define to 1 if you have the `sysconf' function. */
-#undef HAVE_SYSCONF
-
-/* Define to 1 if you have the <sysexits.h> header file. */
-#undef HAVE_SYSEXITS_H
-
-/* Define to 1 if you have the <sys/audit.h> header file. */
-#undef HAVE_SYS_AUDIT_H
-
-/* Define to 1 if you have the <sys/ioctl_compat.h> header file. */
-#undef HAVE_SYS_IOCTL_COMPAT_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/proc.h> header file. */
-#undef HAVE_SYS_PROC_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/ttold.h> header file. */
-#undef HAVE_SYS_TTOLD_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
-
-/* Define to 1 if you have the <sys/vlimit.h> header file. */
-#undef HAVE_SYS_VLIMIT_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the `tcgetattr' function. */
-#undef HAVE_TCGETATTR
-
-/* Define to 1 if you have the `tcgetpgrp' function. */
-#undef HAVE_TCGETPGRP
-
-/* Define to 1 if you have the `tcsendbreak' function. */
-#undef HAVE_TCSENDBREAK
-
-/* Define to 1 if you have the `tcsetattr' function. */
-#undef HAVE_TCSETATTR
-
-/* Define to 1 if you have the `tcsetpgrp' function. */
-#undef HAVE_TCSETPGRP
-
-/* Define to 1 if you have the <ttyent.h> header file. */
-#undef HAVE_TTYENT_H
-
-/* Define to 1 if you have the <types.h> header file. */
-#undef HAVE_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `unlockpt' function. */
-#undef HAVE_UNLOCKPT
-
-/* Define to 1 if you have the <usersec.h> header file. */
-#undef HAVE_USERSEC_H
-
-/* Define to 1 if you have the <util.h> header file. */
-#undef HAVE_UTIL_H
-
-/* Logfile path */
-#undef LOGFILEPATH
-
-/* Hostname of console server */
-#undef MASTERHOST
-
-/* Number of consoles per child process */
-#undef MAXMEMB
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Password file path */
-#undef PASSWDFILE
-
-/* pidfile to write to */
-#undef PIDFILE
-
-/* Defined if client requires server SSL certificate */
-#undef REQ_SERVER_CERT
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* retry username without @REALM with gss-api authentication */
-#undef STRIP_REALM
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Defined if we trust reverse DNS */
-#undef TRUST_REVERSE_DNS
-
-/* Defined if we trust credentials from UDS client */
-#undef TRUST_UDS_CRED
-
-/* Directory for Unix domain sockets */
-#undef UDSDIR
-
-/* Defined to UDS credential socket option */
-#undef UDS_CRED_SO
-
-/* Defined to UDS credential structure name */
-#undef UDS_CRED_STYPE
-
-/* Defined to UDS credential structure uid field */
-#undef UDS_CRED_UID
-
-/* Defined if we produce extended messages */
-#undef USE_EXTENDED_MESSAGES
-
-/* Defined if building with IPv6 support */
-#undef USE_IPV6
-
-/* use tcp_wrappers libwrap */
-#undef USE_LIBWRAP
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Defined if we use Unix domain sockets */
-#undef USE_UNIX_DOMAIN_SOCKETS
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define if <signal.h> does not define sig_atomic_t */
-#undef sig_atomic_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t

configure.ac

@@ -29,7 +29,7 @@ AH_TEMPLATE([REQ_SERVER_CERT], [Defined if client requires server SSL certificat
 AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client])
 
 dnl ### Normal initialization. ######################################
-AC_INIT
+AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([conserver/main.c])
 AC_CONFIG_HEADER(config.h)
@@ -43,6 +43,9 @@ fi
 MKDIR="mkdir -p -m 755"
 AC_SUBST(MKDIR)
 
+AC_SUBST(CONSERVER_VERSION, m4_esyscmd_s([./gen-version number]))
+AC_SUBST(CONSERVER_DATE, m4_esyscmd_s([./gen-version date]))
+
 
 dnl ### Custom settings. ############################################
 dnl AC_MSG_CHECKING(whether to allow 64bit compilation)
@@ -413,14 +416,14 @@ AC_ARG_WITH(uds,
 			    AC_TRY_COMPILE([#include <sys/types.h>
 				    #include <sys/socket.h>],
 				    [
-struct ucred u;
+struct sockpeercred u;
 u.uid = 0;
 #if !defined(SO_PEERCRED)
 #error "no SO_PEERCRED defined"
 #endif
 				    ],
 				    [AC_MSG_RESULT(yes)
-				     AC_DEFINE(UDS_CRED_STYPE, ucred, [Defined to UDS credential structure name])
+				     AC_DEFINE(UDS_CRED_STYPE, sockpeercred, [Defined to UDS credential structure name])
 				     AC_DEFINE(UDS_CRED_UID, uid, [Defined to UDS credential structure uid field])
 				     AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
 				     AC_DEFINE(TRUST_UDS_CRED)],
@@ -428,18 +431,34 @@ u.uid = 0;
 					AC_TRY_COMPILE([#include <sys/types.h>
 						#include <sys/socket.h>],
 						[
+struct ucred u;
+u.euid = 0;
+#if !defined(SO_PEERCRED)
+#error "no SO_PEERCRED defined"
+#endif
+						],
+						[AC_MSG_RESULT(yes)
+						AC_DEFINE(UDS_CRED_STYPE, ucred, [Defined to UDS credential structure name])
+						AC_DEFINE(UDS_CRED_UID, uid, [Defined to UDS credential structure uid field])
+						AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
+						AC_DEFINE(TRUST_UDS_CRED)],
+						[
+							AC_TRY_COMPILE([#include <sys/types.h>
+								#include <sys/socket.h>],
+								[
 struct peercred_struct u;
 u.euid = 0;
 #if !defined(SO_PEERID)
 #error "no SO_PEERID defined"
 #endif
-						],
-						[AC_MSG_RESULT(yes)
-						 AC_DEFINE(UDS_CRED_STYPE, peercred_struct, [Defined to UDS credential structure name])
-						 AC_DEFINE(UDS_CRED_UID, euid, [Defined to UDS credential structure uid field])
-						 AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
-						 AC_DEFINE(TRUST_UDS_CRED)],
-						[AC_MSG_RESULT(no)])
+								],
+								[AC_MSG_RESULT(yes)
+								 AC_DEFINE(UDS_CRED_STYPE, peercred_struct, [Defined to UDS credential structure name])
+								 AC_DEFINE(UDS_CRED_UID, euid, [Defined to UDS credential structure uid field])
+								 AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
+								 AC_DEFINE(TRUST_UDS_CRED)],
+								[AC_MSG_RESULT(no)]),
+						    ])
 				    ])
 			    ;;
 			*)
@@ -535,7 +554,7 @@ AC_ARG_WITH(openssl,
 	    [LIBS="$LIBS -lssl -lcrypto"
 	    AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
 	    AC_TRY_LINK([#include <openssl/ssl.h>
-		],[SSL_library_init()],
+		],[SSL_CTX_new(NULL)],
 		[AC_MSG_RESULT(yes)
 		cons_with_openssl="YES"
 		AC_DEFINE(HAVE_OPENSSL)
@@ -593,6 +612,7 @@ AC_ARG_WITH(gssapi,
 	    [LIBS="$oLIBS -lgssapi"
 	    AC_MSG_CHECKING(for gssapi library -lgssapi)
 	    AC_TRY_LINK([#include <gssapi/gssapi.h>
+			 #include <stdio.h>
 		],[gss_create_empty_oid_set(NULL, NULL)],
 		[AC_MSG_RESULT(yes)
 		cons_with_gssapi="YES"
@@ -602,6 +622,7 @@ AC_ARG_WITH(gssapi,
 		LIBS="$oLIBS -lgssglue"
 		AC_MSG_CHECKING(for gssapi library -lgssglue)
 		AC_TRY_LINK([#include <gssapi/gssapi.h>
+			     #include <stdio.h>
 		    ],[gss_create_empty_oid_set(NULL, NULL)],
 		    [AC_MSG_RESULT(yes)
 		    cons_with_gssapi="YES"
@@ -611,6 +632,7 @@ AC_ARG_WITH(gssapi,
 		    LIBS="$oLIBS -lgss"
 		    AC_MSG_CHECKING(for gssapi library -lgss)
 		    AC_TRY_LINK([#include <gssapi/gssapi.h>
+				 #include <stdio.h>
 			],[gss_create_empty_oid_set(NULL, NULL)],
 			[AC_MSG_RESULT(yes)
 			cons_with_gssapi="YES"
@@ -828,7 +850,7 @@ AC_CHECK_HEADERS(pty.h libutil.h util.h)
 AC_CHECK_LIB(util, openpty)
 AC_CHECK_FUNCS(openpty)
 
-AC_CHECK_FUNCS(getopt strerror getrlimit getsid setsid getuserattr setgroups tcgetpgrp tcsetpgrp tcgetattr tcsetattr tcsendbreak setpgrp getutent setttyent getspnam setlinebuf setvbuf ptsname grantpt unlockpt sigaction setsockopt getdtablesize putenv memset memcpy memcmp memmove sysconf getlogin inet_aton setproctitle gettimeofday strlcpy)
+AC_CHECK_FUNCS(getopt strerror getrlimit getsid setsid getuserattr setgroups tcgetpgrp tcsetpgrp tcgetattr tcsetattr tcsendbreak setpgrp getutent setttyent getspnam setlinebuf setvbuf ptsname grantpt unlockpt sigaction setsockopt getdtablesize putenv memset memcpy memcmp memmove sysconf getlogin inet_aton setproctitle gettimeofday strlcpy closefrom)
 AC_CHECK_FUNC(strcasecmp,
 	[AC_DEFINE(HAVE_STRCASECMP, 1, [Define if strcasecmp is available])],
 	[AC_CHECK_FUNC(stricmp,
@@ -844,6 +866,7 @@ AC_CHECK_FUNCS(getaudit getaudit_addr)
 dnl ### Create output files. #######################################
 AC_CONFIG_FILES([Makefile conserver/Makefile conserver.cf/Makefile console/Makefile autologin/Makefile contrib/chat/Makefile])
 AC_CONFIG_FILES([conserver/conserver.rc], [chmod +x conserver/conserver.rc])
+AC_CONFIG_FILES([conserver.cf/conserver.cf.man conserver.cf/conserver.passwd.man conserver/conserver.man console/console.man])
 AC_OUTPUT
 
 [

conserver.cf/INSTALL

@@ -5,7 +5,3 @@ then modify extensively.  The man page for conserver.cf and conserver.passwd
 should explain the files with enough detail to get you going.
 
 That's about it.  Good luck.
-
-#
-#  $Id: INSTALL,v 1.4 2005/05/21 13:47:18 bryan Exp $
-#

conserver.cf/conserver.cf.man.in

@@ -1,5 +1,4 @@
-.\" $Id: conserver.cf.man,v 1.86 2015/06/02 17:19:31 bryan Exp $
-.TH CONSERVER.CF 5 "2015/06/02" "conserver-8.2.1" "conserver"
+.TH CONSERVER.CF 5 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
 .BR conserver (8)
@@ -687,7 +686,7 @@ character
 The resulting value must be no more than 20 characters.
 The null string (``\f3""\fP'') is the default.
 .TP
-\f3impiworkaround\fP [\f3!\fP]option[\f3,\fP...]|\f3""\fP
+\f3ipmiworkaround\fP [\f3!\fP]option[\f3,\fP...]|\f3""\fP
 .br
 You can turn off a workaround by prefixing it with a
 .RB `` ! ''

conserver.cf/conserver.passwd.man.in

@@ -1,5 +1,4 @@
-.\" $Id: conserver.passwd.man,v 1.10 2004/01/08 16:12:33 bryan Exp $
-.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.2.1" "conserver"
+.TH CONSERVER.PASSWD 5 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
 .BR conserver (8)

conserver.cf/label.ps

@@ -1,5 +1,4 @@
 %!PS-Adobe-2.0 EPSF-1.2
-%%$Id: label.ps,v 1.1 2003/11/04 02:36:26 bryan Exp $
 %%Title: RJ-11
 %%Creator: A Braunsdorf
 %%CreationDate: 

conserver.cf/test.cf

@@ -1,7 +1,5 @@
 # dummy conserver config file
 #
-# $Id: test.cf,v 1.2 2003/07/04 18:04:05 bryan Exp $
-#
 default full {
 	rw *;
 }

conserver.html

@@ -1,280 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<HTML>
-<HEAD>
-  <META name="generator" content=
-  "HTML Tidy for Solaris (vers 25 March 2009), see www.w3.org">
-  <META name="keywords" content=
-  "conserver,serial,console,serial console,unix,tty,ttya,ttyb, rs-232,rs232,bryan stansell,stansell,console server,terminal server,headless">
-  <META name="author" content=
-  "Bryan Stansell &lt;bryan@conserver.com&gt;">
-  <LINK rel="SHORTCUT ICON" href="conserver.ico">
-  <LINK rel="icon" href="conserver.ico">
-
-  <TITLE>Conserver</TITLE>
-  <STYLE type="text/css">
-body {
-  background-color: #EEEEEE;
-  color: black;
-  }
-  </STYLE>
-</HEAD>
-
-<BODY>
-  <TABLE summary="Logo" bgcolor="black" width="100%" align=
-  "center">
-    <TR>
-      <TD align="center"><IMG src="conserver.jpg" alt=
-      "Conserver"><BR></TD>
-    </TR>
-  </TABLE>
-
-  <TABLE summary="Conserver Page" width="80%" align="center">
-    <TR>
-      <TD colspan="2" align="center">Please pick your closest
-      mirror: &nbsp;&nbsp;<A href=
-      "http://planetmirror.com/pub/conserver/">Australia</A>
-      &nbsp;&nbsp;<A href=
-      "http://conserver.linux-mirror.org/">Germany</A>
-      &nbsp;&nbsp;<A href="http://conserver.rayba.co/">Germany</A>
-      &nbsp;&nbsp;<A href=
-      "http://conserver.cybermirror.org/">Germany</A>
-      &nbsp;&nbsp;<A href=
-      "http://conserver.oss-mirror.org/">Ireland</A>
-      &nbsp;&nbsp;<A href="http://conserver.shape.ws/">Malaysia</A>
-      &nbsp;&nbsp;<A href="http://conserver.rinet.ru/">Russia</A>
-      &nbsp;&nbsp;<A href="http://www.conserver.com/">US-West
-      (Primary)</A><BR>
-      <BR></TD>
-    </TR>
-
-    <TR>
-      <TD>
-      <!-- empty cell here, then search box on right spans two rows,
-     then we have the text that appears on the left, so things
-     appear in the right order so they look right in lynx
---></TD>
-
-      <TD rowspan="2" align="right">
-        <FORM method="get" action=
-        "http://www.conserver.com/cgi-bin/omega">
-          <INPUT type="hidden" name="DEFAULTOP" value="and">
-          <INPUT type="text" size="20" name="P" value="">
-          <INPUT type="submit" value="Search">
-        </FORM>
-      </TD>
-    </TR>
-
-    <TR>
-      <TD>
-        <H3>What is conserver?</H3>
-      </TD>
-    </TR>
-
-    <TR>
-      <TD colspan="2">
-        <P>From an email I once sent...</P>
-
-        <P>Conserver is an application that allows multiple users
-        to watch a serial console at the same time. It can log the
-        data, allows users to take write-access of a console (one
-        at a time), and has a variety of bells and whistles to
-        accentuate that basic functionality. The idea is that
-        conserver will log all your serial traffic so you can go
-        back and review why something crashed, look at changes (if
-        done on the console), or tie the console logs into a
-        monitoring system (just watch the logfiles it creates).
-        With multi-user capabilities you can work on equipment with
-        others, mentor, train, etc. It also does all that
-        client-server stuff so that, assuming you have a network
-        connection, you can interact with any of the equipment from
-        home or wherever.</P>
-
-        <H3>The FAQ</H3>Here's the conserver <A href="FAQ">FAQ</A>.
-        Got any additions? Let me know.
-
-        <H3>Mailing Lists</H3>
-
-        <P>There are currently two mailing lists available.
-        <A href="mailto:announce@conserver.com">announce@conserver.com</A>
-        is an announcement-only mailing list for informing of new
-        versions, major developments, etc. <A href=
-        "mailto:users@conserver.com">users@conserver.com</A> is for
-        general Q&amp;A, discussions, ideas, etc. for conserver
-        users. You can sign up by sending a message to <A href=
-        "mailto:announce-request@conserver.com">announce-request@conserver.com</A>
-        or <A href=
-        "mailto:users-request@conserver.com">users-request@conserver.com</A>
-        with a subject of "subscribe" or head over to the online
-        <A href="https://www.conserver.com/mailman/listinfo">web
-        pages</A>.</P>
-
-        <H3>Origin</H3>
-
-        <P>The console server software found here is a heavily
-        modified version originally written by <A href=
-        "http://hea-www.harvard.edu/~fine/">Tom Fine</A> (<A href=
-        "mailto:fine@head-cfa.harvard.edu">fine@head-cfa.harvard.edu</A>)
-        at <A href="http://www.ohio-state.edu/">Ohio State</A> and
-        then Kevin S Braunsdorf (<A href=
-        "mailto:ksb+conserver@sa.fedex.com">ksb+conserver@sa.fedex.com</A>)
-        at <A href="http://www.purdue.edu/">Purdue University</A>.
-        Patches from Robert Olson (<A href=
-        "mailto:olson@mcs.anl.gov">olson@mcs.anl.gov</A>) at
-        <A href="http://www.anl.gov/">Argonne National
-        Laboratory</A> were then applied to get network console
-        support.</P>
-
-        <P>Arnold de Leon (<A href=
-        "mailto:arnold@corp.webtv.net">arnold@corp.webtv.net</A>)
-        then fixed various bugs and added enhancements while at
-        <A href="http://www.synopsys.com/">Synopsys</A>. I then
-        took the result, continued fixing things, and added
-        features we found useful.</P>
-
-        <P><A href="http://www.gnac.com/">GNAC</A> (Global
-        Networking and Computing - currently <A href=
-        "http://www.certaintysolutions.com/">Certainty
-        Solutions</A>) has been supporting my coding efforts (in
-        too many ways to list) since 1996.</P>
-
-        <H3>The conserver.com Distribution</H3>
-
-        <P>The result is a combination of many people's work. This
-        version is being released in hopes that it will help
-        others. There is no warranty or support implied by the
-        distribution of the software.</P>
-
-        <P>So, what the heck is up with all the different conserver
-        versions? Well, the original authors are continuing to
-        distribute their own threads of the software so you have
-        three main threads (as far as I know). First, there's Tom
-        Fine's thread at <A href=
-        "http://hea-www.harvard.edu/~fine/Tech/console-server.html">
-        http://hea-www.harvard.edu/~fine/Tech/console-server.html</A>.
-        He isn't actively developing it, however, according to the
-        website. Next, there's Kevin Braunsdorf's version at
-        <A href=
-        "http://www.npcguild.org/software/pundits/">http://www.npcguild.org/software/pundits/</A>.
-        It doesn't look like Kevin is working on his thread ony
-        more either. No new versions have been out since August
-        2000 (version 8.5), but maybe this info will be out of date
-        by the time you read this (I last checked Feb 10, 2004).
-        Lastly, the conserver.com version is based on Kevin's
-        "5.21-Beta" distribution, but since <B>HEAVILY</B> modified
-        and enhanced (more details in the "Origin" section
-        above).</P>
-
-        <P>If I were looking for a conserver package I would
-        definitely use the conserver.com distribution. Why? It's
-        actively maintained, has many more features than the other
-        versions (see <A href="CHANGES">CHANGES</A> for a
-        semi-scary history), and has an active user community.
-        Kevin's version does have UPS support (basic serial port
-        line toggling bits) which is missing in the conserver.com
-        version, but no one has asked me for it, so does anyone
-        actually need it?</P>
-
-        <H3>Downloading</H3>
-
-        <P>The current version, released on Jun 2, 2015, is
-        <A href="8.2.1.tar.gz">8.2.1.tar.gz</A>. See the <A href=
-        "CHANGES">CHANGES</A> file for information on the latest
-        updates.</P>
-
-        <P>For those worried about legal issues, the <A href=
-        "LICENSE">LICENSE</A> file should help show it's
-        distributed under a <A href=
-        "http://www.opensource.org/licenses/bsd-license.php">BSD
-        license.</A></P>
-
-        <P>As of version 6.1.7, the packaging and numbering scheme
-        has changed. I used to package conserver as
-        conserver-GNAC-v.vv. Since <A href=
-        "http://www.gnac.com/">GNAC</A> (now <A href=
-        "http://www.certaintysolutions.com/">Certainty
-        Solutions</A>) has changed its name I've decided to drop
-        the GNAC portion and use a three-digit version number
-        (conserver-v.v.v). Why change the version numbering? I need
-        to differentiate this thread of the code from the original
-        authors' and I couldn't come up with a good replacement for
-        the GNAC name - sad, but true.</P>
-
-        <H3>Installation</H3>
-
-        <P>Check the <A href="INSTALL">INSTALL</A> file for
-        instructions.</P>
-
-        <H3>Online Documentation</H3>
-
-        <P>I've put a small set of documentation <A href=
-        "docs/">here</A>. I'm hoping to expand it over time.</P>
-
-        <H3>Systems Tested</H3>
-
-        <P>Here's a list of systems that I've been told can
-        successfully compile conserver. If anyone has more to add
-        to this list (or something on the list doesn't work any
-        more), please let me know.</P>
-
-        <UL>
-          <LI>AIX 4.3.3/5.1/5.2, native cc</LI>
-
-          <LI>BSDI BSD/OS 3.X, gcc</LI>
-
-          <LI>Cygwin (w2k),gcc 2.95.3</LI>
-
-          <LI>DEC Tru64 4.0, gcc</LI>
-
-          <LI>DEC Tru64 4.0/5.1, native cc</LI>
-
-          <LI>FreeBSD 4.x (i386) gcc</LI>
-
-          <LI>FreeBSD 5.x (i386/amd64/sparc64) gcc</LI>
-
-          <LI>FreeBSD 6.x/7.x (i386/amd64/sparc64/ia64) gcc</LI>
-
-          <LI>HP-UX 10.20, gcc</LI>
-
-          <LI>HP-UX 11.10 parisc and ia64, native cc</LI>
-
-          <LI>Irix 6.15, native cc</LI>
-
-          <LI>Linux 2.2.18 (x86), gcc</LI>
-
-          <LI>Linux 2.4.2 (x86), gcc</LI>
-
-          <LI>Linux ia64, native gcc</LI>
-
-          <LI>Linux RedHat 6.2 and 7.2 (x86), native gcc</LI>
-
-          <LI>MacOS X, native gcc</LI>
-
-          <LI>Solaris 2.5.1 thru 9 (sparc/x86), gcc</LI>
-
-          <LI>Solaris 7/8, native cc</LI>
-
-          <LI>Solaris 10 and Solaris Express (build 33) (x86), gcc
-          and native cc</LI>
-        </UL>
-
-        <H3>Other Good Information</H3>
-
-        <P>Zonker Harris has fabulous documents regarding the
-        hookup of consoles to terminal servers and other such
-        devices. His <A href="consoles/">Greater Scroll of Console
-        Knowledge</A> is a great place to start.</P>
-
-        <P>User community <A href="contrib/">contributions</A>
-        contain a variety of helpful items.</P>
-        <HR noshade>
-
-        <ADDRESS>
-          Bryan Stansell (<A href=
-          "mailto:bryan@conserver.com">bryan@conserver.com</A>)<BR>
-        </ADDRESS>
-      </TD>
-    </TR>
-  </TABLE>
-</BODY>
-</HTML>

conserver/Sun-serial

@@ -1,5 +1,3 @@
-# $Id: Sun-serial,v 1.1 2003/11/04 02:36:25 bryan Exp $
-
 If you are going to be hooking Sun consoles to your console server, you
 will run into a problem:  The sun will halt whenever the cable is unplugged.
 It will also halt when the the console server is powered off and on.  To

conserver/access.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: access.c,v 5.74 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -357,7 +355,7 @@ SetDefAccess(
 	if ((a->pcwho = StrDup(addr)) == (char *)0)
 	    OutOfMem();
 
-	a->ctrust = 'a';
+	a->ctrust = config->defaultaccess;
 	a->pACnext = pACList;
 	pACList = a;
 
@@ -370,7 +368,7 @@ SetDefAccess(
 	OutOfMem();
     if ((pACList->pcwho = StrDup("127.0.0.1")) == (char *)0)
 	OutOfMem();
-    pACList->ctrust = 'a';
+    pACList->ctrust = config->defaultaccess;
     CONDDEBUG((1, "SetDefAccess(): trust=%c, who=%s", pACList->ctrust,
 	       pACList->pcwho));
 #else
@@ -382,7 +380,7 @@ SetDefAccess(
 	    OutOfMem();
 	if ((a->pcwho = StrDup(addr)) == (char *)0)
 	    OutOfMem();
-	a->ctrust = 'a';
+	a->ctrust = config->defaultaccess;
 	a->pACnext = pACList;
 	pACList = a;
 

conserver/access.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: access.h,v 5.27 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/client.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: client.c,v 5.98 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/client.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: client.h,v 5.45 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/consent.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: consent.c,v 5.155 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -456,11 +454,19 @@ StartInit(CONSENT *pCE)
 
     /* setup new process with clean file descriptors
      */
+#if HAVE_CLOSEFROM
+    for (i = 3; i <= pout[0] || i <= pin[1]; i++) {
+	if (i != pout[0] && i != pin[1])
+	    close(i);
+    }
+    closefrom(i);
+#else
     i = GetMaxFiles();
     for ( /* i above */ ; --i > 2;) {
 	if (i != pout[0] && i != pin[1])
 	    close(i);
     }
+#endif
     /* leave 2 until we have to close it */
     close(1);
     close(0);
@@ -594,11 +600,18 @@ VirtDev(CONSENT *pCE)
 
     /* setup new process with clean filew descriptors
      */
+#if HAVE_CLOSEFROM
+    for (i = 3; i < pCE->execSlaveFD; i++)
+	close(i);
+    i++;
+    closefrom(i);
+#else
     i = GetMaxFiles();
     for ( /* i above */ ; --i > 2;) {
 	if (i != pCE->execSlaveFD)
 	    close(i);
     }
+#endif
     /* leave 2 until we *have to close it*
      */
     close(1);
@@ -686,6 +699,10 @@ ConsState(CONSENT *pCE)
 	    return "SSL_accept";
 	case INSSLSHUTDOWN:
 	    return "SSL_shutdown";
+#endif
+#if HAVE_GSSAPI
+	case INGSSACCEPT:
+	    return "GSSAPI_accept";
 #endif
 	case ISFLUSHING:
 	    return "flushing";
@@ -914,10 +931,11 @@ ConsInit(CONSENT *pCE)
 # endif
 			if (!SetFlags(cofile, O_NONBLOCK, 0))
 			    goto fail;
-			if ((ret =
-			     connect(cofile, rp->ai_addr,
-				     rp->ai_addrlen)) == 0)
-			    goto success;
+
+			ret = connect(cofile, rp->ai_addr, rp->ai_addrlen);
+			if (ret == 0 || errno == EINPROGRESS)
+				goto success;
+
 		      fail:
 			close(cofile);
 		    }

conserver/consent.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: consent.h,v 5.76 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/conserver.man.in

@@ -1,6 +1,4 @@
-.\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine
-.\" $Id: conserver.man,v 1.54 2006/12/31 02:02:48 bryan Exp $
-.TH CONSERVER 8 "2006/12/31" "conserver-8.2.1" "conserver"
+.TH CONSERVER 8 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
 .SH NAME
 conserver \- console server daemon
 .SH SYNOPSIS
@@ -422,7 +420,7 @@ output, but all consoles, not
 just those without a user, are logged.
 Each line of output is prefixed with the console name.
 If a user is attached read/write, a `*' is appended to the console name,
-to allow log watching utilites to ignore potential user-introduced alarms.
+to allow log watching utilities to ignore potential user-introduced alarms.
 .TP
 .B \-v
 Echo the configuration as it is being read (be verbose).

conserver/convert.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: convert.c,v 1.14 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/cutil.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: cutil.c,v 1.143 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -59,7 +57,9 @@ Bye(int status)
 {
     DestroyDataStructures();
 #if HAVE_OPENSSL
+# if OPENSSL_VERSION_NUMBER < 0x10100000L
     ERR_free_strings();
+# endif
 #endif
     exit(status);
 }
@@ -578,17 +578,18 @@ GetMaxFiles(void)
 #  else
 #   ifndef OPEN_MAX
 #    define OPEN_MAX 64
-#   endif /* !OPEN_MAX */
+#   endif
+    /* !OPEN_MAX */
     mf = OPEN_MAX;
-#  endif /* HAVE_GETDTABLESIZE */
-# endif	/* HAVE_GETRLIMIT */
+#  endif
+    /* HAVE_GETDTABLESIZE */
+# endif/* HAVE_GETRLIMIT */
 #endif /* HAVE_SYSCONF */
 #ifdef FD_SETSIZE
     if (FD_SETSIZE <= mf) {
 	mf = (FD_SETSIZE - 1);
     }
 #endif
-    CONDDEBUG((1, "GetMaxFiles(): maxfiles=%d", mf));
     return mf;
 }
 
@@ -888,7 +889,10 @@ FileRead(CONSFILE *cfp, void *buf, int len)
 	case simpleSocket:
 	    while (retval < 0) {
 		if ((retval = read(cfp->fd, buf, len)) <= 0) {
-		    if (retval == 0) {
+		    CONDDEBUG((2,
+			       "FileRead(): read(): fd=%d, retval=%d, errno=%d",
+			       cfp->fd, retval, errno));
+		    if (retval == 0 || errno == EIO) {
 			retval = -1;
 			break;
 		    }
@@ -1065,6 +1069,9 @@ FileWrite(CONSFILE *cfp, FLAG bufferonly, char *buf, int len)
 	case simpleSocket:
 	    while (len > 0) {
 		if ((retval = write(fdout, buf, len)) < 0) {
+		    CONDDEBUG((2,
+			       "FileWrite(): write(): fd=%d, retval=%d, errno=%d, len=%d",
+			       fdout, retval, errno, len));
 		    if (errno == EINTR)
 			continue;
 		    if (errno == EAGAIN) {
@@ -1939,7 +1946,11 @@ ProbeInterfaces(in_addr_t bindAddr)
 	if ((ifc.ifc_len - r) < sizeof(*ifr))
 	    break;
 #  ifdef HAVE_SA_LEN
+#   ifdef __FreeBSD__
+	if (sa->sa_len > sizeof(ifr->ifr_addr))
+#   else
 	if (sa->sa_len > sizeof(ifr->ifr_ifru))
+#   endif
 	    r += sizeof(ifr->ifr_name) + sa->sa_len;
 	else
 #  endif
@@ -1990,7 +2001,7 @@ ProbeInterfaces(in_addr_t bindAddr)
     }
     close(sock);
     free(ifc.ifc_req);
-# else /* use the hostname like the old code did (but use all addresses!) */
+# else/* use the hostname like the old code did (but use all addresses!) */
     int count;
     struct hostent *he;
 
@@ -2713,8 +2724,8 @@ ParseFile(char *filename, FILE *fp, int level)
 		case VALUE:
 		    switch (token) {
 			case WORD:
-			    (*sections[secIndex].items[keyIndex].
-			     reg) (word->string);
+			    (*sections[secIndex].
+			     items[keyIndex].reg) (word->string);
 			    state = SEMI;
 			    break;
 			case SEMICOLON:

conserver/cutil.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: cutil.h,v 1.70 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -9,7 +7,17 @@
 #include <stdarg.h>
 #if HAVE_OPENSSL
 # include <openssl/ssl.h>
+# include <openssl/bn.h>
+# include <openssl/dh.h>
 # include <openssl/err.h>
+# if OPENSSL_VERSION_NUMBER < 0x10100000L
+#  define TLS_method SSLv23_method
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#  define CIPHER_SEC0
+# else
+#  define CIPHER_SEC0 ":@SECLEVEL=0"
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
 #endif
 #if HAVE_GSSAPI
 # include <gssapi/gssapi.h>
@@ -94,15 +102,15 @@ typedef struct consFile {
 
 typedef struct item {
     char *id;
-    void (*reg) (char *);
+    void (*reg)(char *);
 } ITEM;
 
 typedef struct section {
     char *id;
-    void (*begin) (char *);
-    void (*end) (void);
-    void (*abort) (void);
-    void (*destroy) (void);
+    void (*begin)(char *);
+    void (*end)(void);
+    void (*abort)(void);
+    void (*destroy)(void);
     ITEM *items;
 } SECTION;
 
@@ -115,14 +123,14 @@ typedef enum substToken {
 typedef struct subst {
     /* function to retrieve a token type based on a character
      */
-    SUBSTTOKEN (*token) (char);
+    SUBSTTOKEN (*token)(char);
     /* data for callback function
      */
     void *data;
     /* function to retrieve a value (as a char* or int or both) for
      * a substitution
      */
-    int (*value) (char, char **, int *);
+    int (*value)(char, char **, int *);
 } SUBST;
 
 extern int isMultiProc, fDebug, fVerbose, fErrorPrinted;

conserver/fallback.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: fallback.c,v 5.62 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -228,7 +226,7 @@ GetPseudoTTY(STRING *slave, int *slaveFD)
 
     *slaveFD = sfd;
     return fd;
-# endif	/* (HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT) || defined(_AIX) */
+# endif/* (HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT) || defined(_AIX) */
 #endif /* HAVE_OPENPTY */
 }
 

conserver/group.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: group.c,v 5.352 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -68,6 +66,7 @@
 #include <master.h>
 #include <main.h>
 #include <version.h>
+#include <stdio.h>
 
 #if HAVE_PAM
 # include <security/pam_appl.h>
@@ -639,7 +638,7 @@ DestroyGroup(GRPENT *pGE)
 
 #if HAVE_PAM
 int
-QuietConv(int num_msg, struct pam_message **msg,
+QuietConv(int num_msg, const struct pam_message **msg,
 	  struct pam_response **resp, void *appdata_ptr)
 {
     int i;
@@ -1812,10 +1811,14 @@ StartTask(CONSENT *pCE, char *cmd, uid_t uid, gid_t gid)
 
     /* setup new process with clean file descriptors
      */
+#if HAVE_CLOSEFROM
+    closefrom(3);
+#else
     i = GetMaxFiles();
     for ( /* i above */ ; --i > 2;) {
 	close(i);
     }
+#endif
 
     if (geteuid() == 0) {
 	if (gid != 0)
@@ -1983,7 +1986,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
 	    FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length);
 	    FileSetQuoteIAC(pCL->fd, FLAGTRUE);
 	    pCL->iState = S_NORMAL;
-	    gss_release_buffer(NULL, &sendtok);
+	    gss_release_buffer(&stmin, &sendtok);
 	    BuildString((char *)0, pCL->username);
 	    BuildString((char *)0, pCL->acid);
 	    stmaj = gss_display_name(&stmin, user, &dbuf, NULL);
@@ -1993,7 +1996,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
 	    BuildStringChar('@', pCL->acid);
 	    BuildString(pCL->peername->string, pCL->acid);
 	    gss_release_name(&stmin, &user);
-	    gss_release_buffer(NULL, &dbuf);
+	    gss_release_buffer(&stmin, &dbuf);
 	    ret = 1;
 	    break;
 	case GSS_S_CREDENTIALS_EXPIRED:
@@ -4152,9 +4155,8 @@ FlushConsole(CONSENT *pCEServing)
 	    unsigned char next =
 		(unsigned char)pCEServing->wbuf->string[offset + 1];
 	    if ((next >= '0' && next <= '9') ||
-		(next >= 'a' && next <= 'z') || (next == BREAK &&
-						 pCEServing->type !=
-						 HOST)) {
+		(next >= 'a' && next <= 'z')
+		|| (next == BREAK && pCEServing->type != HOST)) {
 		CONDDEBUG((1, "Kiddie(): heavy IAC for [%s]",
 			   pCEServing->server));
 		offset += 2;
@@ -4864,8 +4866,8 @@ Kiddie(GRPENT *pGE, int sfd)
 			CONDDEBUG((1, "Kiddie(): flushing fd %d",
 				   FileFDNum(pCLServing->fd)));
 			if (FileWrite
-			    (pCLServing->fd, FLAGFALSE, (char *)0,
-			     0) < 0) {
+			    (pCLServing->fd, FLAGFALSE, (char *)0, 0)
+			    < 0) {
 			    DisconnectClient(pGE, pCLServing, (char *)0,
 					     FLAGTRUE);
 			    break;
@@ -5195,7 +5197,8 @@ Spawn(GRPENT *pGE, int msfd)
     }
 # if HAVE_SETSOCKOPT
     if (setsockopt
-	(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true)) < 0) {
+	(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true))
+	< 0) {
 	Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
 	      strerror(errno));
 	Bye(EX_OSERR);

conserver/group.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: group.h,v 5.52 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -85,3 +83,6 @@ extern void SendIWaitClientsMsg(CONSENT *, char *);
 #if HAVE_OPENSSL
 extern int AttemptSSL(CONSCLIENT *);
 #endif
+#if HAVE_GSSAPI
+extern int AttemptGSSAPI(CONSCLIENT *);
+#endif

conserver/main.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: main.c,v 5.213 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -86,12 +84,77 @@ unsigned long dmallocMarkMain = 0;
 #endif
 
 #if HAVE_OPENSSL
+# if OPENSSL_VERSION_NUMBER < 0x10100000L
+int
+DH_set0_pqg(DH *dh, BIGNUM * p, BIGNUM * q, BIGNUM * g)
+{
+    /* If the fields p and g in d are NULL, the corresponding input
+     * parameters MUST be non-NULL.  q may remain NULL.
+     */
+    if ((dh->p == NULL && p == NULL)
+	|| (dh->g == NULL && g == NULL))
+	return 0;
+
+    if (p != NULL) {
+	BN_free(dh->p);
+	dh->p = p;
+    }
+    if (q != NULL) {
+	BN_free(dh->q);
+	dh->q = q;
+    }
+    if (g != NULL) {
+	BN_free(dh->g);
+	dh->g = g;
+    }
+
+    if (q != NULL) {
+	dh->length = BN_num_bits(q);
+    }
+
+    return 1;
+}
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
 SSL_CTX *ctx = (SSL_CTX *)0;
 DH *dh512 = (DH *)0;
 DH *dh1024 = (DH *)0;
 DH *dh2048 = (DH *)0;
 DH *dh4096 = (DH *)0;
 
+DH *
+DHFromArray(unsigned char *dh_p, size_t dh_p_size, unsigned char *dh_g,
+	    size_t dh_g_size)
+{
+    DH *dh;
+    BIGNUM *p, *g;
+
+    p = BN_bin2bn(dh_p, dh_p_size, NULL);
+    if (p == NULL) {
+	return (NULL);
+    }
+
+    g = BN_bin2bn(dh_g, dh_g_size, NULL);
+    if (g == NULL) {
+	BN_free(g);
+	return (NULL);
+    }
+
+    if ((dh = DH_new()) == NULL) {
+	BN_free(p);
+	BN_free(g);
+	return (NULL);
+    }
+
+    if (!DH_set0_pqg(dh, p, NULL, g)) {
+	BN_free(p);
+	BN_free(g);
+	DH_free(dh);
+	return (NULL);
+    }
+
+    return (dh);
+}
 
 DH *
 GetDH512(void)
@@ -108,17 +171,8 @@ GetDH512(void)
     static unsigned char dh512_g[] = {
 	0x02,
     };
-    DH *dh;
 
-    if ((dh = DH_new()) == NULL)
-	return (NULL);
-    dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
-    dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
-    if ((dh->p == NULL) || (dh->g == NULL)) {
-	DH_free(dh);
-	return (NULL);
-    }
-    return (dh);
+    return DHFromArray(dh512_p, sizeof(dh512_p), dh512_g, sizeof(dh512_g));
 }
 
 DH *
@@ -142,17 +196,9 @@ GetDH1024(void)
     static unsigned char dh1024_g[] = {
 	0x02,
     };
-    DH *dh;
 
-    if ((dh = DH_new()) == NULL)
-	return (NULL);
-    dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
-    dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
-    if ((dh->p == NULL) || (dh->g == NULL)) {
-	DH_free(dh);
-	return (NULL);
-    }
-    return (dh);
+    return DHFromArray(dh1024_p, sizeof(dh1024_p), dh1024_g,
+		       sizeof(dh1024_g));
 }
 
 DH *
@@ -189,17 +235,9 @@ GetDH2048(void)
     static unsigned char dh2048_g[] = {
 	0x02,
     };
-    DH *dh;
 
-    if ((dh = DH_new()) == NULL)
-	return (NULL);
-    dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-    dh->g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-    if ((dh->p == NULL) || (dh->g == NULL)) {
-	DH_free(dh);
-	return (NULL);
-    }
-    return (dh);
+    return DHFromArray(dh2048_p, sizeof(dh2048_p), dh2048_g,
+		       sizeof(dh2048_g));
 }
 
 DH *
@@ -262,17 +300,9 @@ GetDH4096(void)
     static unsigned char dh4096_g[] = {
 	0x02,
     };
-    DH *dh;
 
-    if ((dh = DH_new()) == NULL)
-	return (NULL);
-    dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), NULL);
-    dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), NULL);
-    if ((dh->p == NULL) || (dh->g == NULL)) {
-	DH_free(dh);
-	return (NULL);
-    }
-    return (dh);
+    return DHFromArray(dh4096_p, sizeof(dh4096_p), dh4096_g,
+		       sizeof(dh4096_g));
 }
 
 DH *
@@ -306,12 +336,14 @@ SetupSSL(void)
     if (ctx == (SSL_CTX *)0) {
 	char *ciphers;
 	int verifymode;
+# if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_load_error_strings();
 	if (!SSL_library_init()) {
 	    Error("SetupSSL(): SSL_library_init() failed");
 	    Bye(EX_SOFTWARE);
 	}
-	if ((ctx = SSL_CTX_new(SSLv23_method())) == (SSL_CTX *)0) {
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
+	if ((ctx = SSL_CTX_new(TLS_method())) == (SSL_CTX *)0) {
 	    Error("SetupSSL(): SSL_CTX_new() failed");
 	    Bye(EX_SOFTWARE);
 	}
@@ -337,7 +369,7 @@ SetupSSL(void)
 	    }
 	    ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
 	} else {
-	    ciphers = "ALL:!LOW:!EXP:!MD5:@STRENGTH";
+	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
 	}
 	if (config->sslcacertificatefile != (char *)0) {
 	    STACK_OF(X509_NAME) * cert_names;
@@ -1420,6 +1452,10 @@ main(int argc, char **argv)
 #if !USE_IPV6
     ProbeInterfaces(bindAddr);
 #endif
+#if !HAVE_CLOSEFROM
+    i = GetMaxFiles();
+    CONDDEBUG((1, "main(): GetMaxFiles=%d", i));
+#endif
 
     /* initialize the timers */
     for (i = 0; i < T_MAX; i++)
@@ -1736,7 +1772,7 @@ main(int argc, char **argv)
 # if USE_IPV6
 			 config->primaryport,
 # elif USE_UNIX_DOMAIN_SOCKETS
-			 0,
+			 (unsigned short)0,
 # else
 			 bindPort,
 # endif

conserver/main.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: main.h,v 5.55 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -36,7 +34,6 @@
 
 /* program options and stuff
  */
-extern char rcsid[];
 extern int fAll, fNoinit, fInteractive, fStrip, fDaemon, fReopen,
     fNoautoreup, fSyntaxOnly;
 #if USE_IPV6

conserver/master.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: master.c,v 5.141 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -562,10 +560,13 @@ DoNormalRead(CONSCLIENT *pCLServing)
 		if (iSep >= 0) {
 		    if (config->redirect == FLAGTRUE) {
 			REMOTE *pRC;
+			char *s;
 			for (pRC = pRCUniq; (REMOTE *)0 != pRC;
 			     pRC = pRC->pRCuniq) {
-			    FilePrint(pCLServing->fd, FLAGTRUE,
-				      ":@%s" + iSep, pRC->rhost);
+			    s = ":@%s";
+			    s += iSep;
+			    FilePrint(pCLServing->fd, FLAGTRUE, s,
+				      pRC->rhost);
 			    iSep = 0;
 			}
 		    }
@@ -644,12 +645,14 @@ DoNormalRead(CONSCLIENT *pCLServing)
 		       strcmp(pcCmd, "groups") == 0) {
 		int iSep = 1;
 		GRPENT *pGE;
+		char *s;
 
 		for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
 		    if (0 == pGE->imembers)
 			continue;
-		    FilePrint(pCLServing->fd, FLAGTRUE, ":%hu" + iSep,
-			      pGE->port);
+		    s = ":%hu";
+		    s += iSep;
+		    FilePrint(pCLServing->fd, FLAGTRUE, s, pGE->port);
 		    iSep = 0;
 		}
 		FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", 2);
@@ -942,8 +945,8 @@ Master(void)
 			CONDDEBUG((1, "Master(): flushing fd %d",
 				   FileFDNum(pCLServing->fd)));
 			if (FileWrite
-			    (pCLServing->fd, FLAGFALSE, (char *)0,
-			     0) < 0) {
+			    (pCLServing->fd, FLAGFALSE, (char *)0, 0)
+			    < 0) {
 			    DropMasterClient(pCLServing, FLAGTRUE);
 			    break;
 			}

conserver/master.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: master.h,v 5.18 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/readcfg.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: readcfg.c,v 5.207 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -3118,7 +3116,7 @@ ConsoleAdd(CONSENT *c)
 	pCEmatch->logfilemax = c->logfilemax;
 	if (pCEmatch->logfilemax != (off_t) 0 &&
 	    timers[T_ROLL] == (time_t)0)
-	    timers[T_ROLL] = time((time_t)0);
+	    timers[T_ROLL] = time((time_t *)0);
 
 	SwapStr(&pCEmatch->motd, &c->motd);
 	SwapStr(&pCEmatch->idlestring, &c->idlestring);

conserver/readcfg.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: readcfg.h,v 5.51 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

conserver/version.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: version.h,v 1.82 2015/06/01 15:36:59 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -14,8 +12,9 @@
 @(#) Copyright 2000 conserver.com.\n\
 All rights reserved.\n"
 
+#define VERSION_DATE	"2020/05/01"
 #define VERSION_MAJOR	8
 #define VERSION_MINOR	2
-#define VERSION_REV	1
+#define VERSION_REV	5
 #define VERSION_TEXT	"conserver.com version"
 #define VERSION_UINT	(VERSION_MAJOR * 1000000 + VERSION_MINOR * 1000 + VERSION_REV)

console/console.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: console.c,v 5.191 2015/06/01 15:36:59 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -36,8 +34,6 @@
 #include <readconf.h>
 #include <version.h>
 #if HAVE_OPENSSL
-# include <openssl/ssl.h>
-# include <openssl/err.h>
 # include <openssl/opensslv.h>
 #endif
 #if HAVE_GSSAPI
@@ -78,12 +74,14 @@ SetupSSL(void)
 {
     if (ctx == (SSL_CTX *)0) {
 	char *ciphers;
+# if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_load_error_strings();
 	if (!SSL_library_init()) {
 	    Error("SSL library initialization failed");
 	    Bye(EX_UNAVAILABLE);
 	}
-	if ((ctx = SSL_CTX_new(SSLv23_method())) == (SSL_CTX *)0) {
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
+	if ((ctx = SSL_CTX_new(TLS_method())) == (SSL_CTX *)0) {
 	    Error("Creating SSL context failed");
 	    Bye(EX_UNAVAILABLE);
 	}
@@ -123,7 +121,7 @@ SetupSSL(void)
 # if defined(REQ_SERVER_CERT)
 	    ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
 # else
-	    ciphers = "ALL:!LOW:!EXP:!MD5:@STRENGTH";
+	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
 # endif
 	}
 	SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, SSLVerifyCallback);
@@ -912,11 +910,19 @@ ExecCmd(void)
     /* setup new process with clean file descriptors
      * stderr still goes to stderr...so user sees it
      */
-    i = GetMaxFiles();
-    for ( /* i above */ ; --i > 3;) {
+#ifdef HAVE_CLOSEFROM
+    for (i = 3; i <= pout[0] || i <= pin[1]; i++) {
 	if (i != pout[0] && i != pin[1])
 	    close(i);
     }
+    closefrom(i);
+#else
+    i = GetMaxFiles();
+    for ( /* i above */ ; --i > 2;) {
+	if (i != pout[0] && i != pin[1])
+	    close(i);
+    }
+#endif
     close(1);
     close(0);
 
@@ -1757,6 +1763,12 @@ DoCmds(char *master, char *pports, int cmdi)
 		}
 		FileWrite(pcf, FLAGFALSE, "exit\r\n", 6);
 		t = ReadReply(pcf, FLAGTRUE);
+	    } else if (interact == FLAGFALSE && result[0] == '[' &&
+		       cmdi > 0) {
+		FileClose(&pcf);
+		/* reconnect to same, but with the next command (info, examine, etc) */
+		DoCmds(master, pports, cmdi - 1);
+		break;
 	    } else {
 		/* if we're not trying to connect to a console */
 		if (interact == FLAGFALSE) {
@@ -1861,7 +1873,7 @@ DoCmds(char *master, char *pports, int cmdi)
 	FileClose(&pcf);
 
 	/* this would only be true if we got extra redirects (@... above) */
-	if (cmds[cmdi][0] == 'c' && interact == FLAGTRUE)
+	if (cmds[cmdi][0] == 'c')
 	    DoCmds(server, result, cmdi);
 	else if (cmdi > 0)
 	    DoCmds(server, result, cmdi - 1);

console/console.man.in

@@ -1,5 +1,4 @@
-.\" $Id: console.man,v 1.66 2015/06/02 17:19:31 bryan Exp $
-.TH CONSOLE 1 "2015/06/02" "conserver-8.2.1" "conserver"
+.TH CONSOLE 1 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
 .SH NAME
 console \- console server client program
 .SH SYNOPSIS

console/getpassword.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: getpassword.c,v 1.9 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

console/getpassword.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: getpassword.h,v 1.4 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

console/readconf.c

@@ -1,6 +1,4 @@
 /*
- *  $Id: readconf.c,v 5.8 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

console/readconf.h

@@ -1,6 +1,4 @@
 /*
- *  $Id: readconf.h,v 5.7 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)

contrib/README

@@ -22,7 +22,3 @@ I can't verify that these scripts will work for everyone.  Hopefully they
 will be helpful.
 
 Bryan Stansell
-
-#
-#  $Id: README,v 1.4 2003/09/29 14:29:37 bryan Exp $
-#

contrib/redhat-rpm/conserver.spec

@@ -3,8 +3,8 @@
 # platform that doesn't have red hat rpm >= 4.0.2 installed.
 #
 
-%define pkg  conserver
-%define ver  8.2.1
+%define pkg conserver
+%define ver 
 
 # define the name of the machine on which the main conserver
 # daemon will be running if you don't want to use the default

contrib/solaris-package/pkginfo

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

gen-version

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+# awk gets stdin from /dev/null 'cause when autoconf runs this via m4_esyscmd_s,
+# stdin is closed and awk assumes there will always be an open stdin and you end
+# up with a bogus message:
+#
+#   awk: i/o error occurred while closing /dev/stdin
+#    input record number 20, file conserver/version.h
+#    source line number 1
+#
+#
+case "$1" in
+    number)
+	awk '$2=="VERSION_MAJOR"{maj=$NF} $2=="VERSION_MINOR"{min=$NF} $2=="VERSION_REV"{rev=$NF} END{print maj "." min "." rev}' conserver/version.h < /dev/null
+	;;
+
+    date)
+	awk '$2=="VERSION_DATE"{print $NF}' conserver/version.h < /dev/null | tr -d '"'
+	;;
+esac

package/README.md

@@ -0,0 +1,26 @@
+Testing Locally
+---------------
+
+You can run `./package/make-and-stage-release local` and the current code will be
+packaged into `./build` so anyone can configure and build code in a confined space.
+
+Creating a new release
+----------------------
+
+- Create a new release branch `git checkout -b release-vx.y.z`
+- Edit `conserver/version.h`
+- Update `CHANGES` with output of `./package/create-changes vx.y.z..`
+- Double-check and merge release branch
+- Run `GITHUB_TOKEN=xxxx ./package/make-and-stage-release` to tag release, create distribution, pgp sign, and push to github
+
+Requirements:
+
+- autoconf
+- githubrelease (pypi)
+- gpg
+
+Publishing a release
+--------------------
+
+- Use github to promote from draft or use the command output from `make-and-stage-release`
+- Send announcement on mailing lists

package/create-changes

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+[ -z "$1" ] && echo "Usage: $0 tag" && exit 1
+range="$1"
+date=`./gen-version date`
+changedate=`date -j -f '%Y/%m/%d' "$date" '+%B %-d, %Y'`
+echo "version `./gen-version number` ($changedate):"
+git log --no-merges --pretty=tformat:'        - %s (%an <%ae>)' "$range" | tail -r | awk '{if (! l[$0]) {l[$0]++; print}}' | sed -e 's/ *(Bryan Stansell <bryan@conserver.com>)$//'

package/make-and-stage-release

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+set -e
+
+case $(sed --help 2>&1) in
+  *GNU*) sed_i () { sed -i "$@"; };;
+  *) sed_i () { sed -i '' "$@"; };;
+esac
+
+local=false && [ "$1" = "local" ] && local=true
+
+[ -f conserver/version.h ] || { echo "you are in the wrong place" ; exit 1; }
+
+ver=`./gen-version number`
+
+if ! $local; then
+    echo "Ready to tag release v$ver (y/N)?"
+    read i
+    if [ "$i" = "y" ]; then
+	echo "Adding git tag v$ver"
+	git tag -a -m "Release $ver" v$ver
+    fi
+fi
+
+if [ ! -f ../conserver-$ver.tar.gz ] || $local; then
+    (
+	[ -d build ] && rm -rf build
+        mkdir build
+	archtag=v$ver
+	$local && archtag=HEAD
+	git archive --format=tar.gz --prefix=conserver-$ver/ $archtag | (cd build; tar zxf -)
+	cd build/conserver-$ver
+	../../package/setup-configure
+	rm -rf package
+	sed_i -e "/^%define ver/s| ver.*| ver $ver|" contrib/redhat-rpm/conserver.spec
+	sed_i -e "/^VERSION=/s|.*|VERSION=\"$ver\"|" contrib/solaris-package/pkginfo
+    )
+    $local && exit
+    echo "Creating ../conserver-$ver.tar.gz"
+    tar zcf ../conserver-$ver.tar.gz -C build conserver-$ver
+    rm -rf build
+
+    [ -f ../conserver-$ver.tar.gz.asc ] && rm ../conserver-$ver.tar.gz.asc
+fi
+if [ ! -f ../conserver-$ver.tar.gz.asc ]; then
+    echo "Signing ../conserver-$ver.tar.gz"
+    gpg -ab --local-user bryan@conserver.com ../conserver-$ver.tar.gz
+fi
+body="\`\`\`
+`sed -ne '/^ver/,/^$/p' CHANGES | sed -e '/^$/,$d'`
+\`\`\`"
+
+ls -l ../conserver-$ver.tar.gz*
+echo "Ready to push (y/N)?"
+read i
+if [ "$i" = "y" ]; then
+    git push --tags
+    githubrelease release conserver/conserver create --name conserver-$ver --body "$body" v$ver ../conserver-$ver.tar.gz* 
+    echo You can publish this release on the website or with:
+    echo "    "githubrelease release conserver/conserver publish v$ver
+else
+    echo Ok, here is the command I would have used:
+    echo "    "git push --tags
+    echo "    "githubrelease release conserver/conserver create --name conserver-$ver --body \""$body"\" v$ver ../conserver-$ver.tar.gz* 
+fi

package/run-gindent

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+gindent -npro -i4 -ip4 -cli4 -br -brs -cdw -ce -npcs -ncs -nhnl -l75 -lc75 -nbbo -ppi1 `
+ echo -T SOCKADDR_STYPE
+ echo -T INADDR_STYPE
+ echo -T time_t
+ echo -T X509_STORE_CTX
+ echo -T FILE
+ echo -T SSL
+ echo -T fd_set
+ echo -T pam_handle_t
+ echo -T SSL_CTX
+ echo -T DH
+ sed -ne '/typedef/,/}/p' */*.[ch] | grep '^[ 	]*}' | sed -e 's/[ 	]*}/-T/' -e 's/;//' | sort -u
+ ` */*.[ch]

package/setup-configure

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+curl -s -o config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess'
+curl -s -o config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub'
+
+grep ^timestamp config.guess >/dev/null 2>&1 || cp package/config.guess .
+grep ^timestamp config.sub >/dev/null 2>&1 || cp package/config.sub .
+
+# We set lang to avoid this with the gcc docker image on cirrus:
+# 
+#   ./package/setup-configure
+#   perl: warning: Setting locale failed.
+#   perl: warning: Please check that your locale settings:
+#   	LANGUAGE = (unset),
+#   	LC_ALL = (unset),
+#   	LANG = "en_US.UTF-8"
+#       are supported and installed on your system.
+
+LANG=C autoreconf