mirror of
https://github.com/bstansell/conserver.git
synced 2025-04-23 18:13:36 +00:00
Compare commits
No commits in common. "master" and "v8.2.1" have entirely different histories.
48
.cirrus.yml
48
.cirrus.yml
@ -1,48 +0,0 @@
|
|||||||
env:
|
|
||||||
CIRRUS_CLONE_DEPTH: 1
|
|
||||||
|
|
||||||
freebsd_13_task:
|
|
||||||
freebsd_instance:
|
|
||||||
image_family: freebsd-13-3
|
|
||||||
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
|
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
*.[ch]~
|
|
||||||
4
FAQ
4
FAQ
@ -184,3 +184,7 @@ directed to faq@conserver.com. The FAQ answers the following questions:
|
|||||||
- Have you tried a search on the conserver site (it searches
|
- Have you tried a search on the conserver site (it searches
|
||||||
mailing list traffic as well) to see if someone else has gone
|
mailing list traffic as well) to see if someone else has gone
|
||||||
through the same problem?
|
through the same problem?
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: FAQ,v 1.9 2003/08/23 19:27:10 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
16
INSTALL
16
INSTALL
@ -256,6 +256,17 @@ Detailed Instructions
|
|||||||
|
|
||||||
Other Information And Gotchas
|
Other Information And Gotchas
|
||||||
|
|
||||||
|
- Debian Linux Distribution
|
||||||
|
|
||||||
|
The Debian folks have conserver distributed with the package
|
||||||
|
names of conserver-client and conserver-server. They are in
|
||||||
|
the distribution "sid" and the "non-free" part (because the
|
||||||
|
Ohio State license doesn't explicitly allow for modification to
|
||||||
|
the code, even though it's totally implied and the intention of
|
||||||
|
the author - I've even got proof in email! Oh well, can't
|
||||||
|
blame the Debian folks for being cautious - they've been burned
|
||||||
|
before, apparently).
|
||||||
|
|
||||||
- Potential GCC bug
|
- Potential GCC bug
|
||||||
|
|
||||||
Adam Morris <AMorris@providence.org> reported a problem with
|
Adam Morris <AMorris@providence.org> reported a problem with
|
||||||
@ -275,3 +286,8 @@ Other Information And Gotchas
|
|||||||
connecting to servers, you might be tickling this bug and you
|
connecting to servers, you might be tickling this bug and you
|
||||||
can upgrade the compiler, turn off the optimization, or apply
|
can upgrade the compiler, turn off the optimization, or apply
|
||||||
this code change.
|
this code change.
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: INSTALL,v 1.41 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
126
LICENSE
126
LICENSE
@ -1,29 +1,115 @@
|
|||||||
BSD 3-Clause License
|
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
|
Copyright (c) 2000, conserver.com
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
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
|
- Redistributions of source code must retain the above copyright notice,
|
||||||
list of conditions and the following disclaimer.
|
this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice,
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
this list of conditions and the following disclaimer in the documentation
|
notice, this list of conditions and the following disclaimer in the
|
||||||
and/or other materials provided with the distribution.
|
documentation and/or other materials provided with the
|
||||||
|
distribution.
|
||||||
|
|
||||||
* Neither the name of the copyright holder nor the names of its
|
- Neither the name of conserver.com nor the names of its contributors
|
||||||
contributors may be used to endorse or promote products derived from
|
may be used to endorse or promote products derived from this
|
||||||
this software without specific prior written permission.
|
software without specific prior written permission.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
||||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
|
||||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
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.
|
||||||
|
|
||||||
|
----------------------------------------------------------------------------
|
||||||
|
|||||||
115
LICENSES
115
LICENSES
@ -1,115 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
104
LICENSES.md
104
LICENSES.md
@ -1,104 +0,0 @@
|
|||||||
License Clarification
|
|
||||||
=====================
|
|
||||||
|
|
||||||
The licenses attached to this software ([LICENSES](LICENSES)) are supposed
|
|
||||||
to paint a simple concept: that this software was built for the open source
|
|
||||||
community and they result in a license compatible with [LICENSE](LICENSE).
|
|
||||||
|
|
||||||
Unfortunately, the real world steps in and troubles can arise. This note
|
|
||||||
has been moved over from the [INSTALL](INSTALL) file:
|
|
||||||
|
|
||||||
The Debian folks have conserver distributed with the package
|
|
||||||
names of conserver-client and conserver-server. They are in
|
|
||||||
the distribution "sid" and the "non-free" part (because the
|
|
||||||
Ohio State license doesn't explicitly allow for modification to
|
|
||||||
the code, even though it's totally implied and the intention of
|
|
||||||
the author - I've even got proof in email! Oh well, can't
|
|
||||||
blame the Debian folks for being cautious - they've been burned
|
|
||||||
before, apparently).
|
|
||||||
|
|
||||||
Here's a copy of the message I exchanged with Thomas A. Fine (original
|
|
||||||
author at OSU) in 2001 that is referenced above:
|
|
||||||
|
|
||||||
Date: Wed, 27 Jun 2001 19:47:18 -0400 (EDT)
|
|
||||||
To: bryan@conserver.com
|
|
||||||
From: "Thomas A. Fine" <fine@head-cfa.harvard.edu>
|
|
||||||
Subject: Re: A conserver license question...
|
|
||||||
|
|
||||||
> Hi Tom,
|
|
||||||
>
|
|
||||||
> I had a little "problem" crop up that I was hoping you could help me
|
|
||||||
> with. A guy out in net-land is trying to put a debian package together
|
|
||||||
> of the code I've been releasing (based on your original work) and they
|
|
||||||
> don't like part of the Ohio State license. I've attached the message
|
|
||||||
> below.
|
|
||||||
>
|
|
||||||
> I'm not sure what can be done. One thought was a message from you that
|
|
||||||
> I could put with the code stating that modifications are ok would
|
|
||||||
> work. Or maybe just modifying the original license statement. Heck, I
|
|
||||||
> don't even know if either are 100% legal. Maybe I need to talk to
|
|
||||||
> someone at Ohio State.
|
|
||||||
>
|
|
||||||
> Well, if you have any ideas or suggestions, please let me know. Don't
|
|
||||||
> know if I ever got a chance to thank you for the great stuff you
|
|
||||||
> started! Thank you! ;-)
|
|
||||||
|
|
||||||
Well, if I knew then what I know now, I would have copyrighted it
|
|
||||||
under my own name, and not under OSU, and then I could change it.
|
|
||||||
Since I don't work there anymore, strictly speaking, I can't change
|
|
||||||
it.
|
|
||||||
|
|
||||||
However, IMHO, this license allows modifications, without explicitly
|
|
||||||
stating it. I can state without a doubt that this was my intention
|
|
||||||
at the time (and hence, OSU's intention, since I put in the copyright
|
|
||||||
while working for OSU).
|
|
||||||
|
|
||||||
But also, since it allows use of the source, and since the statement
|
|
||||||
required for inclusion says "includes software ..." it seems pretty
|
|
||||||
clear that modification was both allowed and expected. You can't
|
|
||||||
really use sources if you aren't changing them, and you certainly
|
|
||||||
can't include this software in some other product without making
|
|
||||||
modifications.
|
|
||||||
|
|
||||||
As I recall, I more or less used the copyright that Berkeley was using
|
|
||||||
back then for there BSD-related software, so I'm surprised there's a
|
|
||||||
problem with it.
|
|
||||||
|
|
||||||
I have to point out that version 1.2, available at
|
|
||||||
http://hea-www.harvard.edu/~fine/Tech/cs1.2/
|
|
||||||
is distributed entirely without copyright notices. Interesting, no?
|
|
||||||
So I guess I could add a copyright notice to that. But would I then
|
|
||||||
be violating the OSU copyright that I wrote for 1.1? Since it is
|
|
||||||
a different version, I could probably write a new copyright notice
|
|
||||||
and license and be free and clear.
|
|
||||||
|
|
||||||
There's also Purdue's versions of the software. It's mentioned on my
|
|
||||||
console server web page at
|
|
||||||
http://hea-www.harvard.edu/~fine/Tech/console-server.html
|
|
||||||
|
|
||||||
So, pass this on to the people you're working with and let me know how
|
|
||||||
you want to proceed.
|
|
||||||
|
|
||||||
tom
|
|
||||||
|
|
||||||
In addition, a post to the Conserver Users mailing list in May 2020 contained:
|
|
||||||
|
|
||||||
From: Paul Wise via users <users@conserver.com>
|
|
||||||
To: users@conserver.com
|
|
||||||
Subject: Re: license change?
|
|
||||||
Date: Mon, 25 May 2020 12:42:28 +0800
|
|
||||||
|
|
||||||
On Thu, 2019-07-04 at 10:20 +0200, Bryan Stansell via users wrote:
|
|
||||||
> So, it's more the lack of explicitly stating the code can be
|
|
||||||
> modified.
|
|
||||||
|
|
||||||
Since then I talked to one of RedHat's lawyers and they mentioned that
|
|
||||||
they have dealt with this problem too and also concluded that these
|
|
||||||
licenses were intended to cover modification. The current wording of
|
|
||||||
the initial part of the BSD license reflects an attempt to correct an
|
|
||||||
earlier mistake (i.e. someone pointed out the error and Berkeley added
|
|
||||||
"with or without modification"). Also the anti-endorsement clause
|
|
||||||
implies a right to modify.
|
|
||||||
|
|
||||||
Hopefully corporations (or, I suppose, their lawyers) will be happy with the
|
|
||||||
explanation above and become comfortable with the stated license.
|
|
||||||
6
PROTOCOL
6
PROTOCOL
@ -7,7 +7,7 @@ What Is This?
|
|||||||
|
|
||||||
The following is an attempt to describe the client/server protocol used
|
The following is an attempt to describe the client/server protocol used
|
||||||
between the server (conserver) and the client (console). This document
|
between the server (conserver) and the client (console). This document
|
||||||
bases its information on conserver version 8.1.4, as it's the release
|
bases it's information on conserver version 8.1.4, as it's the release
|
||||||
currently available. If there are changes to the client/server
|
currently available. If there are changes to the client/server
|
||||||
protocol, the INSTALL file should reference them and, ideally, this
|
protocol, the INSTALL file should reference them and, ideally, this
|
||||||
document will be updated.
|
document will be updated.
|
||||||
@ -300,3 +300,7 @@ The more "interesting" escape sequences are the following.
|
|||||||
" -- attached (nologging)]"
|
" -- attached (nologging)]"
|
||||||
" -- attached]"
|
" -- attached]"
|
||||||
" -- spy mode]"
|
" -- spy mode]"
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: PROTOCOL,v 1.2 2005/09/05 21:54:03 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
70
README
Normal file
70
README
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
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 $
|
||||||
|
#
|
||||||
35
README.md
35
README.md
@ -1,35 +0,0 @@
|
|||||||
Conserver
|
|
||||||
=========
|
|
||||||
|
|
||||||
[](https://cirrus-ci.com/github/bstansell/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/bstansell/conserver/releases).
|
|
||||||
|
|
||||||
|
|
||||||
Contributions
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Contributions distributed with the code can be found in the `contrib`
|
|
||||||
subdirectory.
|
|
||||||
4
TODO
4
TODO
@ -106,3 +106,7 @@ Bryan Stansell
|
|||||||
|
|
||||||
- quick-recheck of down consoles (for uds) and possibly only log state
|
- quick-recheck of down consoles (for uds) and possibly only log state
|
||||||
changes (instead of each try) : DJ Gregor <dj@gregor.com>
|
changes (instead of each try) : DJ Gregor <dj@gregor.com>
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: TODO,v 1.56 2006/04/03 22:20:34 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
theme: jekyll-theme-cayman
|
|
||||||
@ -1,3 +1,5 @@
|
|||||||
|
# $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
|
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
|
console of the machine (either through the console server or via the physical
|
||||||
world).
|
world).
|
||||||
|
|||||||
@ -15,3 +15,7 @@ No one I've ever talked to found a need for something like autologin.
|
|||||||
Good luck.
|
Good luck.
|
||||||
|
|
||||||
Bryan Stansell
|
Bryan Stansell
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: README,v 1.2 2002/09/23 21:08:42 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
# $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.
|
This program can be used to put a root shell on the console at boot time.
|
||||||
See the manual page.
|
See the manual page.
|
||||||
|
|
||||||
|
|||||||
@ -68,6 +68,9 @@
|
|||||||
* Global variables
|
* 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;
|
extern char *progname;
|
||||||
gid_t awGrps[NGROUPS_MAX];
|
gid_t awGrps[NGROUPS_MAX];
|
||||||
int iGrps = 0;
|
int iGrps = 0;
|
||||||
@ -206,13 +209,9 @@ Process(void)
|
|||||||
|
|
||||||
/* Close open files
|
/* Close open files
|
||||||
*/
|
*/
|
||||||
#if HAVE_CLOSEFROM
|
|
||||||
closefrom((char *)0 == pcTty ? 3 : 0);
|
|
||||||
#else
|
|
||||||
for (i = (char *)0 == pcTty ? 3 : 0; i < getdtablesize(); ++i) {
|
for (i = (char *)0 == pcTty ? 3 : 0; i < getdtablesize(); ++i) {
|
||||||
(void)close(i);
|
(void)close(i);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Make us a session leader so that when we open /dev/tty
|
/* Make us a session leader so that when we open /dev/tty
|
||||||
* it will become our controlling terminal.
|
* it will become our controlling terminal.
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
# mkcmd parser for autologin program
|
# 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" {
|
integer variable "iErrs" {
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
.\" $Id: autologin.man,v 1.2 2004/03/23 18:32:06 bryan Exp $
|
||||||
.TH AUTOLOGIN 8L PUCC
|
.TH AUTOLOGIN 8L PUCC
|
||||||
.SH NAME
|
.SH NAME
|
||||||
autologin \- create an automatic login session from /etc/inittab
|
autologin \- create an automatic login session from /etc/inittab
|
||||||
|
|||||||
@ -81,23 +81,23 @@ getopt(int nargc, char **nargv, char *ostr)
|
|||||||
#endif /* ! HAVE_GETOPT */
|
#endif /* ! HAVE_GETOPT */
|
||||||
|
|
||||||
char
|
char
|
||||||
*progname = "", *au_terse[] = {
|
*progname =
|
||||||
|
"$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $", *au_terse[] = {
|
||||||
" [-u] [-c cmd] [-e env=value] [-g group] [-l login] [-t tty]",
|
" [-u] [-c cmd] [-e env=value] [-g group] [-l login] [-t tty]",
|
||||||
" -h",
|
" -h",
|
||||||
" -V",
|
" -V",
|
||||||
(char *)0
|
(char *)0
|
||||||
}, *u_help[] = {
|
}, *u_help[] = {
|
||||||
|
"c cmd command to run",
|
||||||
"c cmd command to run",
|
"e env=value environment variable to set",
|
||||||
"e env=value environment variable to set",
|
"g group initial group",
|
||||||
"g group initial group",
|
"h print this help message",
|
||||||
"h print this help message",
|
"l login login name",
|
||||||
"l login login name",
|
"t tty attach to this terminal",
|
||||||
"t tty attach to this terminal",
|
"u do no make utmp entry",
|
||||||
"u do no make utmp entry",
|
"V show version information", (char *)0}, *pcCommand =
|
||||||
"V show version information", (char *)0
|
(char *)0, *pcGroup = (char *)0, *pcLogin = (char *)0, *pcTty =
|
||||||
}, *pcCommand = (char *)0, *pcGroup = (char *)0, *pcLogin =
|
(char *)0;
|
||||||
(char *)0, *pcTty = (char *)0;
|
|
||||||
int
|
int
|
||||||
fMakeUtmp = 1, iErrs = 0;
|
fMakeUtmp = 1, iErrs = 0;
|
||||||
|
|
||||||
@ -105,6 +105,8 @@ int
|
|||||||
# define u_terse (au_terse[0])
|
# define u_terse (au_terse[0])
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static char *rcsid = "$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* parser
|
* parser
|
||||||
*/
|
*/
|
||||||
@ -172,7 +174,7 @@ main(int argc, char **argv)
|
|||||||
fMakeUtmp = 0;
|
fMakeUtmp = 0;
|
||||||
continue;
|
continue;
|
||||||
case 'V':
|
case 'V':
|
||||||
printf("%s\n", progname);
|
printf("%s: %s\n", progname, rcsid);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
1329
package/config.guess → config.guess
vendored
Normal file → Executable file
1329
package/config.guess → config.guess
vendored
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
429
config.h.in
Normal file
429
config.h.in
Normal file
@ -0,0 +1,429 @@
|
|||||||
|
/* 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
|
||||||
1658
config.sub
vendored
Executable file
1658
config.sub
vendored
Executable file
File diff suppressed because it is too large
Load Diff
@ -29,12 +29,12 @@ 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])
|
AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client])
|
||||||
|
|
||||||
dnl ### Normal initialization. ######################################
|
dnl ### Normal initialization. ######################################
|
||||||
AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
|
AC_INIT
|
||||||
AC_PREREQ(2.69)
|
AC_PREREQ(2.59)
|
||||||
AC_CONFIG_SRCDIR([conserver/main.c])
|
AC_CONFIG_SRCDIR([conserver/main.c])
|
||||||
AC_CONFIG_HEADER(config.h)
|
AC_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $*")
|
AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $@")
|
||||||
|
|
||||||
dnl ### Set some option defaults. ###################################
|
dnl ### Set some option defaults. ###################################
|
||||||
if test -z "$CFLAGS"; then
|
if test -z "$CFLAGS"; then
|
||||||
@ -43,9 +43,6 @@ fi
|
|||||||
MKDIR="mkdir -p -m 755"
|
MKDIR="mkdir -p -m 755"
|
||||||
AC_SUBST(MKDIR)
|
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 ### Custom settings. ############################################
|
||||||
dnl AC_MSG_CHECKING(whether to allow 64bit compilation)
|
dnl AC_MSG_CHECKING(whether to allow 64bit compilation)
|
||||||
@ -416,14 +413,14 @@ AC_ARG_WITH(uds,
|
|||||||
AC_TRY_COMPILE([#include <sys/types.h>
|
AC_TRY_COMPILE([#include <sys/types.h>
|
||||||
#include <sys/socket.h>],
|
#include <sys/socket.h>],
|
||||||
[
|
[
|
||||||
struct sockpeercred u;
|
struct ucred u;
|
||||||
u.uid = 0;
|
u.uid = 0;
|
||||||
#if !defined(SO_PEERCRED)
|
#if !defined(SO_PEERCRED)
|
||||||
#error "no SO_PEERCRED defined"
|
#error "no SO_PEERCRED defined"
|
||||||
#endif
|
#endif
|
||||||
],
|
],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(UDS_CRED_STYPE, sockpeercred, [Defined to UDS credential structure name])
|
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_UID, uid, [Defined to UDS credential structure uid field])
|
||||||
AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
|
AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
|
||||||
AC_DEFINE(TRUST_UDS_CRED)],
|
AC_DEFINE(TRUST_UDS_CRED)],
|
||||||
@ -431,34 +428,18 @@ u.uid = 0;
|
|||||||
AC_TRY_COMPILE([#include <sys/types.h>
|
AC_TRY_COMPILE([#include <sys/types.h>
|
||||||
#include <sys/socket.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;
|
struct peercred_struct u;
|
||||||
u.euid = 0;
|
u.euid = 0;
|
||||||
#if !defined(SO_PEERID)
|
#if !defined(SO_PEERID)
|
||||||
#error "no SO_PEERID defined"
|
#error "no SO_PEERID defined"
|
||||||
#endif
|
#endif
|
||||||
],
|
],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(UDS_CRED_STYPE, peercred_struct, [Defined to UDS credential structure name])
|
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_UID, euid, [Defined to UDS credential structure uid field])
|
||||||
AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
|
AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
|
||||||
AC_DEFINE(TRUST_UDS_CRED)],
|
AC_DEFINE(TRUST_UDS_CRED)],
|
||||||
[AC_MSG_RESULT(no)]),
|
[AC_MSG_RESULT(no)])
|
||||||
])
|
|
||||||
])
|
])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -554,7 +535,7 @@ AC_ARG_WITH(openssl,
|
|||||||
[LIBS="$LIBS -lssl -lcrypto"
|
[LIBS="$LIBS -lssl -lcrypto"
|
||||||
AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
|
AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
|
||||||
AC_TRY_LINK([#include <openssl/ssl.h>
|
AC_TRY_LINK([#include <openssl/ssl.h>
|
||||||
],[SSL_CTX_new(NULL)],
|
],[SSL_library_init()],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
cons_with_openssl="YES"
|
cons_with_openssl="YES"
|
||||||
AC_DEFINE(HAVE_OPENSSL)
|
AC_DEFINE(HAVE_OPENSSL)
|
||||||
@ -612,7 +593,6 @@ AC_ARG_WITH(gssapi,
|
|||||||
[LIBS="$oLIBS -lgssapi"
|
[LIBS="$oLIBS -lgssapi"
|
||||||
AC_MSG_CHECKING(for gssapi library -lgssapi)
|
AC_MSG_CHECKING(for gssapi library -lgssapi)
|
||||||
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
||||||
#include <stdio.h>
|
|
||||||
],[gss_create_empty_oid_set(NULL, NULL)],
|
],[gss_create_empty_oid_set(NULL, NULL)],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
cons_with_gssapi="YES"
|
cons_with_gssapi="YES"
|
||||||
@ -622,7 +602,6 @@ AC_ARG_WITH(gssapi,
|
|||||||
LIBS="$oLIBS -lgssglue"
|
LIBS="$oLIBS -lgssglue"
|
||||||
AC_MSG_CHECKING(for gssapi library -lgssglue)
|
AC_MSG_CHECKING(for gssapi library -lgssglue)
|
||||||
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
||||||
#include <stdio.h>
|
|
||||||
],[gss_create_empty_oid_set(NULL, NULL)],
|
],[gss_create_empty_oid_set(NULL, NULL)],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
cons_with_gssapi="YES"
|
cons_with_gssapi="YES"
|
||||||
@ -632,23 +611,12 @@ AC_ARG_WITH(gssapi,
|
|||||||
LIBS="$oLIBS -lgss"
|
LIBS="$oLIBS -lgss"
|
||||||
AC_MSG_CHECKING(for gssapi library -lgss)
|
AC_MSG_CHECKING(for gssapi library -lgss)
|
||||||
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
||||||
#include <stdio.h>
|
|
||||||
],[gss_create_empty_oid_set(NULL, NULL)],
|
],[gss_create_empty_oid_set(NULL, NULL)],
|
||||||
[AC_MSG_RESULT(yes)
|
[AC_MSG_RESULT(yes)
|
||||||
cons_with_gssapi="YES"
|
cons_with_gssapi="YES"
|
||||||
AC_DEFINE(HAVE_GSSAPI)
|
AC_DEFINE(HAVE_GSSAPI)
|
||||||
have_gssapi=yes],
|
have_gssapi=yes],
|
||||||
[AC_MSG_RESULT(no)
|
[AC_MSG_RESULT(no)])])])],)
|
||||||
LIBS="$oLIBS -lgssapi_krb5"
|
|
||||||
AC_MSG_CHECKING(for gssapi library -lgssapi_krb5)
|
|
||||||
AC_TRY_LINK([#include <gssapi/gssapi.h>
|
|
||||||
],[gss_create_empty_oid_set(NULL, NULL)],
|
|
||||||
[AC_MSG_RESULT(yes)
|
|
||||||
cons_with_gssapi="YES"
|
|
||||||
AC_DEFINE(HAVE_GSSAPI)
|
|
||||||
have_gssapi=yes],
|
|
||||||
[AC_MSG_RESULT(no)])])])])],)
|
|
||||||
|
|
||||||
|
|
||||||
if test $have_gssapi = no; then
|
if test $have_gssapi = no; then
|
||||||
LIBS="$oLIBS"
|
LIBS="$oLIBS"
|
||||||
@ -860,7 +828,7 @@ AC_CHECK_HEADERS(pty.h libutil.h util.h)
|
|||||||
AC_CHECK_LIB(util, openpty)
|
AC_CHECK_LIB(util, openpty)
|
||||||
AC_CHECK_FUNCS(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 closefrom nanosleep)
|
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_FUNC(strcasecmp,
|
AC_CHECK_FUNC(strcasecmp,
|
||||||
[AC_DEFINE(HAVE_STRCASECMP, 1, [Define if strcasecmp is available])],
|
[AC_DEFINE(HAVE_STRCASECMP, 1, [Define if strcasecmp is available])],
|
||||||
[AC_CHECK_FUNC(stricmp,
|
[AC_CHECK_FUNC(stricmp,
|
||||||
@ -876,7 +844,6 @@ AC_CHECK_FUNCS(getaudit getaudit_addr)
|
|||||||
dnl ### Create output files. #######################################
|
dnl ### Create output files. #######################################
|
||||||
AC_CONFIG_FILES([Makefile conserver/Makefile conserver.cf/Makefile console/Makefile autologin/Makefile contrib/chat/Makefile])
|
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/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
|
AC_OUTPUT
|
||||||
|
|
||||||
[
|
[
|
||||||
@ -5,3 +5,7 @@ then modify extensively. The man page for conserver.cf and conserver.passwd
|
|||||||
should explain the files with enough detail to get you going.
|
should explain the files with enough detail to get you going.
|
||||||
|
|
||||||
That's about it. Good luck.
|
That's about it. Good luck.
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: INSTALL,v 1.4 2005/05/21 13:47:18 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
.TH CONSERVER.CF 5 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
|
.\" $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"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
conserver.cf \- console configuration file for
|
conserver.cf \- console configuration file for
|
||||||
.BR conserver (8)
|
.BR conserver (8)
|
||||||
@ -385,14 +386,11 @@ Turn redirection on or off (see the
|
|||||||
.B \-R
|
.B \-R
|
||||||
command-line flag).
|
command-line flag).
|
||||||
.TP
|
.TP
|
||||||
\f3reinitcheck\fP \f2number\fP[\f3s\fP|\f3m\fP]
|
\f3reinitcheck\fP \f2number\fP
|
||||||
.br
|
.br
|
||||||
Set the number of minutes used between reinitialization checks (see the
|
Set the number of minutes used between reinitialization checks (see the
|
||||||
.B \-O
|
.B \-O
|
||||||
command-line flag).
|
command-line flag).
|
||||||
If an `s' or `m' is used after
|
|
||||||
.IR number ,
|
|
||||||
the specified time is interpreted as seconds or minutes.
|
|
||||||
.TP
|
.TP
|
||||||
\f3secondaryport\fP \f2number\fP|\f2name\fP
|
\f3secondaryport\fP \f2number\fP|\f2name\fP
|
||||||
.br
|
.br
|
||||||
@ -471,7 +469,7 @@ all consoles have an implicit ``include "*";'' at the beginning
|
|||||||
of their definition).
|
of their definition).
|
||||||
.RS
|
.RS
|
||||||
.TP
|
.TP
|
||||||
\f3baud\fP \f3300\fP|\f3600\fP|\f31800\fP|\f32400\fP|\f34800\fP|\f39600\fP|\f319200\fP|\f338400\fP|\f357600\fP|\f3115200\fP|..|\f34000000\fP
|
\f3baud\fP \f3300\fP|\f3600\fP|\f31800\fP|\f32400\fP|\f34800\fP|\f39600\fP|\f319200\fP|\f338400\fP|\f357600\fP|\f3115200\fP
|
||||||
.br
|
.br
|
||||||
Assign the baud rate to the console.
|
Assign the baud rate to the console.
|
||||||
Only consoles of type ``device'' will use this value.
|
Only consoles of type ``device'' will use this value.
|
||||||
@ -543,10 +541,6 @@ value
|
|||||||
.PP
|
.PP
|
||||||
Numeric Replacement
|
Numeric Replacement
|
||||||
.TP
|
.TP
|
||||||
.B b
|
|
||||||
.B baud
|
|
||||||
value
|
|
||||||
.TP
|
|
||||||
.B p
|
.B p
|
||||||
config
|
config
|
||||||
.B port
|
.B port
|
||||||
@ -693,7 +687,7 @@ character
|
|||||||
The resulting value must be no more than 20 characters.
|
The resulting value must be no more than 20 characters.
|
||||||
The null string (``\f3""\fP'') is the default.
|
The null string (``\f3""\fP'') is the default.
|
||||||
.TP
|
.TP
|
||||||
\f3ipmiworkaround\fP [\f3!\fP]option[\f3,\fP...]|\f3""\fP
|
\f3impiworkaround\fP [\f3!\fP]option[\f3,\fP...]|\f3""\fP
|
||||||
.br
|
.br
|
||||||
You can turn off a workaround by prefixing it with a
|
You can turn off a workaround by prefixing it with a
|
||||||
.RB `` ! ''
|
.RB `` ! ''
|
||||||
@ -1,4 +1,5 @@
|
|||||||
.TH CONSERVER.PASSWD 5 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
|
.\" $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"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
conserver.passwd \- user access information for
|
conserver.passwd \- user access information for
|
||||||
.BR conserver (8)
|
.BR conserver (8)
|
||||||
@ -1,4 +1,5 @@
|
|||||||
%!PS-Adobe-2.0 EPSF-1.2
|
%!PS-Adobe-2.0 EPSF-1.2
|
||||||
|
%%$Id: label.ps,v 1.1 2003/11/04 02:36:26 bryan Exp $
|
||||||
%%Title: RJ-11
|
%%Title: RJ-11
|
||||||
%%Creator: A Braunsdorf
|
%%Creator: A Braunsdorf
|
||||||
%%CreationDate:
|
%%CreationDate:
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
# dummy conserver config file
|
# dummy conserver config file
|
||||||
#
|
#
|
||||||
|
# $Id: test.cf,v 1.2 2003/07/04 18:04:05 bryan Exp $
|
||||||
|
#
|
||||||
default full {
|
default full {
|
||||||
rw *;
|
rw *;
|
||||||
}
|
}
|
||||||
|
|||||||
280
conserver.html
Normal file
280
conserver.html
Normal file
@ -0,0 +1,280 @@
|
|||||||
|
<!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 <bryan@conserver.com>">
|
||||||
|
<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: <A href=
|
||||||
|
"http://planetmirror.com/pub/conserver/">Australia</A>
|
||||||
|
<A href=
|
||||||
|
"http://conserver.linux-mirror.org/">Germany</A>
|
||||||
|
<A href="http://conserver.rayba.co/">Germany</A>
|
||||||
|
<A href=
|
||||||
|
"http://conserver.cybermirror.org/">Germany</A>
|
||||||
|
<A href=
|
||||||
|
"http://conserver.oss-mirror.org/">Ireland</A>
|
||||||
|
<A href="http://conserver.shape.ws/">Malaysia</A>
|
||||||
|
<A href="http://conserver.rinet.ru/">Russia</A>
|
||||||
|
<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&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>
|
||||||
@ -1,7 +1,6 @@
|
|||||||
### Path settings
|
### Path settings
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
VPATH = @srcdir@
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
# $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
|
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.
|
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
|
It will also halt when the the console server is powered off and on. To
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: access.c,v 5.74 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -49,6 +51,7 @@
|
|||||||
# include <netdb.h>
|
# include <netdb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !USE_IPV6
|
||||||
/* Compare an Internet address (IPv4 expected), with an address pattern
|
/* Compare an Internet address (IPv4 expected), with an address pattern
|
||||||
* passed as a character string representing an address in the Internet
|
* passed as a character string representing an address in the Internet
|
||||||
* standard `.' notation, optionally followed by a slash and an integer
|
* standard `.' notation, optionally followed by a slash and an integer
|
||||||
@ -67,9 +70,9 @@ AddrCmp(struct in_addr *addr, char *pattern)
|
|||||||
in_addr_t hostaddr, pattern_addr, netmask;
|
in_addr_t hostaddr, pattern_addr, netmask;
|
||||||
char *p, *slash_posn;
|
char *p, *slash_posn;
|
||||||
static STRING *buf = (STRING *)0;
|
static STRING *buf = (STRING *)0;
|
||||||
#if HAVE_INET_ATON
|
# if HAVE_INET_ATON
|
||||||
struct in_addr inetaddr;
|
struct in_addr inetaddr;
|
||||||
#endif
|
# endif
|
||||||
|
|
||||||
if (buf == (STRING *)0)
|
if (buf == (STRING *)0)
|
||||||
buf = AllocString();
|
buf = AllocString();
|
||||||
@ -82,15 +85,15 @@ AddrCmp(struct in_addr *addr, char *pattern)
|
|||||||
} else
|
} else
|
||||||
p = pattern;
|
p = pattern;
|
||||||
|
|
||||||
#if HAVE_INET_ATON
|
# if HAVE_INET_ATON
|
||||||
if (inet_aton(p, &inetaddr) == 0)
|
if (inet_aton(p, &inetaddr) == 0)
|
||||||
return 1;
|
return 1;
|
||||||
pattern_addr = inetaddr.s_addr;
|
pattern_addr = inetaddr.s_addr;
|
||||||
#else
|
# else
|
||||||
pattern_addr = inet_addr(p);
|
pattern_addr = inet_addr(p);
|
||||||
if (pattern_addr == (in_addr_t) (-1))
|
if (pattern_addr == (in_addr_t) (-1))
|
||||||
return 1; /* malformed address */
|
return 1; /* malformed address */
|
||||||
#endif
|
# endif
|
||||||
|
|
||||||
if (slash_posn) {
|
if (slash_posn) {
|
||||||
/* convert explicit netmask */
|
/* convert explicit netmask */
|
||||||
@ -119,6 +122,7 @@ AddrCmp(struct in_addr *addr, char *pattern)
|
|||||||
pattern_addr & netmask, pattern_addr, netmask));
|
pattern_addr & netmask, pattern_addr, netmask));
|
||||||
return (hostaddr & netmask) != (pattern_addr & netmask);
|
return (hostaddr & netmask) != (pattern_addr & netmask);
|
||||||
}
|
}
|
||||||
|
#endif /* USE_IPV6 */
|
||||||
|
|
||||||
/* return the access type for a given host entry (ksb)
|
/* return the access type for a given host entry (ksb)
|
||||||
*/
|
*/
|
||||||
@ -146,12 +150,6 @@ AccType(INADDR_STYPE *addr, char **peername)
|
|||||||
so = sizeof(*addr);
|
so = sizeof(*addr);
|
||||||
|
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
/*
|
|
||||||
* XXX where is the TRUST_REVERSE_DNS support for IPv6???
|
|
||||||
*
|
|
||||||
* XXX IPv4 should use getnameinfo() et al as well
|
|
||||||
* (if available, they are in IEEE Std 1003.1g-2000)
|
|
||||||
*/
|
|
||||||
error =
|
error =
|
||||||
getnameinfo((struct sockaddr *)addr, so, ipaddr, sizeof(ipaddr),
|
getnameinfo((struct sockaddr *)addr, so, ipaddr, sizeof(ipaddr),
|
||||||
NULL, 0, NI_NUMERICHOST);
|
NULL, 0, NI_NUMERICHOST);
|
||||||
@ -159,11 +157,7 @@ AccType(INADDR_STYPE *addr, char **peername)
|
|||||||
Error("AccType(): getnameinfo failed: %s", gai_strerror(error));
|
Error("AccType(): getnameinfo failed: %s", gai_strerror(error));
|
||||||
goto common_ret;
|
goto common_ret;
|
||||||
}
|
}
|
||||||
CONDDEBUG((1, "AccType(): ip=%s (%s)", ipaddr,
|
CONDDEBUG((1, "AccType(): ip=%s", ipaddr));
|
||||||
addr->ss_family == AF_UNSPEC ? "AF_UNSPEC" :
|
|
||||||
addr->ss_family == AF_LOCAL ? "AF_LOCAL" :
|
|
||||||
addr->ss_family == AF_INET ? "AF_INET" :
|
|
||||||
addr->ss_family == AF_INET6 ? "AF_INET6" : "IF_???"));
|
|
||||||
|
|
||||||
error =
|
error =
|
||||||
getnameinfo((struct sockaddr *)addr, so, host, sizeof(host), NULL,
|
getnameinfo((struct sockaddr *)addr, so, host, sizeof(host), NULL,
|
||||||
@ -174,15 +168,6 @@ AccType(INADDR_STYPE *addr, char **peername)
|
|||||||
for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
|
for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
|
||||||
CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
|
CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
|
||||||
pACtmp->ctrust));
|
pACtmp->ctrust));
|
||||||
if (addr->ss_family == AF_INET && pACtmp->isCIDR != 0) {
|
|
||||||
if (AddrCmp
|
|
||||||
(&(((struct sockaddr_in *)addr)->sin_addr),
|
|
||||||
pACtmp->pcwho) == 0) {
|
|
||||||
ret = pACtmp->ctrust;
|
|
||||||
goto common_ret;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (strstr(ipaddr, pACtmp->pcwho) != NULL) {
|
if (strstr(ipaddr, pACtmp->pcwho) != NULL) {
|
||||||
CONDDEBUG((1, "AccType(): match for ip=%s", ipaddr));
|
CONDDEBUG((1, "AccType(): match for ip=%s", ipaddr));
|
||||||
@ -199,7 +184,7 @@ AccType(INADDR_STYPE *addr, char **peername)
|
|||||||
common_ret:
|
common_ret:
|
||||||
if (config->loghostnames == FLAGTRUE && !error)
|
if (config->loghostnames == FLAGTRUE && !error)
|
||||||
*peername = StrDup(host);
|
*peername = StrDup(host);
|
||||||
#else /* !USE_IPV6 */
|
#else
|
||||||
# if TRUST_REVERSE_DNS
|
# if TRUST_REVERSE_DNS
|
||||||
/* if we trust reverse dns, we get the names associated with
|
/* if we trust reverse dns, we get the names associated with
|
||||||
* the address we're checking and then check each of those
|
* the address we're checking and then check each of those
|
||||||
@ -372,7 +357,7 @@ SetDefAccess(
|
|||||||
if ((a->pcwho = StrDup(addr)) == (char *)0)
|
if ((a->pcwho = StrDup(addr)) == (char *)0)
|
||||||
OutOfMem();
|
OutOfMem();
|
||||||
|
|
||||||
a->ctrust = config->defaultaccess;
|
a->ctrust = 'a';
|
||||||
a->pACnext = pACList;
|
a->pACnext = pACList;
|
||||||
pACList = a;
|
pACList = a;
|
||||||
|
|
||||||
@ -385,7 +370,7 @@ SetDefAccess(
|
|||||||
OutOfMem();
|
OutOfMem();
|
||||||
if ((pACList->pcwho = StrDup("127.0.0.1")) == (char *)0)
|
if ((pACList->pcwho = StrDup("127.0.0.1")) == (char *)0)
|
||||||
OutOfMem();
|
OutOfMem();
|
||||||
pACList->ctrust = config->defaultaccess;
|
pACList->ctrust = 'a';
|
||||||
CONDDEBUG((1, "SetDefAccess(): trust=%c, who=%s", pACList->ctrust,
|
CONDDEBUG((1, "SetDefAccess(): trust=%c, who=%s", pACList->ctrust,
|
||||||
pACList->pcwho));
|
pACList->pcwho));
|
||||||
#else
|
#else
|
||||||
@ -397,7 +382,7 @@ SetDefAccess(
|
|||||||
OutOfMem();
|
OutOfMem();
|
||||||
if ((a->pcwho = StrDup(addr)) == (char *)0)
|
if ((a->pcwho = StrDup(addr)) == (char *)0)
|
||||||
OutOfMem();
|
OutOfMem();
|
||||||
a->ctrust = config->defaultaccess;
|
a->ctrust = 'a';
|
||||||
a->pACnext = pACList;
|
a->pACnext = pACList;
|
||||||
pACList = a;
|
pACList = a;
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: access.h,v 5.27 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: client.c,v 5.98 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: client.h,v 5.45 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -89,7 +91,6 @@ typedef struct client { /* Connection Information: */
|
|||||||
FLAG confirmed; /* confirm state */
|
FLAG confirmed; /* confirm state */
|
||||||
CLIENTSTATE cState; /* state needing confirmation */
|
CLIENTSTATE cState; /* state needing confirmation */
|
||||||
char cOption; /* option initiating the confirmation */
|
char cOption; /* option initiating the confirmation */
|
||||||
size_t tokenSize; /* buffer size for GSSAPI token */
|
|
||||||
} CONSCLIENT;
|
} CONSCLIENT;
|
||||||
|
|
||||||
extern void Replay(CONSENT *, CONSFILE *, unsigned short);
|
extern void Replay(CONSENT *, CONSFILE *, unsigned short);
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: consent.c,v 5.155 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -86,45 +88,6 @@ BAUD baud[] = {
|
|||||||
{"3500000", 32},
|
{"3500000", 32},
|
||||||
{"4000000", 33},
|
{"4000000", 33},
|
||||||
#else /* FOR_CYCLADES_TS */
|
#else /* FOR_CYCLADES_TS */
|
||||||
# if defined(B4000000)
|
|
||||||
{"4000000", B4000000},
|
|
||||||
# endif
|
|
||||||
# if defined(B3500000)
|
|
||||||
{"3500000", B3500000},
|
|
||||||
# endif
|
|
||||||
# if defined(B3000000)
|
|
||||||
{"3000000", B3000000},
|
|
||||||
# endif
|
|
||||||
# if defined(B2500000)
|
|
||||||
{"2500000", B2500000},
|
|
||||||
# endif
|
|
||||||
# if defined(B2000000)
|
|
||||||
{"2000000", B2000000},
|
|
||||||
# endif
|
|
||||||
# if defined(B1500000)
|
|
||||||
{"1500000", B1500000},
|
|
||||||
# endif
|
|
||||||
# if defined(B1152000)
|
|
||||||
{"1152000", B1152000},
|
|
||||||
# endif
|
|
||||||
# if defined(B1000000)
|
|
||||||
{"1000000", B1000000},
|
|
||||||
# endif
|
|
||||||
# if defined(B921600)
|
|
||||||
{"921600", B921600},
|
|
||||||
# endif
|
|
||||||
# if defined(B576000)
|
|
||||||
{"576000", B576000},
|
|
||||||
# endif
|
|
||||||
# if defined(B500000)
|
|
||||||
{"500000", B500000},
|
|
||||||
# endif
|
|
||||||
# if defined(B460800)
|
|
||||||
{"460800", B460800},
|
|
||||||
# endif
|
|
||||||
# if defined(B230400)
|
|
||||||
{"230400", B230400},
|
|
||||||
# endif
|
|
||||||
# if defined(B115200)
|
# if defined(B115200)
|
||||||
{"115200", B115200},
|
{"115200", B115200},
|
||||||
# endif
|
# endif
|
||||||
@ -493,19 +456,11 @@ StartInit(CONSENT *pCE)
|
|||||||
|
|
||||||
/* setup new process with clean file descriptors
|
/* 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();
|
i = GetMaxFiles();
|
||||||
for ( /* i above */ ; --i > 2;) {
|
for ( /* i above */ ; --i > 2;) {
|
||||||
if (i != pout[0] && i != pin[1])
|
if (i != pout[0] && i != pin[1])
|
||||||
close(i);
|
close(i);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
/* leave 2 until we have to close it */
|
/* leave 2 until we have to close it */
|
||||||
close(1);
|
close(1);
|
||||||
close(0);
|
close(0);
|
||||||
@ -639,18 +594,11 @@ VirtDev(CONSENT *pCE)
|
|||||||
|
|
||||||
/* setup new process with clean filew descriptors
|
/* 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();
|
i = GetMaxFiles();
|
||||||
for ( /* i above */ ; --i > 2;) {
|
for ( /* i above */ ; --i > 2;) {
|
||||||
if (i != pCE->execSlaveFD)
|
if (i != pCE->execSlaveFD)
|
||||||
close(i);
|
close(i);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
/* leave 2 until we *have to close it*
|
/* leave 2 until we *have to close it*
|
||||||
*/
|
*/
|
||||||
close(1);
|
close(1);
|
||||||
@ -738,10 +686,6 @@ ConsState(CONSENT *pCE)
|
|||||||
return "SSL_accept";
|
return "SSL_accept";
|
||||||
case INSSLSHUTDOWN:
|
case INSSLSHUTDOWN:
|
||||||
return "SSL_shutdown";
|
return "SSL_shutdown";
|
||||||
#endif
|
|
||||||
#if HAVE_GSSAPI
|
|
||||||
case INGSSACCEPT:
|
|
||||||
return "GSSAPI_accept";
|
|
||||||
#endif
|
#endif
|
||||||
case ISFLUSHING:
|
case ISFLUSHING:
|
||||||
return "flushing";
|
return "flushing";
|
||||||
@ -798,8 +742,6 @@ ConsDown(CONSENT *pCE, FLAG downHard, FLAG force)
|
|||||||
if (pCE->type == EXEC && pCE->execSlaveFD != 0) {
|
if (pCE->type == EXEC && pCE->execSlaveFD != 0) {
|
||||||
close(pCE->execSlaveFD);
|
close(pCE->execSlaveFD);
|
||||||
pCE->execSlaveFD = 0;
|
pCE->execSlaveFD = 0;
|
||||||
free(pCE->execSlave);
|
|
||||||
pCE->execSlave = NULL;
|
|
||||||
}
|
}
|
||||||
pCE->fup = 0;
|
pCE->fup = 0;
|
||||||
pCE->nolog = 0;
|
pCE->nolog = 0;
|
||||||
@ -861,7 +803,7 @@ ConsInit(CONSENT *pCE)
|
|||||||
*/
|
*/
|
||||||
if (pCE->fup) {
|
if (pCE->fup) {
|
||||||
ConsDown(pCE, FLAGFALSE, FLAGTRUE);
|
ConsDown(pCE, FLAGFALSE, FLAGTRUE);
|
||||||
Sleep(250000);
|
usleep(250000); /* pause 0.25 sec to let things settle a bit */
|
||||||
}
|
}
|
||||||
|
|
||||||
pCE->autoReUp = 0;
|
pCE->autoReUp = 0;
|
||||||
@ -915,9 +857,6 @@ ConsInit(CONSENT *pCE)
|
|||||||
case HOST:
|
case HOST:
|
||||||
{
|
{
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
/* XXX IPv4 should use getaddrinfo() and getnameinfo() as well,
|
|
||||||
* (if available, they are in IEEE Std 1003.1g-2000)
|
|
||||||
*/
|
|
||||||
int error;
|
int error;
|
||||||
char host[NI_MAXHOST];
|
char host[NI_MAXHOST];
|
||||||
char serv[NI_MAXSERV];
|
char serv[NI_MAXSERV];
|
||||||
@ -929,10 +868,11 @@ ConsInit(CONSENT *pCE)
|
|||||||
#if HAVE_SETSOCKOPT
|
#if HAVE_SETSOCKOPT
|
||||||
int one = 1;
|
int one = 1;
|
||||||
#endif
|
#endif
|
||||||
Sleep(100000); /* Not all terminal servers can keep up */
|
|
||||||
|
usleep(100000); /* Not all terminal servers can keep up */
|
||||||
|
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
# if HAVE_MEMSET /* XXX memset() is C89!!! */
|
# if HAVE_MEMSET
|
||||||
memset(&hints, 0, sizeof(hints));
|
memset(&hints, 0, sizeof(hints));
|
||||||
# else
|
# else
|
||||||
bzero(&hints, sizeof(hints));
|
bzero(&hints, sizeof(hints));
|
||||||
@ -969,38 +909,28 @@ ConsInit(CONSENT *pCE)
|
|||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
if (setsockopt
|
if (setsockopt
|
||||||
(cofile, SOL_SOCKET, SO_KEEPALIVE,
|
(cofile, SOL_SOCKET, SO_KEEPALIVE,
|
||||||
(char *)&one, sizeof(one)) < 0) {
|
(char *)&one, sizeof(one)) < 0)
|
||||||
Error
|
|
||||||
("[%s] %s:%s setsockopt(%u,SO_KEEPALIVE): %s",
|
|
||||||
pCE->server, host, serv, cofile, strerror(errno));
|
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
|
||||||
# endif
|
# endif
|
||||||
if (!SetFlags(cofile, O_NONBLOCK, 0))
|
if (!SetFlags(cofile, O_NONBLOCK, 0))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
if ((ret =
|
||||||
ret = connect(cofile, rp->ai_addr, rp->ai_addrlen);
|
connect(cofile, rp->ai_addr,
|
||||||
if (ret == 0 || errno == EINPROGRESS)
|
rp->ai_addrlen)) == 0)
|
||||||
goto success;
|
goto success;
|
||||||
Error("[%s] %s:%s connect(%u): %s",
|
|
||||||
pCE->server, host, serv, cofile, strerror(errno));
|
|
||||||
fail:
|
fail:
|
||||||
close(cofile);
|
close(cofile);
|
||||||
} else {
|
|
||||||
Error
|
|
||||||
("[%s] %s:%s socket(AF_INET,SOCK_STREAM): %s",
|
|
||||||
pCE->server, host, serv, strerror(errno));
|
|
||||||
}
|
}
|
||||||
rp = rp->ai_next;
|
rp = rp->ai_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
Error("[%s] Unable to connect to %s:%s, forcing down", pCE->server,
|
Error("[%s]: Unable to connect to %s:%s", pCE->server,
|
||||||
pCE->host, serv);
|
host, serv);
|
||||||
ConsDown(pCE, FLAGTRUE, FLAGTRUE);
|
ConsDown(pCE, FLAGTRUE, FLAGTRUE);
|
||||||
return;
|
return;
|
||||||
success:
|
success:
|
||||||
freeaddrinfo(ai);
|
freeaddrinfo(ai);
|
||||||
#else /* !USE_IPV6 */
|
#else
|
||||||
# if HAVE_MEMSET
|
# if HAVE_MEMSET
|
||||||
memset((void *)&port, 0, sizeof(port));
|
memset((void *)&port, 0, sizeof(port));
|
||||||
# else
|
# else
|
||||||
@ -1322,7 +1252,7 @@ AddrsMatch(char *addr1, char *addr2)
|
|||||||
{
|
{
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
int error, ret = 0;
|
int error, ret = 0;
|
||||||
struct addrinfo *ai1, *ai2, *rp1, *rp2, hints;
|
struct addrinfo *ai1, *ai2, hints;
|
||||||
#else
|
#else
|
||||||
/* so, since we might use inet_addr, we're going to use
|
/* so, since we might use inet_addr, we're going to use
|
||||||
* (in_addr_t)(-1) as a sign of an invalid ip address.
|
* (in_addr_t)(-1) as a sign of an invalid ip address.
|
||||||
@ -1360,19 +1290,17 @@ AddrsMatch(char *addr1, char *addr2)
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
rp1 = ai1;
|
for (; ai1 != NULL; ai1 = ai1->ai_next) {
|
||||||
rp2 = ai2;
|
for (; ai2 != NULL; ai2 = ai2->ai_next) {
|
||||||
for (; rp1 != NULL; rp1 = rp1->ai_next) {
|
if (ai1->ai_addr->sa_family != ai2->ai_addr->sa_family)
|
||||||
for (; rp2 != NULL; rp2 = rp2->ai_next) {
|
|
||||||
if (rp1->ai_addr->sa_family != rp2->ai_addr->sa_family)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
# if HAVE_MEMCMP
|
# if HAVE_MEMCMP
|
||||||
memcmp(&rp1->ai_addr, &rp2->ai_addr,
|
memcmp(&ai1->ai_addr, &ai2->ai_addr,
|
||||||
sizeof(struct sockaddr_storage))
|
sizeof(struct sockaddr_storage))
|
||||||
# else
|
# else
|
||||||
bcmp(&rp1->ai_addr, &rp2->ai_addr,
|
bcmp(&ai1->ai_addr, &ai2->ai_addr,
|
||||||
sizeof(struct sockaddr_storage))
|
sizeof(struct sockaddr_storage))
|
||||||
# endif
|
# endif
|
||||||
== 0) {
|
== 0) {
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: consent.h,v 5.76 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
.TH CONSERVER 8 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
|
.\" @(#)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"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
conserver \- console server daemon
|
conserver \- console server daemon
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -420,7 +422,7 @@ output, but all consoles, not
|
|||||||
just those without a user, are logged.
|
just those without a user, are logged.
|
||||||
Each line of output is prefixed with the console name.
|
Each line of output is prefixed with the console name.
|
||||||
If a user is attached read/write, a `*' is appended to the console name,
|
If a user is attached read/write, a `*' is appended to the console name,
|
||||||
to allow log watching utilities to ignore potential user-introduced alarms.
|
to allow log watching utilites to ignore potential user-introduced alarms.
|
||||||
.TP
|
.TP
|
||||||
.B \-v
|
.B \-v
|
||||||
Echo the configuration as it is being read (be verbose).
|
Echo the configuration as it is being read (be verbose).
|
||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: convert.c,v 1.14 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: cutil.c,v 1.143 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -57,9 +59,7 @@ Bye(int status)
|
|||||||
{
|
{
|
||||||
DestroyDataStructures();
|
DestroyDataStructures();
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
# if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
ERR_free_strings();
|
ERR_free_strings();
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
exit(status);
|
exit(status);
|
||||||
}
|
}
|
||||||
@ -262,7 +262,7 @@ DestroyString(STRING *msg)
|
|||||||
{
|
{
|
||||||
if (msg->prev == (STRING *)0 && msg->next == (STRING *)0 &&
|
if (msg->prev == (STRING *)0 && msg->next == (STRING *)0 &&
|
||||||
allStrings != msg) {
|
allStrings != msg) {
|
||||||
CONDDEBUG((3, "DestroyString(): 0x%lx non-pooled string destroyed",
|
CONDDEBUG((1, "DestroyString(): 0x%lx non-pooled string destroyed",
|
||||||
(void *)msg, stringCount));
|
(void *)msg, stringCount));
|
||||||
} else {
|
} else {
|
||||||
if (msg->prev != (STRING *)0)
|
if (msg->prev != (STRING *)0)
|
||||||
@ -273,7 +273,7 @@ DestroyString(STRING *msg)
|
|||||||
allStrings = msg->next;
|
allStrings = msg->next;
|
||||||
}
|
}
|
||||||
stringCount--;
|
stringCount--;
|
||||||
CONDDEBUG((3,
|
CONDDEBUG((1,
|
||||||
"DestroyString(): 0x%lx string destroyed (count==%d)",
|
"DestroyString(): 0x%lx string destroyed (count==%d)",
|
||||||
(void *)msg, stringCount));
|
(void *)msg, stringCount));
|
||||||
}
|
}
|
||||||
@ -296,7 +296,7 @@ AllocString(void)
|
|||||||
allStrings = s;
|
allStrings = s;
|
||||||
InitString(s);
|
InitString(s);
|
||||||
stringCount++;
|
stringCount++;
|
||||||
CONDDEBUG((3, "AllocString(): 0x%lx created string #%d", (void *)s,
|
CONDDEBUG((1, "AllocString(): 0x%lx created string #%d", (void *)s,
|
||||||
stringCount));
|
stringCount));
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
@ -578,18 +578,17 @@ GetMaxFiles(void)
|
|||||||
# else
|
# else
|
||||||
# ifndef OPEN_MAX
|
# ifndef OPEN_MAX
|
||||||
# define OPEN_MAX 64
|
# define OPEN_MAX 64
|
||||||
# endif
|
# endif /* !OPEN_MAX */
|
||||||
/* !OPEN_MAX */
|
|
||||||
mf = OPEN_MAX;
|
mf = OPEN_MAX;
|
||||||
# endif
|
# endif /* HAVE_GETDTABLESIZE */
|
||||||
/* HAVE_GETDTABLESIZE */
|
# endif /* HAVE_GETRLIMIT */
|
||||||
# endif/* HAVE_GETRLIMIT */
|
|
||||||
#endif /* HAVE_SYSCONF */
|
#endif /* HAVE_SYSCONF */
|
||||||
#ifdef FD_SETSIZE
|
#ifdef FD_SETSIZE
|
||||||
if (FD_SETSIZE <= mf) {
|
if (FD_SETSIZE <= mf) {
|
||||||
mf = (FD_SETSIZE - 1);
|
mf = (FD_SETSIZE - 1);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
CONDDEBUG((1, "GetMaxFiles(): maxfiles=%d", mf));
|
||||||
return mf;
|
return mf;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -708,7 +707,7 @@ FileUnopen(CONSFILE *cfp)
|
|||||||
break;
|
break;
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
case SSLSocket:
|
case SSLSocket:
|
||||||
retval = cfp->fd;
|
retval = -1;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
@ -889,10 +888,7 @@ FileRead(CONSFILE *cfp, void *buf, int len)
|
|||||||
case simpleSocket:
|
case simpleSocket:
|
||||||
while (retval < 0) {
|
while (retval < 0) {
|
||||||
if ((retval = read(cfp->fd, buf, len)) <= 0) {
|
if ((retval = read(cfp->fd, buf, len)) <= 0) {
|
||||||
CONDDEBUG((2,
|
if (retval == 0) {
|
||||||
"FileRead(): read(): fd=%d, retval=%d, errno=%d",
|
|
||||||
cfp->fd, retval, errno));
|
|
||||||
if (retval == 0 || errno == EIO) {
|
|
||||||
retval = -1;
|
retval = -1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1069,9 +1065,6 @@ FileWrite(CONSFILE *cfp, FLAG bufferonly, char *buf, int len)
|
|||||||
case simpleSocket:
|
case simpleSocket:
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
if ((retval = write(fdout, buf, 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)
|
if (errno == EINTR)
|
||||||
continue;
|
continue;
|
||||||
if (errno == EAGAIN) {
|
if (errno == EAGAIN) {
|
||||||
@ -1946,11 +1939,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
|||||||
if ((ifc.ifc_len - r) < sizeof(*ifr))
|
if ((ifc.ifc_len - r) < sizeof(*ifr))
|
||||||
break;
|
break;
|
||||||
# ifdef HAVE_SA_LEN
|
# ifdef HAVE_SA_LEN
|
||||||
# ifdef __FreeBSD__
|
|
||||||
if (sa->sa_len > sizeof(ifr->ifr_addr))
|
|
||||||
# else
|
|
||||||
if (sa->sa_len > sizeof(ifr->ifr_ifru))
|
if (sa->sa_len > sizeof(ifr->ifr_ifru))
|
||||||
# endif
|
|
||||||
r += sizeof(ifr->ifr_name) + sa->sa_len;
|
r += sizeof(ifr->ifr_name) + sa->sa_len;
|
||||||
else
|
else
|
||||||
# endif
|
# endif
|
||||||
@ -2001,7 +1990,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
|||||||
}
|
}
|
||||||
close(sock);
|
close(sock);
|
||||||
free(ifc.ifc_req);
|
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;
|
int count;
|
||||||
struct hostent *he;
|
struct hostent *he;
|
||||||
|
|
||||||
@ -2415,7 +2404,7 @@ GetWord(FILE *fp, int *line, short spaceok, STRING *word)
|
|||||||
while ((c = fgetc(fp)) != EOF) {
|
while ((c = fgetc(fp)) != EOF) {
|
||||||
if (c == '\n') {
|
if (c == '\n') {
|
||||||
(*line)++;
|
(*line)++;
|
||||||
if (checkInc == -2 || checkInc == 0)
|
if (checkInc == -2)
|
||||||
checkInc = -1;
|
checkInc = -1;
|
||||||
}
|
}
|
||||||
if (comment) {
|
if (comment) {
|
||||||
@ -2592,17 +2581,11 @@ ParseFile(char *filename, FILE *fp, int level)
|
|||||||
strerror(errno));
|
strerror(errno));
|
||||||
} else {
|
} else {
|
||||||
char *fname;
|
char *fname;
|
||||||
char *sfile;
|
|
||||||
int sline;
|
|
||||||
/* word gets destroyed, so save the name */
|
/* word gets destroyed, so save the name */
|
||||||
fname = StrDup(word->string);
|
fname = StrDup(word->string);
|
||||||
sfile = file;
|
|
||||||
sline = line;
|
|
||||||
ParseFile(fname, lfp, level + 1);
|
ParseFile(fname, lfp, level + 1);
|
||||||
fclose(lfp);
|
fclose(lfp);
|
||||||
free(fname);
|
free(fname);
|
||||||
file = sfile;
|
|
||||||
line = sline;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (state) {
|
switch (state) {
|
||||||
@ -2730,8 +2713,8 @@ ParseFile(char *filename, FILE *fp, int level)
|
|||||||
case VALUE:
|
case VALUE:
|
||||||
switch (token) {
|
switch (token) {
|
||||||
case WORD:
|
case WORD:
|
||||||
(*sections[secIndex].
|
(*sections[secIndex].items[keyIndex].
|
||||||
items[keyIndex].reg) (word->string);
|
reg) (word->string);
|
||||||
state = SEMI;
|
state = SEMI;
|
||||||
break;
|
break;
|
||||||
case SEMICOLON:
|
case SEMICOLON:
|
||||||
@ -3097,14 +3080,3 @@ StrCpy(char *dst, const char *src, unsigned int size)
|
|||||||
strcpy(dst, src);
|
strcpy(dst, src);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
Sleep(useconds_t usec)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_NANOSLEEP
|
|
||||||
struct timespec ts = { 0, usec * 1000 };
|
|
||||||
nanosleep(&ts, NULL);
|
|
||||||
#else
|
|
||||||
usleep(usec);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: cutil.h,v 1.70 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -7,17 +9,7 @@
|
|||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
# include <openssl/ssl.h>
|
# include <openssl/ssl.h>
|
||||||
# include <openssl/bn.h>
|
|
||||||
# include <openssl/dh.h>
|
|
||||||
# include <openssl/err.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
|
#endif
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
# include <gssapi/gssapi.h>
|
# include <gssapi/gssapi.h>
|
||||||
@ -102,15 +94,15 @@ typedef struct consFile {
|
|||||||
|
|
||||||
typedef struct item {
|
typedef struct item {
|
||||||
char *id;
|
char *id;
|
||||||
void (*reg)(char *);
|
void (*reg) (char *);
|
||||||
} ITEM;
|
} ITEM;
|
||||||
|
|
||||||
typedef struct section {
|
typedef struct section {
|
||||||
char *id;
|
char *id;
|
||||||
void (*begin)(char *);
|
void (*begin) (char *);
|
||||||
void (*end)(void);
|
void (*end) (void);
|
||||||
void (*abort)(void);
|
void (*abort) (void);
|
||||||
void (*destroy)(void);
|
void (*destroy) (void);
|
||||||
ITEM *items;
|
ITEM *items;
|
||||||
} SECTION;
|
} SECTION;
|
||||||
|
|
||||||
@ -123,14 +115,14 @@ typedef enum substToken {
|
|||||||
typedef struct subst {
|
typedef struct subst {
|
||||||
/* function to retrieve a token type based on a character
|
/* function to retrieve a token type based on a character
|
||||||
*/
|
*/
|
||||||
SUBSTTOKEN (*token)(char);
|
SUBSTTOKEN (*token) (char);
|
||||||
/* data for callback function
|
/* data for callback function
|
||||||
*/
|
*/
|
||||||
void *data;
|
void *data;
|
||||||
/* function to retrieve a value (as a char* or int or both) for
|
/* function to retrieve a value (as a char* or int or both) for
|
||||||
* a substitution
|
* a substitution
|
||||||
*/
|
*/
|
||||||
int (*value)(char, char **, int *);
|
int (*value) (char, char **, int *);
|
||||||
} SUBST;
|
} SUBST;
|
||||||
|
|
||||||
extern int isMultiProc, fDebug, fVerbose, fErrorPrinted;
|
extern int isMultiProc, fDebug, fVerbose, fErrorPrinted;
|
||||||
@ -215,7 +207,6 @@ extern void ProcessSubst(SUBST *, char **, char **, char *, char *);
|
|||||||
extern char *MyVersion(void);
|
extern char *MyVersion(void);
|
||||||
extern unsigned int AtoU(char *);
|
extern unsigned int AtoU(char *);
|
||||||
extern void StrCpy(char *, const char *, unsigned int);
|
extern void StrCpy(char *, const char *, unsigned int);
|
||||||
extern void Sleep(useconds_t);
|
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
extern SSL *FileGetSSL(CONSFILE *);
|
extern SSL *FileGetSSL(CONSFILE *);
|
||||||
extern void FileSetSSL(CONSFILE *, SSL *);
|
extern void FileSetSSL(CONSFILE *, SSL *);
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: fallback.c,v 5.62 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -226,7 +228,7 @@ GetPseudoTTY(STRING *slave, int *slaveFD)
|
|||||||
|
|
||||||
*slaveFD = sfd;
|
*slaveFD = sfd;
|
||||||
return fd;
|
return fd;
|
||||||
# endif/* (HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT) || defined(_AIX) */
|
# endif /* (HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT) || defined(_AIX) */
|
||||||
#endif /* HAVE_OPENPTY */
|
#endif /* HAVE_OPENPTY */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: group.c,v 5.352 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -66,7 +68,6 @@
|
|||||||
#include <master.h>
|
#include <master.h>
|
||||||
#include <main.h>
|
#include <main.h>
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#if HAVE_PAM
|
#if HAVE_PAM
|
||||||
# include <security/pam_appl.h>
|
# include <security/pam_appl.h>
|
||||||
@ -638,7 +639,7 @@ DestroyGroup(GRPENT *pGE)
|
|||||||
|
|
||||||
#if HAVE_PAM
|
#if HAVE_PAM
|
||||||
int
|
int
|
||||||
QuietConv(int num_msg, const struct pam_message **msg,
|
QuietConv(int num_msg, struct pam_message **msg,
|
||||||
struct pam_response **resp, void *appdata_ptr)
|
struct pam_response **resp, void *appdata_ptr)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -1023,7 +1024,7 @@ ReUp(GRPENT *pGE, short automatic)
|
|||||||
/* update all the timers */
|
/* update all the timers */
|
||||||
if (automatic == 0 || automatic == 2) {
|
if (automatic == 0 || automatic == 2) {
|
||||||
if (config->reinitcheck)
|
if (config->reinitcheck)
|
||||||
timers[T_REINIT] = tyme + config->reinitcheck;
|
timers[T_REINIT] = tyme + (config->reinitcheck * 60);
|
||||||
}
|
}
|
||||||
if (!fNoautoreup)
|
if (!fNoautoreup)
|
||||||
timers[T_AUTOUP] = tyme + 60;
|
timers[T_AUTOUP] = tyme + 60;
|
||||||
@ -1811,14 +1812,10 @@ StartTask(CONSENT *pCE, char *cmd, uid_t uid, gid_t gid)
|
|||||||
|
|
||||||
/* setup new process with clean file descriptors
|
/* setup new process with clean file descriptors
|
||||||
*/
|
*/
|
||||||
#if HAVE_CLOSEFROM
|
|
||||||
closefrom(3);
|
|
||||||
#else
|
|
||||||
i = GetMaxFiles();
|
i = GetMaxFiles();
|
||||||
for ( /* i above */ ; --i > 2;) {
|
for ( /* i above */ ; --i > 2;) {
|
||||||
close(i);
|
close(i);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (geteuid() == 0) {
|
if (geteuid() == 0) {
|
||||||
if (gid != 0)
|
if (gid != 0)
|
||||||
@ -1964,19 +1961,13 @@ int
|
|||||||
AttemptGSSAPI(CONSCLIENT *pCL)
|
AttemptGSSAPI(CONSCLIENT *pCL)
|
||||||
{
|
{
|
||||||
int nr, ret = 0;
|
int nr, ret = 0;
|
||||||
char *buf = NULL;
|
char buf[1024];
|
||||||
gss_buffer_desc sendtok, recvtok, dbuf;
|
gss_buffer_desc sendtok, recvtok, dbuf;
|
||||||
gss_ctx_id_t gssctx = GSS_C_NO_CONTEXT;
|
gss_ctx_id_t gssctx = GSS_C_NO_CONTEXT;
|
||||||
OM_uint32 stmaj, stmin, mctx, dmin;
|
OM_uint32 stmaj, stmin, mctx, dmin;
|
||||||
gss_name_t user = 0;
|
gss_name_t user = 0;
|
||||||
|
|
||||||
buf = malloc(pCL->tokenSize);
|
if ((nr = FileRead(pCL->fd, buf, sizeof(buf))) <= 0) {
|
||||||
if (buf == NULL) {
|
|
||||||
Error("Unable to allocate a buffer for GSSAPI token");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if ((nr = FileRead(pCL->fd, buf, pCL->tokenSize)) <= 0) {
|
|
||||||
free(buf);
|
|
||||||
return nr;
|
return nr;
|
||||||
}
|
}
|
||||||
recvtok.value = buf;
|
recvtok.value = buf;
|
||||||
@ -1992,7 +1983,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
|
|||||||
FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length);
|
FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length);
|
||||||
FileSetQuoteIAC(pCL->fd, FLAGTRUE);
|
FileSetQuoteIAC(pCL->fd, FLAGTRUE);
|
||||||
pCL->iState = S_NORMAL;
|
pCL->iState = S_NORMAL;
|
||||||
gss_release_buffer(&stmin, &sendtok);
|
gss_release_buffer(NULL, &sendtok);
|
||||||
BuildString((char *)0, pCL->username);
|
BuildString((char *)0, pCL->username);
|
||||||
BuildString((char *)0, pCL->acid);
|
BuildString((char *)0, pCL->acid);
|
||||||
stmaj = gss_display_name(&stmin, user, &dbuf, NULL);
|
stmaj = gss_display_name(&stmin, user, &dbuf, NULL);
|
||||||
@ -2002,7 +1993,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
|
|||||||
BuildStringChar('@', pCL->acid);
|
BuildStringChar('@', pCL->acid);
|
||||||
BuildString(pCL->peername->string, pCL->acid);
|
BuildString(pCL->peername->string, pCL->acid);
|
||||||
gss_release_name(&stmin, &user);
|
gss_release_name(&stmin, &user);
|
||||||
gss_release_buffer(&stmin, &dbuf);
|
gss_release_buffer(NULL, &dbuf);
|
||||||
ret = 1;
|
ret = 1;
|
||||||
break;
|
break;
|
||||||
case GSS_S_CREDENTIALS_EXPIRED:
|
case GSS_S_CREDENTIALS_EXPIRED:
|
||||||
@ -2015,8 +2006,6 @@ AttemptGSSAPI(CONSCLIENT *pCL)
|
|||||||
Error("GSSAPI didn't work, %*s", dbuf.length, dbuf.value);
|
Error("GSSAPI didn't work, %*s", dbuf.length, dbuf.value);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(buf);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -2183,7 +2172,7 @@ CommandExamine(GRPENT *pGE, CONSCLIENT *pCLServing, CONSENT *pCEServing,
|
|||||||
char p = '\000';
|
char p = '\000';
|
||||||
switch (pCE->type) {
|
switch (pCE->type) {
|
||||||
case EXEC:
|
case EXEC:
|
||||||
d = (pCE->execSlaveFD > 0) ? pCE->execSlave : "(inactive)";
|
d = pCE->execSlave;
|
||||||
b = "Local";
|
b = "Local";
|
||||||
p = ' ';
|
p = ' ';
|
||||||
break;
|
break;
|
||||||
@ -2218,7 +2207,7 @@ CommandExamine(GRPENT *pGE, CONSCLIENT *pCLServing, CONSENT *pCEServing,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
FilePrint(pCLServing->fd, FLAGFALSE,
|
FilePrint(pCLServing->fd, FLAGFALSE,
|
||||||
" %-24.24s on %-32.32s at %7.7s%c\r\n", pCE->server, d,
|
" %-24.24s on %-32.32s at %6.6s%c\r\n", pCE->server, d,
|
||||||
b, p);
|
b, p);
|
||||||
if (args != (char *)0)
|
if (args != (char *)0)
|
||||||
break;
|
break;
|
||||||
@ -2351,8 +2340,7 @@ CommandInfo(GRPENT *pGE, CONSCLIENT *pCLServing, CONSENT *pCEServing,
|
|||||||
case EXEC:
|
case EXEC:
|
||||||
FilePrint(pCLServing->fd, FLAGTRUE, "|:%s,%lu,%s,%d:",
|
FilePrint(pCLServing->fd, FLAGTRUE, "|:%s,%lu,%s,%d:",
|
||||||
(pCE->exec != (char *)0 ? pCE->exec : "/bin/sh"),
|
(pCE->exec != (char *)0 ? pCE->exec : "/bin/sh"),
|
||||||
(unsigned long)pCE->ipid,
|
(unsigned long)pCE->ipid, pCE->execSlave,
|
||||||
(pCE->execSlaveFD > 0) ? pCE->execSlave : "(inactive)",
|
|
||||||
FileFDNum(pCE->cofile));
|
FileFDNum(pCE->cofile));
|
||||||
break;
|
break;
|
||||||
#if HAVE_FREEIPMI
|
#if HAVE_FREEIPMI
|
||||||
@ -3106,31 +3094,12 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
#define MAX_GSSAPI_TOKSIZE 64*1024
|
|
||||||
} else if (pCLServing->iState == S_IDENT &&
|
} else if (pCLServing->iState == S_IDENT &&
|
||||||
strcmp(pcCmd, "gssapi") == 0) {
|
strcmp(pcCmd, "gssapi") == 0) {
|
||||||
if (pcArgs == (char *)0) {
|
FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", -1);
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
/* Change the I/O mode right away, we'll do the read
|
||||||
"gssapi requires argument\r\n", -1);
|
* and accept when the select gets back to us */
|
||||||
} else {
|
pCLServing->ioState = INGSSACCEPT;
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", -1);
|
|
||||||
/* Read the token size but limit it to 64K,
|
|
||||||
* that's practical limit for GSSAPI krb5 mechanism.
|
|
||||||
*
|
|
||||||
* The client connection will be rejected for large
|
|
||||||
* requests as server will not be able to parse
|
|
||||||
* incomplete ASN.1 but this is intentional. */
|
|
||||||
pCLServing->tokenSize = (size_t) strtol(pcArgs, NULL, 10);
|
|
||||||
if (pCLServing->tokenSize > MAX_GSSAPI_TOKSIZE) {
|
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
|
||||||
"gssapi token size too large\r\n", -1);
|
|
||||||
pCLServing->tokenSize = MAX_GSSAPI_TOKSIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Change the I/O mode right away, we'll do the read
|
|
||||||
* and accept when the select gets back to us */
|
|
||||||
pCLServing->ioState = INGSSACCEPT;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
} else if (pCLServing->iState == S_IDENT &&
|
} else if (pCLServing->iState == S_IDENT &&
|
||||||
strcmp(pcCmd, "login") == 0) {
|
strcmp(pcCmd, "login") == 0) {
|
||||||
@ -3270,6 +3239,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
TagLogfileAct(pCEServing, "%s attached",
|
TagLogfileAct(pCEServing, "%s attached",
|
||||||
pCLServing->acid->string);
|
pCLServing->acid->string);
|
||||||
} else {
|
} else {
|
||||||
|
ClientWantsWrite(pCLServing);
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
FileWrite(pCLServing->fd, FLAGFALSE,
|
||||||
"[spy]\r\n", -1);
|
"[spy]\r\n", -1);
|
||||||
}
|
}
|
||||||
@ -3816,9 +3786,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
|
|
||||||
case 'c':
|
case 'c':
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"attach to toggle flow control]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
CommandChangeFlow(pGE, pCLServing,
|
CommandChangeFlow(pGE, pCLServing,
|
||||||
pCEServing, tyme);
|
pCEServing, tyme);
|
||||||
@ -3826,9 +3794,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
|
|
||||||
case 'd': /* down a console */
|
case 'd': /* down a console */
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"attach to down console]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
CommandDown(pGE, pCLServing, pCEServing,
|
CommandDown(pGE, pCLServing, pCEServing,
|
||||||
tyme);
|
tyme);
|
||||||
@ -3867,9 +3833,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
|
|
||||||
case 'L':
|
case 'L':
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"attach to toggle logging]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
CommandLogging(pGE, pCLServing, pCEServing,
|
CommandLogging(pGE, pCLServing, pCEServing,
|
||||||
tyme);
|
tyme);
|
||||||
@ -3877,9 +3841,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
|
|
||||||
case 'l': /* halt character 1 */
|
case 'l': /* halt character 1 */
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"attach to send break]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
if (pCEServing->fronly) {
|
if (pCEServing->fronly) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
FileWrite(pCLServing->fd, FLAGFALSE,
|
||||||
@ -3958,12 +3920,10 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 's': /* spy mode */
|
case 's': /* spy mode */
|
||||||
pCLServing->fwantwr = 0;
|
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"ok]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
pCLServing->fwantwr = 0;
|
||||||
BumpClient(pCEServing, (char *)0);
|
BumpClient(pCEServing, (char *)0);
|
||||||
TagLogfileAct(pCEServing, "%s detached",
|
TagLogfileAct(pCEServing, "%s detached",
|
||||||
pCLServing->acid->string);
|
pCLServing->acid->string);
|
||||||
@ -4025,9 +3985,7 @@ DoClientRead(GRPENT *pGE, CONSCLIENT *pCLServing)
|
|||||||
|
|
||||||
case '!': /* invoke a task */
|
case '!': /* invoke a task */
|
||||||
if (!pCLServing->fwr) {
|
if (!pCLServing->fwr) {
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
goto unknownchar;
|
||||||
"attach to invoke task]\r\n", -1);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
pCLServing->iState = S_TASK;
|
pCLServing->iState = S_TASK;
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE,
|
FileWrite(pCLServing->fd, FLAGFALSE,
|
||||||
@ -4194,8 +4152,9 @@ FlushConsole(CONSENT *pCEServing)
|
|||||||
unsigned char next =
|
unsigned char next =
|
||||||
(unsigned char)pCEServing->wbuf->string[offset + 1];
|
(unsigned char)pCEServing->wbuf->string[offset + 1];
|
||||||
if ((next >= '0' && next <= '9') ||
|
if ((next >= '0' && next <= '9') ||
|
||||||
(next >= 'a' && next <= 'z')
|
(next >= 'a' && next <= 'z') || (next == BREAK &&
|
||||||
|| (next == BREAK && pCEServing->type != HOST)) {
|
pCEServing->type !=
|
||||||
|
HOST)) {
|
||||||
CONDDEBUG((1, "Kiddie(): heavy IAC for [%s]",
|
CONDDEBUG((1, "Kiddie(): heavy IAC for [%s]",
|
||||||
pCEServing->server));
|
pCEServing->server));
|
||||||
offset += 2;
|
offset += 2;
|
||||||
@ -4250,10 +4209,10 @@ FlushConsole(CONSENT *pCEServing)
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
CONDDEBUG((1,
|
CONDDEBUG((1,
|
||||||
"Kiddie(): heavy IAC - doing Sleep() for [%s] (break #%c - delay %dms)",
|
"Kiddie(): heavy IAC - doing usleep() for [%s] (break #%c - delay %dms)",
|
||||||
pCEServing->server, next, delay));
|
pCEServing->server, next, delay));
|
||||||
if (delay != 0)
|
if (delay != 0)
|
||||||
Sleep(delay * 1000);
|
usleep(delay * 1000);
|
||||||
} else if (next == BREAK) {
|
} else if (next == BREAK) {
|
||||||
CONDDEBUG((1,
|
CONDDEBUG((1,
|
||||||
"Kiddie(): heavy IAC - sending break for [%s]",
|
"Kiddie(): heavy IAC - sending break for [%s]",
|
||||||
@ -4285,7 +4244,7 @@ FlushConsole(CONSENT *pCEServing)
|
|||||||
}
|
}
|
||||||
/* we do this 'cause we just potentially paused for
|
/* we do this 'cause we just potentially paused for
|
||||||
* a half-second doing a break...or even the
|
* a half-second doing a break...or even the
|
||||||
* intentional Sleep(). we could take out the
|
* intentional usleep(). we could take out the
|
||||||
* justHadDelay bits and continue with the stream,
|
* justHadDelay bits and continue with the stream,
|
||||||
* but this allows us to process other consoles and
|
* but this allows us to process other consoles and
|
||||||
* then come around and do more on this one. you
|
* then come around and do more on this one. you
|
||||||
@ -4905,8 +4864,8 @@ Kiddie(GRPENT *pGE, int sfd)
|
|||||||
CONDDEBUG((1, "Kiddie(): flushing fd %d",
|
CONDDEBUG((1, "Kiddie(): flushing fd %d",
|
||||||
FileFDNum(pCLServing->fd)));
|
FileFDNum(pCLServing->fd)));
|
||||||
if (FileWrite
|
if (FileWrite
|
||||||
(pCLServing->fd, FLAGFALSE, (char *)0, 0)
|
(pCLServing->fd, FLAGFALSE, (char *)0,
|
||||||
< 0) {
|
0) < 0) {
|
||||||
DisconnectClient(pGE, pCLServing, (char *)0,
|
DisconnectClient(pGE, pCLServing, (char *)0,
|
||||||
FLAGTRUE);
|
FLAGTRUE);
|
||||||
break;
|
break;
|
||||||
@ -5077,7 +5036,7 @@ Spawn(GRPENT *pGE, int msfd)
|
|||||||
struct sockaddr_in lstn_port;
|
struct sockaddr_in lstn_port;
|
||||||
# endif
|
# endif
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
int sock_opt_true = 1;
|
int true = 1;
|
||||||
# endif
|
# endif
|
||||||
unsigned short portInc = 0;
|
unsigned short portInc = 0;
|
||||||
#else
|
#else
|
||||||
@ -5104,8 +5063,8 @@ Spawn(GRPENT *pGE, int msfd)
|
|||||||
}
|
}
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
if (setsockopt
|
if (setsockopt
|
||||||
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
|
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
|
||||||
sizeof(sock_opt_true)) < 0) {
|
sizeof(true)) < 0) {
|
||||||
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
|
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
return;
|
return;
|
||||||
@ -5141,7 +5100,7 @@ Spawn(GRPENT *pGE, int msfd)
|
|||||||
hints.ai_flags =
|
hints.ai_flags =
|
||||||
AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV;
|
AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV;
|
||||||
snprintf(serv, sizeof(serv), "%hu",
|
snprintf(serv, sizeof(serv), "%hu",
|
||||||
(short)(bindBasePort + portInc));
|
bindBasePort + portInc);
|
||||||
error = getaddrinfo(host, serv, &hints, &res);
|
error = getaddrinfo(host, serv, &hints, &res);
|
||||||
if (error)
|
if (error)
|
||||||
goto OUT;
|
goto OUT;
|
||||||
@ -5236,8 +5195,7 @@ Spawn(GRPENT *pGE, int msfd)
|
|||||||
}
|
}
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
if (setsockopt
|
if (setsockopt
|
||||||
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true, sizeof(sock_opt_true))
|
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true)) < 0) {
|
||||||
< 0) {
|
|
||||||
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
|
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
Bye(EX_OSERR);
|
Bye(EX_OSERR);
|
||||||
@ -5289,7 +5247,7 @@ Spawn(GRPENT *pGE, int msfd)
|
|||||||
* possibly opens another socket to the port. this really is only
|
* possibly opens another socket to the port. this really is only
|
||||||
* an issue if you use the same port with -p and -b, i think.
|
* an issue if you use the same port with -p and -b, i think.
|
||||||
*/
|
*/
|
||||||
Sleep(750000); /* pause 0.75 sec to throttle startup a bit */
|
usleep(750000); /* pause 0.75 sec to throttle startup a bit */
|
||||||
pGE->pid = pid;
|
pGE->pid = pid;
|
||||||
return;
|
return;
|
||||||
case 0:
|
case 0:
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: group.h,v 5.52 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -83,6 +85,3 @@ extern void SendIWaitClientsMsg(CONSENT *, char *);
|
|||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
extern int AttemptSSL(CONSCLIENT *);
|
extern int AttemptSSL(CONSCLIENT *);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_GSSAPI
|
|
||||||
extern int AttemptGSSAPI(CONSCLIENT *);
|
|
||||||
#endif
|
|
||||||
|
|||||||
140
conserver/main.c
140
conserver/main.c
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: main.c,v 5.213 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -53,8 +55,8 @@ int fAll = 0, fNoinit = 0, fVersion = 0, fStrip = 0, fReopen =
|
|||||||
char *pcConfig = CONFIGFILE;
|
char *pcConfig = CONFIGFILE;
|
||||||
int cMaxMemb = MAXMEMB;
|
int cMaxMemb = MAXMEMB;
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
struct addrinfo *bindAddr = (struct addrinfo *)0;
|
struct addrinfo *bindAddr;
|
||||||
struct addrinfo *bindBaseAddr = (struct addrinfo *)0;
|
struct addrinfo *bindBaseAddr;
|
||||||
#else
|
#else
|
||||||
in_addr_t bindAddr = INADDR_ANY;
|
in_addr_t bindAddr = INADDR_ANY;
|
||||||
unsigned short bindPort;
|
unsigned short bindPort;
|
||||||
@ -84,77 +86,12 @@ unsigned long dmallocMarkMain = 0;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_OPENSSL
|
#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;
|
SSL_CTX *ctx = (SSL_CTX *)0;
|
||||||
DH *dh512 = (DH *)0;
|
DH *dh512 = (DH *)0;
|
||||||
DH *dh1024 = (DH *)0;
|
DH *dh1024 = (DH *)0;
|
||||||
DH *dh2048 = (DH *)0;
|
DH *dh2048 = (DH *)0;
|
||||||
DH *dh4096 = (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 *
|
DH *
|
||||||
GetDH512(void)
|
GetDH512(void)
|
||||||
@ -171,8 +108,17 @@ GetDH512(void)
|
|||||||
static unsigned char dh512_g[] = {
|
static unsigned char dh512_g[] = {
|
||||||
0x02,
|
0x02,
|
||||||
};
|
};
|
||||||
|
DH *dh;
|
||||||
|
|
||||||
return DHFromArray(dh512_p, sizeof(dh512_p), dh512_g, sizeof(dh512_g));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
DH *
|
DH *
|
||||||
@ -196,9 +142,17 @@ GetDH1024(void)
|
|||||||
static unsigned char dh1024_g[] = {
|
static unsigned char dh1024_g[] = {
|
||||||
0x02,
|
0x02,
|
||||||
};
|
};
|
||||||
|
DH *dh;
|
||||||
|
|
||||||
return DHFromArray(dh1024_p, sizeof(dh1024_p), dh1024_g,
|
if ((dh = DH_new()) == NULL)
|
||||||
sizeof(dh1024_g));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
DH *
|
DH *
|
||||||
@ -235,9 +189,17 @@ GetDH2048(void)
|
|||||||
static unsigned char dh2048_g[] = {
|
static unsigned char dh2048_g[] = {
|
||||||
0x02,
|
0x02,
|
||||||
};
|
};
|
||||||
|
DH *dh;
|
||||||
|
|
||||||
return DHFromArray(dh2048_p, sizeof(dh2048_p), dh2048_g,
|
if ((dh = DH_new()) == NULL)
|
||||||
sizeof(dh2048_g));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
DH *
|
DH *
|
||||||
@ -300,9 +262,17 @@ GetDH4096(void)
|
|||||||
static unsigned char dh4096_g[] = {
|
static unsigned char dh4096_g[] = {
|
||||||
0x02,
|
0x02,
|
||||||
};
|
};
|
||||||
|
DH *dh;
|
||||||
|
|
||||||
return DHFromArray(dh4096_p, sizeof(dh4096_p), dh4096_g,
|
if ((dh = DH_new()) == NULL)
|
||||||
sizeof(dh4096_g));
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
DH *
|
DH *
|
||||||
@ -336,14 +306,12 @@ SetupSSL(void)
|
|||||||
if (ctx == (SSL_CTX *)0) {
|
if (ctx == (SSL_CTX *)0) {
|
||||||
char *ciphers;
|
char *ciphers;
|
||||||
int verifymode;
|
int verifymode;
|
||||||
# if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
SSL_load_error_strings();
|
SSL_load_error_strings();
|
||||||
if (!SSL_library_init()) {
|
if (!SSL_library_init()) {
|
||||||
Error("SetupSSL(): SSL_library_init() failed");
|
Error("SetupSSL(): SSL_library_init() failed");
|
||||||
Bye(EX_SOFTWARE);
|
Bye(EX_SOFTWARE);
|
||||||
}
|
}
|
||||||
# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
if ((ctx = SSL_CTX_new(SSLv23_method())) == (SSL_CTX *)0) {
|
||||||
if ((ctx = SSL_CTX_new(TLS_method())) == (SSL_CTX *)0) {
|
|
||||||
Error("SetupSSL(): SSL_CTX_new() failed");
|
Error("SetupSSL(): SSL_CTX_new() failed");
|
||||||
Bye(EX_SOFTWARE);
|
Bye(EX_SOFTWARE);
|
||||||
}
|
}
|
||||||
@ -369,7 +337,7 @@ SetupSSL(void)
|
|||||||
}
|
}
|
||||||
ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
|
ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
|
||||||
} else {
|
} else {
|
||||||
ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
|
ciphers = "ALL:!LOW:!EXP:!MD5:@STRENGTH";
|
||||||
}
|
}
|
||||||
if (config->sslcacertificatefile != (char *)0) {
|
if (config->sslcacertificatefile != (char *)0) {
|
||||||
STACK_OF(X509_NAME) * cert_names;
|
STACK_OF(X509_NAME) * cert_names;
|
||||||
@ -781,10 +749,8 @@ DestroyDataStructures(void)
|
|||||||
|
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
/* clean up addrinfo stucts */
|
/* clean up addrinfo stucts */
|
||||||
if ((struct addrinfo *)0 != bindAddr)
|
freeaddrinfo(bindAddr);
|
||||||
freeaddrinfo(bindAddr);
|
freeaddrinfo(bindBaseAddr);
|
||||||
if ((struct addrinfo *)0 != bindBaseAddr)
|
|
||||||
freeaddrinfo(bindBaseAddr);
|
|
||||||
#else
|
#else
|
||||||
if (myAddrs != (struct in_addr *)0)
|
if (myAddrs != (struct in_addr *)0)
|
||||||
free(myAddrs);
|
free(myAddrs);
|
||||||
@ -1365,7 +1331,7 @@ main(int argc, char **argv)
|
|||||||
break;
|
break;
|
||||||
case 'O':
|
case 'O':
|
||||||
/* How often to try opening all down consoles, in minutes */
|
/* How often to try opening all down consoles, in minutes */
|
||||||
optConf->reinitcheck = atoi(optarg) * 60;
|
optConf->reinitcheck = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 'p':
|
case 'p':
|
||||||
if ((optConf->primaryport = StrDup(optarg)) == (char *)0)
|
if ((optConf->primaryport = StrDup(optarg)) == (char *)0)
|
||||||
@ -1454,10 +1420,6 @@ main(int argc, char **argv)
|
|||||||
#if !USE_IPV6
|
#if !USE_IPV6
|
||||||
ProbeInterfaces(bindAddr);
|
ProbeInterfaces(bindAddr);
|
||||||
#endif
|
#endif
|
||||||
#if !HAVE_CLOSEFROM
|
|
||||||
i = GetMaxFiles();
|
|
||||||
CONDDEBUG((1, "main(): GetMaxFiles=%d", i));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* initialize the timers */
|
/* initialize the timers */
|
||||||
for (i = 0; i < T_MAX; i++)
|
for (i = 0; i < T_MAX; i++)
|
||||||
@ -1772,9 +1734,9 @@ main(int argc, char **argv)
|
|||||||
remote++;
|
remote++;
|
||||||
setproctitle("master: port %hu, %d local, %d remote",
|
setproctitle("master: port %hu, %d local, %d remote",
|
||||||
# if USE_IPV6
|
# if USE_IPV6
|
||||||
(unsigned short)strtol(config->primaryport, NULL, 10),
|
config->primaryport,
|
||||||
# elif USE_UNIX_DOMAIN_SOCKETS
|
# elif USE_UNIX_DOMAIN_SOCKETS
|
||||||
(unsigned short)0,
|
0,
|
||||||
# else
|
# else
|
||||||
bindPort,
|
bindPort,
|
||||||
# endif
|
# endif
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: main.h,v 5.55 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -34,6 +36,7 @@
|
|||||||
|
|
||||||
/* program options and stuff
|
/* program options and stuff
|
||||||
*/
|
*/
|
||||||
|
extern char rcsid[];
|
||||||
extern int fAll, fNoinit, fInteractive, fStrip, fDaemon, fReopen,
|
extern int fAll, fNoinit, fInteractive, fStrip, fDaemon, fReopen,
|
||||||
fNoautoreup, fSyntaxOnly;
|
fNoautoreup, fSyntaxOnly;
|
||||||
#if USE_IPV6
|
#if USE_IPV6
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: master.c,v 5.141 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -560,13 +562,10 @@ DoNormalRead(CONSCLIENT *pCLServing)
|
|||||||
if (iSep >= 0) {
|
if (iSep >= 0) {
|
||||||
if (config->redirect == FLAGTRUE) {
|
if (config->redirect == FLAGTRUE) {
|
||||||
REMOTE *pRC;
|
REMOTE *pRC;
|
||||||
char *s;
|
|
||||||
for (pRC = pRCUniq; (REMOTE *)0 != pRC;
|
for (pRC = pRCUniq; (REMOTE *)0 != pRC;
|
||||||
pRC = pRC->pRCuniq) {
|
pRC = pRC->pRCuniq) {
|
||||||
s = ":@%s";
|
FilePrint(pCLServing->fd, FLAGTRUE,
|
||||||
s += iSep;
|
":@%s" + iSep, pRC->rhost);
|
||||||
FilePrint(pCLServing->fd, FLAGTRUE, s,
|
|
||||||
pRC->rhost);
|
|
||||||
iSep = 0;
|
iSep = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -645,14 +644,12 @@ DoNormalRead(CONSCLIENT *pCLServing)
|
|||||||
strcmp(pcCmd, "groups") == 0) {
|
strcmp(pcCmd, "groups") == 0) {
|
||||||
int iSep = 1;
|
int iSep = 1;
|
||||||
GRPENT *pGE;
|
GRPENT *pGE;
|
||||||
char *s;
|
|
||||||
|
|
||||||
for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
|
for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
|
||||||
if (0 == pGE->imembers)
|
if (0 == pGE->imembers)
|
||||||
continue;
|
continue;
|
||||||
s = ":%hu";
|
FilePrint(pCLServing->fd, FLAGTRUE, ":%hu" + iSep,
|
||||||
s += iSep;
|
pGE->port);
|
||||||
FilePrint(pCLServing->fd, FLAGTRUE, s, pGE->port);
|
|
||||||
iSep = 0;
|
iSep = 0;
|
||||||
}
|
}
|
||||||
FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", 2);
|
FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", 2);
|
||||||
@ -690,7 +687,7 @@ Master(void)
|
|||||||
struct sockaddr_in master_port;
|
struct sockaddr_in master_port;
|
||||||
# endif
|
# endif
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
int sock_opt_true = 1;
|
int true = 1;
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
struct sockaddr_un master_port;
|
struct sockaddr_un master_port;
|
||||||
@ -750,8 +747,8 @@ Master(void)
|
|||||||
|
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
if (setsockopt
|
if (setsockopt
|
||||||
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
|
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
|
||||||
sizeof(sock_opt_true)) < 0)
|
sizeof(true)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
# endif
|
# endif
|
||||||
if (!SetFlags(msfd, O_NONBLOCK, 0))
|
if (!SetFlags(msfd, O_NONBLOCK, 0))
|
||||||
@ -821,8 +818,8 @@ Master(void)
|
|||||||
}
|
}
|
||||||
# if HAVE_SETSOCKOPT
|
# if HAVE_SETSOCKOPT
|
||||||
if (setsockopt
|
if (setsockopt
|
||||||
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
|
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
|
||||||
sizeof(sock_opt_true)) < 0) {
|
sizeof(true)) < 0) {
|
||||||
Error("Master(): setsockopt(%u,SO_REUSEADDR): %s", msfd,
|
Error("Master(): setsockopt(%u,SO_REUSEADDR): %s", msfd,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
return;
|
return;
|
||||||
@ -945,8 +942,8 @@ Master(void)
|
|||||||
CONDDEBUG((1, "Master(): flushing fd %d",
|
CONDDEBUG((1, "Master(): flushing fd %d",
|
||||||
FileFDNum(pCLServing->fd)));
|
FileFDNum(pCLServing->fd)));
|
||||||
if (FileWrite
|
if (FileWrite
|
||||||
(pCLServing->fd, FLAGFALSE, (char *)0, 0)
|
(pCLServing->fd, FLAGFALSE, (char *)0,
|
||||||
< 0) {
|
0) < 0) {
|
||||||
DropMasterClient(pCLServing, FLAGTRUE);
|
DropMasterClient(pCLServing, FLAGTRUE);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: master.h,v 5.18 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: readcfg.c,v 5.207 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -987,13 +989,6 @@ SubstValue(char c, char **s, int *i)
|
|||||||
(*s) = pCE->replstring;
|
(*s) = pCE->replstring;
|
||||||
}
|
}
|
||||||
retval = 1;
|
retval = 1;
|
||||||
} else if (c == 'b') {
|
|
||||||
if (pCE->baud == NULL || pCE->baud->acrate == (char *)0) {
|
|
||||||
(*s) = empty;
|
|
||||||
} else {
|
|
||||||
(*s) = pCE->baud->acrate;
|
|
||||||
}
|
|
||||||
retval = 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1020,7 +1015,6 @@ SubstToken(char c)
|
|||||||
return ISNUMBER;
|
return ISNUMBER;
|
||||||
case 'h':
|
case 'h':
|
||||||
case 'c':
|
case 'c':
|
||||||
case 'b':
|
|
||||||
case 'r':
|
case 'r':
|
||||||
substTokenCount[(unsigned)c]++;
|
substTokenCount[(unsigned)c]++;
|
||||||
return ISSTRING;
|
return ISSTRING;
|
||||||
@ -3124,7 +3118,7 @@ ConsoleAdd(CONSENT *c)
|
|||||||
pCEmatch->logfilemax = c->logfilemax;
|
pCEmatch->logfilemax = c->logfilemax;
|
||||||
if (pCEmatch->logfilemax != (off_t) 0 &&
|
if (pCEmatch->logfilemax != (off_t) 0 &&
|
||||||
timers[T_ROLL] == (time_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->motd, &c->motd);
|
||||||
SwapStr(&pCEmatch->idlestring, &c->idlestring);
|
SwapStr(&pCEmatch->idlestring, &c->idlestring);
|
||||||
@ -4562,7 +4556,6 @@ void
|
|||||||
ConfigItemReinitcheck(char *id)
|
ConfigItemReinitcheck(char *id)
|
||||||
{
|
{
|
||||||
char *p;
|
char *p;
|
||||||
int factor = 0;
|
|
||||||
|
|
||||||
CONDDEBUG((1, "ConfigItemReinitcheck(%s) [%s:%d]", id, file, line));
|
CONDDEBUG((1, "ConfigItemReinitcheck(%s) [%s:%d]", id, file, line));
|
||||||
|
|
||||||
@ -4571,22 +4564,18 @@ ConfigItemReinitcheck(char *id)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (p = id; factor == 0 && *p != '\000'; p++)
|
for (p = id; *p != '\000'; p++)
|
||||||
if (*p == 's' || *p == 'S')
|
if (!isdigit((int)(*p)))
|
||||||
factor = 1;
|
|
||||||
else if (*p == 'm' || *p == 'M')
|
|
||||||
factor = 60;
|
|
||||||
else if (!isdigit((int)(*p)))
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* if it wasn't a number or a qualifier wasn't at the end */
|
/* if it wasn't a number */
|
||||||
if (*p != '\000') {
|
if (*p != '\000') {
|
||||||
if (isMaster)
|
if (isMaster)
|
||||||
Error("invalid reinitcheck value `%s' [%s:%d]", id, file,
|
Error("invalid reinitcheck value `%s' [%s:%d]", id, file,
|
||||||
line);
|
line);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
parserConfigTemp->reinitcheck = atoi(id) * (factor == 0 ? 60 : factor);
|
parserConfigTemp->reinitcheck = atoi(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -5387,12 +5376,7 @@ ReReadCfg(int fd, int msfd)
|
|||||||
local += pGE->imembers;
|
local += pGE->imembers;
|
||||||
for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
|
for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
|
||||||
remote++;
|
remote++;
|
||||||
setproctitle("master: port %hu, %d local, %d remote",
|
setproctitle("master: port %hu, %d local, %d remote", bindPort,
|
||||||
# if !USE_UNIX_DOMAIN_SOCKETS
|
|
||||||
(unsigned short)strtol(config->primaryport, NULL, 10),
|
|
||||||
# else
|
|
||||||
(unsigned short)0,
|
|
||||||
# endif
|
|
||||||
local, remote);
|
local, remote);
|
||||||
} else
|
} else
|
||||||
setproctitle("group %u: port %hu, %d %s", pGroups->id,
|
setproctitle("group %u: port %hu, %d %s", pGroups->id,
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: readcfg.h,v 5.51 2015/06/02 17:19:31 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -18,7 +20,7 @@ typedef struct config {
|
|||||||
char *primaryport;
|
char *primaryport;
|
||||||
FLAG redirect;
|
FLAG redirect;
|
||||||
FLAG loghostnames;
|
FLAG loghostnames;
|
||||||
int reinitcheck; /* stored in sec, configured in min or sec */
|
int reinitcheck;
|
||||||
char *secondaryport;
|
char *secondaryport;
|
||||||
char *unifiedlog;
|
char *unifiedlog;
|
||||||
int initdelay;
|
int initdelay;
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: version.h,v 1.82 2015/06/01 15:36:59 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -12,9 +14,8 @@
|
|||||||
@(#) Copyright 2000 conserver.com.\n\
|
@(#) Copyright 2000 conserver.com.\n\
|
||||||
All rights reserved.\n"
|
All rights reserved.\n"
|
||||||
|
|
||||||
#define VERSION_DATE "2022/07/07"
|
|
||||||
#define VERSION_MAJOR 8
|
#define VERSION_MAJOR 8
|
||||||
#define VERSION_MINOR 2
|
#define VERSION_MINOR 2
|
||||||
#define VERSION_REV 7
|
#define VERSION_REV 1
|
||||||
#define VERSION_TEXT "conserver.com version"
|
#define VERSION_TEXT "conserver.com version"
|
||||||
#define VERSION_UINT (VERSION_MAJOR * 1000000 + VERSION_MINOR * 1000 + VERSION_REV)
|
#define VERSION_UINT (VERSION_MAJOR * 1000000 + VERSION_MINOR * 1000 + VERSION_REV)
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
### Path settings
|
### Path settings
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
VPATH = @srcdir@
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: console.c,v 5.191 2015/06/01 15:36:59 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -34,6 +36,8 @@
|
|||||||
#include <readconf.h>
|
#include <readconf.h>
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
|
# include <openssl/ssl.h>
|
||||||
|
# include <openssl/err.h>
|
||||||
# include <openssl/opensslv.h>
|
# include <openssl/opensslv.h>
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
@ -74,14 +78,12 @@ SetupSSL(void)
|
|||||||
{
|
{
|
||||||
if (ctx == (SSL_CTX *)0) {
|
if (ctx == (SSL_CTX *)0) {
|
||||||
char *ciphers;
|
char *ciphers;
|
||||||
# if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
SSL_load_error_strings();
|
SSL_load_error_strings();
|
||||||
if (!SSL_library_init()) {
|
if (!SSL_library_init()) {
|
||||||
Error("SSL library initialization failed");
|
Error("SSL library initialization failed");
|
||||||
Bye(EX_UNAVAILABLE);
|
Bye(EX_UNAVAILABLE);
|
||||||
}
|
}
|
||||||
# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
if ((ctx = SSL_CTX_new(SSLv23_method())) == (SSL_CTX *)0) {
|
||||||
if ((ctx = SSL_CTX_new(TLS_method())) == (SSL_CTX *)0) {
|
|
||||||
Error("Creating SSL context failed");
|
Error("Creating SSL context failed");
|
||||||
Bye(EX_UNAVAILABLE);
|
Bye(EX_UNAVAILABLE);
|
||||||
}
|
}
|
||||||
@ -121,7 +123,7 @@ SetupSSL(void)
|
|||||||
# if defined(REQ_SERVER_CERT)
|
# if defined(REQ_SERVER_CERT)
|
||||||
ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
|
ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
|
||||||
# else
|
# else
|
||||||
ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
|
ciphers = "ALL:!LOW:!EXP:!MD5:@STRENGTH";
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, SSLVerifyCallback);
|
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, SSLVerifyCallback);
|
||||||
@ -167,12 +169,11 @@ AttemptSSL(CONSFILE *pcf)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
#define MAX_GSSAPI_TOKSIZE 64*1024
|
|
||||||
gss_name_t gss_server_name = GSS_C_NO_NAME;
|
gss_name_t gss_server_name = GSS_C_NO_NAME;
|
||||||
gss_ctx_id_t secctx = GSS_C_NO_CONTEXT;
|
gss_ctx_id_t secctx = GSS_C_NO_CONTEXT;
|
||||||
gss_buffer_desc mytok = GSS_C_EMPTY_BUFFER;
|
gss_buffer_desc mytok = GSS_C_EMPTY_BUFFER;
|
||||||
|
|
||||||
size_t
|
int
|
||||||
CanGetGSSContext(const char *servername)
|
CanGetGSSContext(const char *servername)
|
||||||
{
|
{
|
||||||
char namestr[128];
|
char namestr[128];
|
||||||
@ -209,22 +210,18 @@ CanGetGSSContext(const char *servername)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
AttemptGSSAPI(CONSFILE *pcf, size_t toksize)
|
AttemptGSSAPI(CONSFILE *pcf)
|
||||||
{
|
{
|
||||||
OM_uint32 stmaj, stmin;
|
OM_uint32 stmaj, stmin;
|
||||||
gss_buffer_desc servertok;
|
gss_buffer_desc servertok;
|
||||||
char *buf = NULL;
|
char buf[1024];
|
||||||
int nr;
|
int nr;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
buf = malloc(toksize);
|
|
||||||
if (buf == NULL) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
FileSetQuoteIAC(pcf, FLAGFALSE);
|
FileSetQuoteIAC(pcf, FLAGFALSE);
|
||||||
FileWrite(pcf, FLAGFALSE, mytok.value, mytok.length);
|
FileWrite(pcf, FLAGFALSE, mytok.value, mytok.length);
|
||||||
FileSetQuoteIAC(pcf, FLAGTRUE);
|
FileSetQuoteIAC(pcf, FLAGTRUE);
|
||||||
nr = FileRead(pcf, buf, toksize);
|
nr = FileRead(pcf, buf, sizeof(buf));
|
||||||
servertok.length = nr;
|
servertok.length = nr;
|
||||||
servertok.value = buf;
|
servertok.value = buf;
|
||||||
|
|
||||||
@ -238,7 +235,6 @@ AttemptGSSAPI(CONSFILE *pcf, size_t toksize)
|
|||||||
|
|
||||||
ret = (stmaj == GSS_S_COMPLETE);
|
ret = (stmaj == GSS_S_COMPLETE);
|
||||||
gss_release_name(&stmin, &gss_server_name);
|
gss_release_name(&stmin, &gss_server_name);
|
||||||
free(buf);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -291,7 +287,6 @@ Usage(int wantfull)
|
|||||||
"f(F) force read/write connection (and replay)",
|
"f(F) force read/write connection (and replay)",
|
||||||
"h output this message",
|
"h output this message",
|
||||||
"i(I) display status info in machine-parseable form (on master)",
|
"i(I) display status info in machine-parseable form (on master)",
|
||||||
"k abort connection if the console is not 'up'",
|
|
||||||
"l user use username instead of current username",
|
"l user use username instead of current username",
|
||||||
"M master master server to poll first",
|
"M master master server to poll first",
|
||||||
"n do not read system-wide config file",
|
"n do not read system-wide config file",
|
||||||
@ -319,7 +314,7 @@ Usage(int wantfull)
|
|||||||
%s [generic-args] [-iIuwWx] [console]\n\
|
%s [generic-args] [-iIuwWx] [console]\n\
|
||||||
%s [generic-args] [-hPqQrRV] [-[bB] message] [-d [user][@console]]\n\
|
%s [generic-args] [-hPqQrRV] [-[bB] message] [-d [user][@console]]\n\
|
||||||
[-t [user][@console] message] [-[zZ] cmd]\n\n\
|
[-t [user][@console] message] [-[zZ] cmd]\n\n\
|
||||||
generic-args: [-7DEknUv] [-c cred] [-C config] [-M master]\n\
|
generic-args: [-7DEnUv] [-c cred] [-C config] [-M master]\n\
|
||||||
[-p port] [-l username]\n", progname, progname, progname);
|
[-p port] [-l username]\n", progname, progname, progname);
|
||||||
|
|
||||||
if (wantfull) {
|
if (wantfull) {
|
||||||
@ -917,19 +912,11 @@ ExecCmd(void)
|
|||||||
/* setup new process with clean file descriptors
|
/* setup new process with clean file descriptors
|
||||||
* stderr still goes to stderr...so user sees it
|
* stderr still goes to stderr...so user sees it
|
||||||
*/
|
*/
|
||||||
#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();
|
i = GetMaxFiles();
|
||||||
for ( /* i above */ ; --i > 2;) {
|
for ( /* i above */ ; --i > 3;) {
|
||||||
if (i != pout[0] && i != pin[1])
|
if (i != pout[0] && i != pin[1])
|
||||||
close(i);
|
close(i);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
close(1);
|
close(1);
|
||||||
close(0);
|
close(0);
|
||||||
|
|
||||||
@ -1478,13 +1465,8 @@ CallUp(CONSFILE *pcf, char *pcMaster, char *pcMach, char *pcHow,
|
|||||||
/* try to grok the state of the console */
|
/* try to grok the state of the console */
|
||||||
FilePrint(pcf, FLAGFALSE, "%c%c=", chAttn, chEsc);
|
FilePrint(pcf, FLAGFALSE, "%c%c=", chAttn, chEsc);
|
||||||
r = ReadReply(pcf, FLAGFALSE);
|
r = ReadReply(pcf, FLAGFALSE);
|
||||||
if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0) {
|
if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0)
|
||||||
FileWrite(cfstdout, FLAGFALSE, r, -1);
|
FileWrite(cfstdout, FLAGFALSE, r, -1);
|
||||||
if (config->exitdown == FLAGTRUE) {
|
|
||||||
Error("Console is not 'up'. Exiting. (-k)");
|
|
||||||
Bye(EX_UNAVAILABLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* try to grok the version of the server */
|
/* try to grok the version of the server */
|
||||||
FilePrint(pcf, FLAGFALSE, "%c%c%c", chAttn, chEsc, 0xD6);
|
FilePrint(pcf, FLAGFALSE, "%c%c%c", chAttn, chEsc, 0xD6);
|
||||||
@ -1592,7 +1574,7 @@ DoCmds(char *master, char *pports, int cmdi)
|
|||||||
char *pcopy;
|
char *pcopy;
|
||||||
char *serverName;
|
char *serverName;
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
size_t toksize;
|
int toksize;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((pcopy = ports = StrDup(pports)) == (char *)0)
|
if ((pcopy = ports = StrDup(pports)) == (char *)0)
|
||||||
@ -1677,16 +1659,10 @@ DoCmds(char *master, char *pports, int cmdi)
|
|||||||
#endif
|
#endif
|
||||||
#if HAVE_GSSAPI
|
#if HAVE_GSSAPI
|
||||||
if ((toksize = CanGetGSSContext(server)) > 0) {
|
if ((toksize = CanGetGSSContext(server)) > 0) {
|
||||||
if (toksize > MAX_GSSAPI_TOKSIZE) {
|
|
||||||
Error("Maximum support GSSAPI token size is %lu, "
|
|
||||||
"GSSAPI context creation reported %lu. "
|
|
||||||
"Server will reject authentication.",
|
|
||||||
MAX_GSSAPI_TOKSIZE, toksize);
|
|
||||||
}
|
|
||||||
FilePrint(pcf, FLAGFALSE, "gssapi %d\r\n", toksize);
|
FilePrint(pcf, FLAGFALSE, "gssapi %d\r\n", toksize);
|
||||||
t = ReadReply(pcf, FLAGFALSE);
|
t = ReadReply(pcf, FLAGFALSE);
|
||||||
if (strcmp(t, "ok\r\n") == 0) {
|
if (strcmp(t, "ok\r\n") == 0) {
|
||||||
if (AttemptGSSAPI(pcf, toksize)) {
|
if (AttemptGSSAPI(pcf)) {
|
||||||
goto gssapi_logged_me_in;
|
goto gssapi_logged_me_in;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1781,12 +1757,6 @@ DoCmds(char *master, char *pports, int cmdi)
|
|||||||
}
|
}
|
||||||
FileWrite(pcf, FLAGFALSE, "exit\r\n", 6);
|
FileWrite(pcf, FLAGFALSE, "exit\r\n", 6);
|
||||||
t = ReadReply(pcf, FLAGTRUE);
|
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 {
|
} else {
|
||||||
/* if we're not trying to connect to a console */
|
/* if we're not trying to connect to a console */
|
||||||
if (interact == FLAGFALSE) {
|
if (interact == FLAGFALSE) {
|
||||||
@ -1891,7 +1861,7 @@ DoCmds(char *master, char *pports, int cmdi)
|
|||||||
FileClose(&pcf);
|
FileClose(&pcf);
|
||||||
|
|
||||||
/* this would only be true if we got extra redirects (@... above) */
|
/* this would only be true if we got extra redirects (@... above) */
|
||||||
if (cmds[cmdi][0] == 'c')
|
if (cmds[cmdi][0] == 'c' && interact == FLAGTRUE)
|
||||||
DoCmds(server, result, cmdi);
|
DoCmds(server, result, cmdi);
|
||||||
else if (cmdi > 0)
|
else if (cmdi > 0)
|
||||||
DoCmds(server, result, cmdi - 1);
|
DoCmds(server, result, cmdi - 1);
|
||||||
@ -1923,7 +1893,7 @@ main(int argc, char **argv)
|
|||||||
int fLocal;
|
int fLocal;
|
||||||
static STRING *acPorts = (STRING *)0;
|
static STRING *acPorts = (STRING *)0;
|
||||||
static char acOpts[] =
|
static char acOpts[] =
|
||||||
"7aAb:B:c:C:d:De:EfFhikIl:M:np:PqQrRsSt:uUvVwWxz:Z:";
|
"7aAb:B:c:C:d:De:EfFhiIl:M:np:PqQrRsSt:uUvVwWxz:Z:";
|
||||||
extern int optind;
|
extern int optind;
|
||||||
extern int optopt;
|
extern int optopt;
|
||||||
extern char *optarg;
|
extern char *optarg;
|
||||||
@ -2053,10 +2023,6 @@ main(int argc, char **argv)
|
|||||||
pcCmd = "info";
|
pcCmd = "info";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'k':
|
|
||||||
optConf->exitdown = FLAGTRUE;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'l':
|
case 'l':
|
||||||
if ((optConf->username = StrDup(optarg)) == (char *)0)
|
if ((optConf->username = StrDup(optarg)) == (char *)0)
|
||||||
OutOfMem();
|
OutOfMem();
|
||||||
@ -2254,13 +2220,6 @@ main(int argc, char **argv)
|
|||||||
else
|
else
|
||||||
config->striphigh = FLAGFALSE;
|
config->striphigh = FLAGFALSE;
|
||||||
|
|
||||||
if (optConf->exitdown != FLAGUNKNOWN)
|
|
||||||
config->exitdown = optConf->exitdown;
|
|
||||||
else if (pConfig->exitdown != FLAGUNKNOWN)
|
|
||||||
config->exitdown = pConfig->exitdown;
|
|
||||||
else
|
|
||||||
config->exitdown = FLAGFALSE;
|
|
||||||
|
|
||||||
if (optConf->escape != (char *)0)
|
if (optConf->escape != (char *)0)
|
||||||
ParseEsc(optConf->escape);
|
ParseEsc(optConf->escape);
|
||||||
else if (pConfig->escape != (char *)0)
|
else if (pConfig->escape != (char *)0)
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
.TH CONSOLE 1 "@CONSERVER_DATE@" "conserver-@CONSERVER_VERSION@" "conserver"
|
.\" $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"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
console \- console server client program
|
console \- console server client program
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -28,7 +29,7 @@ console \- console server client program
|
|||||||
.IR cmd ]
|
.IR cmd ]
|
||||||
.PP
|
.PP
|
||||||
.IR generic-args :
|
.IR generic-args :
|
||||||
.RB [ \-7DEknUv ]
|
.RB [ \-7DEnUv ]
|
||||||
.RB [ \-c
|
.RB [ \-c
|
||||||
.IR cred ]
|
.IR cred ]
|
||||||
.RB [ \-C
|
.RB [ \-C
|
||||||
@ -178,10 +179,6 @@ Same as
|
|||||||
.B \-i
|
.B \-i
|
||||||
but just acts on the primary server.
|
but just acts on the primary server.
|
||||||
.TP
|
.TP
|
||||||
.B \-k
|
|
||||||
Abort the connection if the console is not in the `up' state immediately
|
|
||||||
upon connecting.
|
|
||||||
.TP
|
|
||||||
.BI \-l user
|
.BI \-l user
|
||||||
Set the login name used for authentication to
|
Set the login name used for authentication to
|
||||||
.IR user .
|
.IR user .
|
||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: getpassword.c,v 1.9 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: getpassword.h,v 1.4 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: readconf.c,v 5.8 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
* $Id: readconf.h,v 5.7 2014/04/20 06:45:07 bryan Exp $
|
||||||
|
*
|
||||||
* Copyright conserver.com, 2000
|
* Copyright conserver.com, 2000
|
||||||
*
|
*
|
||||||
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
* Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
|
||||||
@ -12,7 +14,6 @@ typedef struct config {
|
|||||||
char *port;
|
char *port;
|
||||||
char *escape;
|
char *escape;
|
||||||
FLAG striphigh;
|
FLAG striphigh;
|
||||||
FLAG exitdown;
|
|
||||||
unsigned short replay;
|
unsigned short replay;
|
||||||
unsigned short playback;
|
unsigned short playback;
|
||||||
#if HAVE_OPENSSL
|
#if HAVE_OPENSSL
|
||||||
|
|||||||
@ -22,3 +22,7 @@ I can't verify that these scripts will work for everyone. Hopefully they
|
|||||||
will be helpful.
|
will be helpful.
|
||||||
|
|
||||||
Bryan Stansell
|
Bryan Stansell
|
||||||
|
|
||||||
|
#
|
||||||
|
# $Id: README,v 1.4 2003/09/29 14:29:37 bryan Exp $
|
||||||
|
#
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
# platform that doesn't have red hat rpm >= 4.0.2 installed.
|
# platform that doesn't have red hat rpm >= 4.0.2 installed.
|
||||||
#
|
#
|
||||||
|
|
||||||
%define pkg conserver
|
%define pkg conserver
|
||||||
%define ver
|
%define ver 8.2.1
|
||||||
|
|
||||||
# define the name of the machine on which the main conserver
|
# define the name of the machine on which the main conserver
|
||||||
# daemon will be running if you don't want to use the default
|
# daemon will be running if you don't want to use the default
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
PKG="conserver"
|
PKG="conserver"
|
||||||
NAME="Console server and client"
|
NAME="Console server and client"
|
||||||
CATEGORY="system"
|
CATEGORY="system"
|
||||||
VERSION=
|
VERSION="8.2.1"
|
||||||
DESC="Console server and client"
|
DESC="Console server and client"
|
||||||
CLASSES=none
|
CLASSES=none
|
||||||
ARCH=sparc
|
ARCH=sparc
|
||||||
|
|||||||
22
gen-version
22
gen-version
@ -1,22 +0,0 @@
|
|||||||
#!/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
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
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
|
|
||||||
1795
package/config.sub
vendored
1795
package/config.sub
vendored
File diff suppressed because it is too large
Load Diff
@ -1,10 +0,0 @@
|
|||||||
#!/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>)$//'
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
#!/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 bstansell/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 bstansell/conserver publish v$ver
|
|
||||||
else
|
|
||||||
echo Ok, here is the command I would have used:
|
|
||||||
echo " "git push --tags
|
|
||||||
echo " "githubrelease release bstansell/conserver create --name conserver-$ver --body \""$body"\" v$ver ../conserver-$ver.tar.gz*
|
|
||||||
fi
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
#!/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]
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
#!/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
|
|
||||||
@ -1,3 +1,3 @@
|
|||||||
shellb on at Local
|
shellb on at Local
|
||||||
shella on at Local
|
shella on at Local
|
||||||
shell on at Local
|
shell on at Local
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
shell on at Local
|
shell on at Local
|
||||||
|
|||||||
@ -7,9 +7,6 @@ default * {
|
|||||||
timestamp "";
|
timestamp "";
|
||||||
include full;
|
include full;
|
||||||
}
|
}
|
||||||
config * {
|
|
||||||
reinitcheck 1s;
|
|
||||||
}
|
|
||||||
break 5 {
|
break 5 {
|
||||||
string "\rtest\r";
|
string "\rtest\r";
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user