mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
41f63b6e5d
When anyone connects to a PuTTY tool's listening socket - whether it's
a user of a local->remote port forwarding, a connection-sharing
downstream or a client of Pageant - we'd like to log as much
information as we can find out about where the connection came from.
To that end, I've implemented a function sk_peer_info() in the socket
abstraction, which returns a freeform text string as best it can (or
NULL, if it can't get anything at all) describing the thing at the
other end of the connection. For TCP connections, this is done using
getpeername() to get an IP address and port in the obvious way; for
Unix-domain sockets, we attempt SO_PEERCRED (conditionalised on some
moderately hairy autoconfery) to get the pid and owner of the peer. I
haven't implemented anything for Windows named pipes, but I will if I
hear of anything useful.
(cherry picked from commit c8f83979a3)
Conflicts:
pageant.c
Cherry-picker's notes: the conflict was because the original commit
also added a use of the same feature in the centralised Pageant code,
which doesn't exist on this branch. Also I had to remove 'const' from
the type of the second parameter to wrap_send_port_open(), since this
branch hasn't had the same extensive const-fixing as master.
221 lines
6.3 KiB
Plaintext
221 lines
6.3 KiB
Plaintext
# To compile this into a configure script, you need:
|
|
# * Autoconf 2.50 or newer
|
|
# * Gtk (for $prefix/share/aclocal/gtk.m4)
|
|
# * Automake (for aclocal)
|
|
# If you've got them, running "autoreconf" should work.
|
|
|
|
# Version number is substituted by Buildscr for releases, snapshots
|
|
# and custom builds out of svn; X.XX shows up in ad-hoc developer
|
|
# builds, which shouldn't matter
|
|
AC_INIT(putty, X.XX)
|
|
AC_CONFIG_FILES([Makefile])
|
|
AC_CONFIG_HEADERS([uxconfig.h:uxconfig.in])
|
|
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
|
|
|
AC_PROG_INSTALL
|
|
AC_PROG_RANLIB
|
|
ifdef([AM_PROG_AR],[AM_PROG_AR])
|
|
AM_PROG_CC_C_O
|
|
|
|
# Mild abuse of the '--enable' option format to allow manual
|
|
# specification of setuid or setgid setup in pterm.
|
|
setidtype=none
|
|
AC_ARG_ENABLE([setuid],
|
|
[AS_HELP_STRING([--enable-setuid=USER],
|
|
[make pterm setuid to a given user])],
|
|
[case "$enableval" in
|
|
no) setidtype=none;;
|
|
*) setidtype=setuid; setidval="$enableval";;
|
|
esac])
|
|
AC_ARG_ENABLE([setgid],
|
|
[AS_HELP_STRING([--enable-setgid=GROUP],
|
|
[make pterm setgid to a given group])],
|
|
[case "$enableval" in
|
|
no) setidtype=none;;
|
|
*) setidtype=setgid; setidval="$enableval";;
|
|
esac])
|
|
AM_CONDITIONAL(HAVE_SETID_CMD, [test "$setidtype" != "none"])
|
|
AS_IF([test "x$setidtype" = "xsetuid"],
|
|
[SETID_CMD="chown $setidval"; SETID_MODE="4755"])
|
|
AS_IF([test "x$setidtype" = "xsetgid"],
|
|
[SETID_CMD="chgrp $setidval"; SETID_MODE="2755"])
|
|
AC_SUBST(SETID_CMD)
|
|
AC_SUBST(SETID_MODE)
|
|
|
|
AC_ARG_WITH([gssapi],
|
|
[AS_HELP_STRING([--without-gssapi],
|
|
[disable GSSAPI support])],
|
|
[],
|
|
[with_gssapi=yes])
|
|
|
|
WITH_GSSAPI=
|
|
AS_IF([test "x$with_gssapi" != xno],
|
|
[AC_DEFINE([WITH_GSSAPI], [1], [Define if building with GSSAPI support.])])
|
|
|
|
AC_ARG_WITH([gtk],
|
|
[AS_HELP_STRING([--with-gtk=VER],
|
|
[specify GTK version to use (`1' or `2')])
|
|
AS_HELP_STRING([--without-gtk],
|
|
[do not use GTK (build command-line tools only)])],
|
|
[gtk_version_desired="$withval"],
|
|
[gtk_version_desired="any"])
|
|
|
|
case "$gtk_version_desired" in
|
|
1 | 2 | any | no) ;;
|
|
yes) gtk_version_desired="any" ;;
|
|
*) AC_ERROR([Invalid GTK version specified])
|
|
esac
|
|
|
|
AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
|
|
#include <sys/types.h>
|
|
#include <utmp.h>])
|
|
|
|
# Look for both GTK 2 and GTK 1, in descending order of preference. If
|
|
# we can't find either, have the makefile only build the CLI programs.
|
|
|
|
gtk=none
|
|
|
|
case "$gtk_version_desired:$gtk" in
|
|
2:none | any:none)
|
|
ifdef([AM_PATH_GTK_2_0],[
|
|
AM_PATH_GTK_2_0([2.0.0], [gtk=2], [])
|
|
],[AC_WARNING([generating configure script without GTK 2 autodetection])])
|
|
;;
|
|
esac
|
|
|
|
case "$gtk_version_desired:$gtk" in
|
|
1:none | any:none)
|
|
ifdef([AM_PATH_GTK],[
|
|
AM_PATH_GTK([1.2.0], [gtk=1], [])
|
|
],[
|
|
# manual check for gtk1
|
|
AC_PATH_PROG(GTK1_CONFIG, gtk-config, absent)
|
|
if test "$GTK1_CONFIG" != "absent"; then
|
|
GTK_CFLAGS=`"$GTK1_CONFIG" --cflags`
|
|
GTK_LIBS=`"$GTK1_CONFIG" --libs`
|
|
gtk=1
|
|
fi
|
|
])
|
|
;;
|
|
esac
|
|
|
|
AM_CONDITIONAL(HAVE_GTK, [test "$gtk" != "none"])
|
|
|
|
if test "$gtk" = "2"; then
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
ac_save_LIBS="$LIBS"
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
LIBS="$GTK_LIBS $LIBS"
|
|
AC_CHECK_FUNCS([pango_font_family_is_monospace pango_font_map_list_families])
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
LIBS="$ac_save_LIBS"
|
|
fi
|
|
|
|
AC_SEARCH_LIBS([socket], [xnet])
|
|
|
|
AS_IF([test "x$with_gssapi" != xno],
|
|
[AC_SEARCH_LIBS(
|
|
[dlopen],[dl],
|
|
[],
|
|
[AC_DEFINE([NO_LIBDL], [1], [Define if we could not find libdl.])
|
|
AC_CHECK_HEADERS([gssapi/gssapi.h])
|
|
AC_SEARCH_LIBS(
|
|
[gss_init_sec_context],[gssapi gssapi_krb5 gss],
|
|
[],
|
|
[AC_DEFINE([NO_GSSAPI_LIB], [1], [Define if we could not find a gssapi library])])])])
|
|
|
|
AC_CHECK_LIB(X11, XOpenDisplay,
|
|
[GTK_LIBS="-lX11 $GTK_LIBS"
|
|
AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])])
|
|
|
|
AC_CHECK_FUNCS([getaddrinfo posix_openpt ptsname setresuid strsignal updwtmpx])
|
|
AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [[#include <time.h>]])
|
|
AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Define if clock_gettime() is available])])
|
|
|
|
AC_CACHE_CHECK([for SO_PEERCRED and dependencies], [x_cv_linux_so_peercred], [
|
|
AC_COMPILE_IFELSE([
|
|
AC_LANG_PROGRAM([[
|
|
#define _GNU_SOURCE
|
|
#include <features.h>
|
|
#include <sys/socket.h>
|
|
]],[[
|
|
struct ucred cr;
|
|
socklen_t crlen = sizeof(cr);
|
|
return getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cr, &crlen) +
|
|
cr.pid + cr.uid + cr.gid;
|
|
]]
|
|
)],
|
|
AS_VAR_SET(x_cv_linux_so_peercred, yes),
|
|
AS_VAR_SET(x_cv_linux_so_peercred, no)
|
|
)
|
|
])
|
|
AS_IF([test AS_VAR_GET(x_cv_linux_so_peercred) = yes],
|
|
[AC_DEFINE([HAVE_SO_PEERCRED], [1],
|
|
[Define if SO_PEERCRED works in the Linux fashion.])]
|
|
)
|
|
|
|
if test "x$GCC" = "xyes"; then
|
|
:
|
|
AC_SUBST(WARNINGOPTS, ['-Wall -Werror'])
|
|
else
|
|
:
|
|
AC_SUBST(WARNINGOPTS, [])
|
|
fi
|
|
|
|
AC_OUTPUT
|
|
|
|
if test "$gtk_version_desired" = "no"; then cat <<EOF
|
|
|
|
'configure' was instructed not to build using GTK. Therefore, PuTTY
|
|
itself and the other GUI utilities will not be built by the generated
|
|
Makefile: only the command-line tools such as puttygen, plink and
|
|
psftp will be built.
|
|
|
|
EOF
|
|
elif test "$gtk" = "none"; then cat <<EOF
|
|
|
|
'configure' was unable to find either the GTK 1 or GTK 2 libraries on
|
|
your system. Therefore, PuTTY itself and the other GUI utilities will
|
|
not be built by the generated Makefile: only the command-line tools
|
|
such as puttygen, plink and psftp will be built.
|
|
|
|
EOF
|
|
fi
|
|
|
|
AH_BOTTOM([
|
|
/* Convert autoconf definitions to ones that PuTTY wants. */
|
|
|
|
#ifndef HAVE_GETADDRINFO
|
|
# define NO_IPV6
|
|
#endif
|
|
#ifndef HAVE_SETRESUID
|
|
# define HAVE_NO_SETRESUID
|
|
#endif
|
|
#ifndef HAVE_STRSIGNAL
|
|
# define HAVE_NO_STRSIGNAL
|
|
#endif
|
|
#if !defined(HAVE_UTMPX_H) || !defined(HAVE_UPDWTMPX)
|
|
# define OMIT_UTMP
|
|
#endif
|
|
#ifndef HAVE_PTSNAME
|
|
# define BSD_PTYS
|
|
#endif
|
|
#ifndef HAVE_SYS_SELECT_H
|
|
# define HAVE_NO_SYS_SELECT_H
|
|
#endif
|
|
#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
|
|
# define PANGO_PRE_1POINT4
|
|
#endif
|
|
#ifndef HAVE_PANGO_FONT_MAP_LIST_FAMILIES
|
|
# define PANGO_PRE_1POINT6
|
|
#endif
|
|
#if !defined(WITH_GSSAPI)
|
|
# define NO_GSSAPI
|
|
#endif
|
|
#if !defined(NO_GSSAPI) && defined(NO_LIBDL)
|
|
# if !defined(HAVE_GSSAPI_GSSAPI_H) || defined(NO_GSSAPI_LIB)
|
|
# define NO_GSSAPI
|
|
# endif
|
|
#endif
|
|
])
|