tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed old with-askpass option

This commit is contained in:
Damien Miller 1999-11-25 13:19:55 +11:00
parent 063fdf8275
commit 98ac007ad9
3 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL
View File

@ -82,9 +82,6 @@ Daemon support and to specify a EGD pool socket. You will need to
use this if your Unix does not support the /dev/urandom device (or use this if your Unix does not support the /dev/urandom device (or
similar). similar).
--without-askpass will disable X11 password requestor support in
ssh-add
--with-kerberos4 will enable Kerberos IV support. You will need to --with-kerberos4 will enable Kerberos IV support. You will need to
have the Kerberos libraries and header files installed for this to have the Kerberos libraries and header files installed for this to
work. work.

12
Makefile.in
View File

@ -83,14 +83,10 @@ install: all
ln -sf ssh $(bindir)/slogin ln -sf ssh $(bindir)/slogin
ln -sf ssh.1 $(mandir)/man1/slogin.1 ln -sf ssh.1 $(mandir)/man1/slogin.1
if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \ $(INSTALL) -d $(libexecdir) ;
$(INSTALL) -d $(libexecdir) ; \ $(INSTALL) -d $(libexecdir)/ssh ;
$(INSTALL) -d $(libexecdir)/ssh ; \ if [ -z "@GNOME_ASKPASS@" ] ; then \
if [ -z "@GNOME_ASKPASS@" ] ; then \ $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
$(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
else \
$(INSTALL) -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
fi ; \
fi fi
if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \

47
configure.in
View File

@ -137,46 +137,23 @@ AC_TRY_COMPILE(
] ]
) )
dnl Check whether use wants to disable the external ssh-askpass AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
INSTALL_ASKPASS="yes" dnl Check whether user wants GNOME ssh-askpass
AC_MSG_CHECKING([whether to enable external ssh-askpass support]) AC_ARG_WITH(gnome-askpass,
AC_ARG_WITH(askpass, [ --with-gnome-askpass Build the GNOME passphrase requester (default=no)],
[ --with-askpass=yes/no Enable external ssh-askpass support (default=yes)],
[ [
if test x$withval = xno ; then if test x$withval = xno ; then
INSTALL_ASKPASS="no" GNOME_ASKPASS="";
else else
INSTALL_ASKPASS="yes" GNOME_ASKPASS="gnome-ssh-askpass";
fi fi
] ])
) AC_SUBST(GNOME_ASKPASS)
if test "x$INSTALL_ASKPASS" = "xyes" ; then
AC_DEFINE(USE_EXTERNAL_ASKPASS) if test -z "$GNOME_ASKPASS" ; then
AC_SUBST(INSTALL_ASKPASS)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi else
AC_MSG_RESULT(yes)
if test "x$INSTALL_ASKPASS" = "xyes" ; then
AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
dnl Check whether user wants GNOME ssh-askpass
AC_ARG_WITH(gnome-askpass,
[ --with-gnome-askpass Build the GNOME passphrase requester (default=no)],
[
if test x$withval = xno ; then
GNOME_ASKPASS="";
else
GNOME_ASKPASS="gnome-ssh-askpass";
fi
])
AC_SUBST(GNOME_ASKPASS)
if test -z "$GNOME_ASKPASS" ; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
fi
fi fi
dnl Check for user-specified random device dnl Check for user-specified random device