diff options
Diffstat (limited to 'other/ssharp/contrib')
63 files changed, 7523 insertions, 0 deletions
diff --git a/other/ssharp/contrib/CVS/Entries b/other/ssharp/contrib/CVS/Entries new file mode 100644 index 0000000..960e3da --- /dev/null +++ b/other/ssharp/contrib/CVS/Entries | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | /README/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /SecurID.diff/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /chroot.diff/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | /gnome-ssh-askpass.c/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 5 | /ssh-copy-id/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 6 | /ssh-copy-id.1/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 7 | /sshd.pam.freebsd/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 8 | /sshd.pam.generic/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 9 | D/caldera//// | ||
| 10 | D/cygwin//// | ||
| 11 | D/hpux//// | ||
| 12 | D/redhat//// | ||
| 13 | D/solaris//// | ||
| 14 | D/suse//// | ||
diff --git a/other/ssharp/contrib/CVS/Repository b/other/ssharp/contrib/CVS/Repository new file mode 100644 index 0000000..987bd16 --- /dev/null +++ b/other/ssharp/contrib/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib | |||
diff --git a/other/ssharp/contrib/CVS/Root b/other/ssharp/contrib/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/CVS/Tag b/other/ssharp/contrib/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/README b/other/ssharp/contrib/README new file mode 100644 index 0000000..964cf9f --- /dev/null +++ b/other/ssharp/contrib/README | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | Other patches and addons for OpenSSH. Please send submissions to | ||
| 2 | djm@ibs.com.au | ||
| 3 | |||
| 4 | Elsewhere | ||
| 5 | --------- | ||
| 6 | |||
| 7 | http://www.imasy.or.jp/~gotoh/connect.c is a Unix and Windows | ||
| 8 | ProxyCommand which allows OpenSSH to make connections through a SOCKS5 | ||
| 9 | or http proxy which supports the CONNECT method (eg. Squid). | ||
| 10 | |||
| 11 | In this directory | ||
| 12 | ----------------- | ||
| 13 | |||
| 14 | SecurID.diff | ||
| 15 | |||
| 16 | This patch from Theo Schlossnagle <jesus@omniti.com> adds SecurID support | ||
| 17 | to portable OpenSSH. Please refer to the text at the start of the patch | ||
| 18 | and to the author's homepage at http://www.omniti.com/~jesus/projects/ for | ||
| 19 | more details. | ||
| 20 | |||
| 21 | chroot.diff: | ||
| 22 | |||
| 23 | Ricardo Cerqueira <rmcc@novis.pt> patch to enable chrooting using the | ||
| 24 | wu-ftpd style magic home directories (containing '/./'). More details in | ||
| 25 | the head of the patch itself. | ||
| 26 | |||
| 27 | ssh-copy-id: | ||
| 28 | |||
| 29 | Phil Hands' <phil@hands.com> shell script to automate the process of adding | ||
| 30 | your public key to a remote machine's ~/.ssh/authorized_keys file. | ||
| 31 | |||
| 32 | gnome-ssh-askpass: | ||
| 33 | |||
| 34 | A GNOME passphrase requester from Damien Miller <djm@mindrot.org> with help | ||
| 35 | from several others. Compilation instructions are in the top of the file. | ||
| 36 | |||
| 37 | sshd.pam.generic: | ||
| 38 | |||
| 39 | A generic PAM config file which may be useful on your system. YMMV | ||
| 40 | |||
| 41 | sshd.pam.freebsd: | ||
| 42 | |||
| 43 | A PAM config file which works with FreeBSD's PAM port. Contributed by | ||
| 44 | Dominik Brettnacher <domi@saargate.de> | ||
| 45 | |||
| 46 | mdoc2man.pl: | ||
| 47 | |||
| 48 | Converts mdoc formated manpages into normal manpages. This can be used | ||
| 49 | on Solaris machines to provide manpages that are not preformated. | ||
| 50 | Contributed by Mark D. Roth <roth@feep.net> | ||
| 51 | |||
| 52 | redhat/ | ||
| 53 | |||
| 54 | Files useful for operation on Redhat Linux systems. NB. it is recommended | ||
| 55 | that you use the prepackaged RPM versions on Redhat, as they have been | ||
| 56 | better tested. | ||
| 57 | |||
| 58 | suse: | ||
| 59 | |||
| 60 | RPM spec file an scripts for building SuSE packages | ||
| 61 | |||
| 62 | |||
| 63 | Externally maintained | ||
| 64 | --------------------- | ||
| 65 | |||
| 66 | X11 SSH Askpass: | ||
| 67 | |||
| 68 | Jim Knoble <jmknoble@pobox.com> has written an excellent X11 | ||
| 69 | passphrase requester. This is highly recommended: | ||
| 70 | |||
| 71 | http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/ | ||
| 72 | |||
diff --git a/other/ssharp/contrib/SecurID.diff b/other/ssharp/contrib/SecurID.diff new file mode 100644 index 0000000..c13aa39 --- /dev/null +++ b/other/ssharp/contrib/SecurID.diff | |||
| @@ -0,0 +1,4117 @@ | |||
| 1 | This patch from Theo Schlossnagle <jesus@omniti.com> adds SecurID | ||
| 2 | authentication support to portable OpenSSH. To apply, run the following | ||
| 3 | command from the source directory: | ||
| 4 | |||
| 5 | patch -p1 < contrib/SecurID.diff | ||
| 6 | |||
| 7 | You will need to re-run 'configure' if you have not already done so. Please | ||
| 8 | refer to the README.SecurID (which will be created by the above command) for | ||
| 9 | more information. | ||
| 10 | |||
| 11 | The homepage for the latest version of this patch is: | ||
| 12 | |||
| 13 | http://www.omniti.com/~jesus/projects/ | ||
| 14 | |||
| 15 | Please refer to the homepage first if you have any problems. | ||
| 16 | |||
| 17 | diff -ruN openssh-2.9p1-orig/Makefile.in openssh-2.9p1/Makefile.in | ||
| 18 | --- openssh-2.9p1-orig/Makefile.in Fri Apr 27 10:31:08 2001 | ||
| 19 | +++ openssh-2.9p1/Makefile.in Sun Apr 29 21:59:59 2001 | ||
| 20 | @@ -49,7 +49,7 @@ | ||
| 21 | |||
| 22 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o | ||
| 23 | |||
| 24 | -SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o | ||
| 25 | +SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-securid.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o | ||
| 26 | |||
| 27 | MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out | ||
| 28 | MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 | ||
| 29 | diff -ruN openssh-2.9p1-orig/README.SecurID openssh-2.9p1/README.SecurID | ||
| 30 | --- openssh-2.9p1-orig/README.SecurID Thu Jan 1 10:00:00 1970 | ||
| 31 | +++ openssh-2.9p1/README.SecurID Sun Apr 29 21:59:59 2001 | ||
| 32 | @@ -0,0 +1,90 @@ | ||
| 33 | +/* | ||
| 34 | + * Author: Theo Schlossnagle <jesus@omniti.com> | ||
| 35 | + * Copyright (c) 2000,2001 Theo Schlossnagle <jesus@omniti.com> | ||
| 36 | + * All rights reserved | ||
| 37 | + * Created: September 21, 2000 | ||
| 38 | + * License: OpenSSH License. See the license for OpenSSH for more details. | ||
| 39 | + * | ||
| 40 | + * April 24, 2001: | ||
| 41 | + * Updated to 2.9.0p1 -- jesus@omniti.com | ||
| 42 | + * added autoconf clauses to fault if sdiclient.a and headers aren't there. | ||
| 43 | + * | ||
| 44 | + * April 21, 2001: | ||
| 45 | + * Updated to 2.5.2p2 -- jesus@omniti.com | ||
| 46 | + * Incorporated some bug fixes from Anders Olsen to fix next-token code. | ||
| 47 | + * | ||
| 48 | + * March 19, 2001: | ||
| 49 | + * Updated to 2.5.2p1 -- jesus@omniti.com | ||
| 50 | + * | ||
| 51 | + * December 20, 2000: | ||
| 52 | + * Updated to 2.3.0p1 -- jesus@omniti.com | ||
| 53 | + * | ||
| 54 | + * Jan 9th, 2001: | ||
| 55 | + * Added SecurIDUsersFile, SecurIDIgnoreShell, AllowNonSecurID directives | ||
| 56 | + * to the sshd_config file. These parameters are documented in the man page. | ||
| 57 | + * This provides a more logical seperationg between fail-through due to system | ||
| 58 | + * failure and fall-through by configuration. (fall-through vs. fail-through) | ||
| 59 | + * -- jesus@omniti.com | ||
| 60 | + */ | ||
| 61 | + | ||
| 62 | +Seems like a few people are interested. So here is the patch. | ||
| 63 | + | ||
| 64 | +This has only been tested on UNICIES that support PAM. There is untested | ||
| 65 | +(only 5 lines) code in auth-passwd.c that should provide the same | ||
| 66 | +functionality for normal (non-PAM) password verifications. | ||
| 67 | + | ||
| 68 | +The patch is logical quite small, the physical patch bulky because it contains | ||
| 69 | +all the line number changes in "configure" after running autoconf on the | ||
| 70 | +modified configure.in file (in which I changed maybe 10 lines -- Yuk.) | ||
| 71 | + | ||
| 72 | +The sshd man page has been patched too :-) Read it for the two new options | ||
| 73 | +relating to SecurID. | ||
| 74 | + | ||
| 75 | +How it works: | ||
| 76 | + | ||
| 77 | +0) apply patch ;-) | ||
| 78 | +1) copy sdi headers (in SecurID example directory) into either a standard | ||
| 79 | +include place (like /usr/local/include) or into the openssh source tree | ||
| 80 | +or add the --with-cflags=-I/path/to/ace/examples (where the include files are) | ||
| 81 | +2) copy the sdiclient.a file (same dir) into the openssh source tree. | ||
| 82 | + | ||
| 83 | +Make sure that /var/ace contains your sdconf.rec, etc. If you installed | ||
| 84 | +SecurID client or server on a machine it should be this way already. If you | ||
| 85 | +used a non-standard install location do a "ln -s /path/to/ace/data /var/ace" | ||
| 86 | + | ||
| 87 | +3) add --with-securid --with-pam to the configure flags. This module rides on | ||
| 88 | +the PAM authentication mechanism. | ||
| 89 | + | ||
| 90 | +It will trigger if a user has a shell in /etc/passwd that ends with "sdshell" | ||
| 91 | +and it snags your shell the same way sdshell does. Users with other shells | ||
| 92 | +will log in as if SecurID didn't exist. | ||
| 93 | + | ||
| 94 | +Done: | ||
| 95 | + o Normal passcode verification | ||
| 96 | + o Enter next token for verification | ||
| 97 | + (use ssh -v to see the *useful* debgging messages) | ||
| 98 | + | ||
| 99 | +ssh -v will let you know if: | ||
| 100 | + o your code was accepted. | ||
| 101 | + o your code was rejected. | ||
| 102 | + o you are required to wait for the next token and enter that. | ||
| 103 | + | ||
| 104 | +TODO: | ||
| 105 | + o Handle PIN creation and changing (as their are by default three log in | ||
| 106 | +attempts, it should be straight forward to integrate in these additions -- | ||
| 107 | +both of these operations require exactly three user inputs.) | ||
| 108 | + o Add sshd_config parameter to specify the VAR_ACE location (forced to | ||
| 109 | +/var/ace OR VAR_ACE environment variable now.) | ||
| 110 | + o Make autoconf find the headers in logical places and add a long-option to | ||
| 111 | +give it a hint. I am an "autoconf idiot"... The small changes I made were | ||
| 112 | +challenging enough :) | ||
| 113 | + | ||
| 114 | + | ||
| 115 | +DISCLAIMER: | ||
| 116 | + I works for me (yes, in production). If you get locked out of a production | ||
| 117 | +system becuase you replaced your sshd with this one, feeling really dumb is | ||
| 118 | +YOUR responsibility NOT mine. It is not my fault :-D | ||
| 119 | + | ||
| 120 | +Hope this is useful! scp (and all other tools that can use ssh like rsync and | ||
| 121 | +cvs) will work now!!!! Hooray! | ||
| 122 | + | ||
| 123 | diff -ruN openssh-2.9p1-orig/acconfig.h openssh-2.9p1/acconfig.h | ||
| 124 | --- openssh-2.9p1-orig/acconfig.h Fri Apr 6 03:15:08 2001 | ||
| 125 | +++ openssh-2.9p1/acconfig.h Sun Apr 29 21:59:59 2001 | ||
| 126 | @@ -187,6 +187,9 @@ | ||
| 127 | /* Define if you want S/Key support */ | ||
| 128 | #undef SKEY | ||
| 129 | |||
| 130 | +/* Define if you want SecurID support */ | ||
| 131 | +#undef SECURID | ||
| 132 | + | ||
| 133 | /* Define if you want TCP Wrappers support */ | ||
| 134 | #undef LIBWRAP | ||
| 135 | |||
| 136 | diff -ruN openssh-2.9p1-orig/auth-pam.c openssh-2.9p1/auth-pam.c | ||
| 137 | --- openssh-2.9p1-orig/auth-pam.c Tue Apr 24 04:38:37 2001 | ||
| 138 | +++ openssh-2.9p1/auth-pam.c Sun Apr 29 21:59:59 2001 | ||
| 139 | @@ -170,7 +170,6 @@ | ||
| 140 | |||
| 141 | return PAM_SUCCESS; | ||
| 142 | } | ||
| 143 | - | ||
| 144 | /* Called at exit to cleanly shutdown PAM */ | ||
| 145 | void do_pam_cleanup_proc(void *context) | ||
| 146 | { | ||
| 147 | @@ -213,7 +212,19 @@ | ||
| 148 | return 0; | ||
| 149 | if (*password == '\0' && options.permit_empty_passwd == 0) | ||
| 150 | return 0; | ||
| 151 | - | ||
| 152 | +#ifdef SECURID | ||
| 153 | + if (options.securid_authentication == 1) { | ||
| 154 | + int ret; | ||
| 155 | + debug("Attempting SecurID authentication user \"%.100s\"", pw->pw_name); | ||
| 156 | + ret = auth_securid_password(pw, password); | ||
| 157 | + if (ret >= 0) | ||
| 158 | + return ret; | ||
| 159 | + /* Only returns < 0 if the account is not a SecurID account */ | ||
| 160 | + /* Fall back to ordinary passwd authentication. */ | ||
| 161 | + } else { | ||
| 162 | + debug("SecurID disabled in server config. Using PAM."); | ||
| 163 | + } | ||
| 164 | +#endif | ||
| 165 | __pampasswd = password; | ||
| 166 | |||
| 167 | pamstate = INITIAL_LOGIN; | ||
| 168 | diff -ruN openssh-2.9p1-orig/auth-passwd.c openssh-2.9p1/auth-passwd.c | ||
| 169 | --- openssh-2.9p1-orig/auth-passwd.c Wed Apr 25 22:50:19 2001 | ||
| 170 | +++ openssh-2.9p1/auth-passwd.c Sun Apr 29 21:59:59 2001 | ||
| 171 | @@ -147,6 +147,15 @@ | ||
| 172 | } | ||
| 173 | #endif | ||
| 174 | |||
| 175 | +#ifdef SECURID | ||
| 176 | + if (options.securid_authentication == 1) { | ||
| 177 | + int ret = auth_securid_password(pw, password); | ||
| 178 | + if (ret >= 0) | ||
| 179 | + return ret; | ||
| 180 | + /* Only returns < 0 if the account is not a SecurID account */ | ||
| 181 | + /* Fall back to ordinary passwd authentication. */ | ||
| 182 | + } | ||
| 183 | +#endif | ||
| 184 | #ifdef WITH_AIXAUTHENTICATE | ||
| 185 | return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0); | ||
| 186 | #endif | ||
| 187 | diff -ruN openssh-2.9p1-orig/auth-securid.c openssh-2.9p1/auth-securid.c | ||
| 188 | --- openssh-2.9p1-orig/auth-securid.c Thu Jan 1 10:00:00 1970 | ||
| 189 | +++ openssh-2.9p1/auth-securid.c Sun Apr 29 21:59:59 2001 | ||
| 190 | @@ -0,0 +1,189 @@ | ||
| 191 | +/* | ||
| 192 | + * Author: Theo Schlossnagle <jesus@omniti.com> | ||
| 193 | + * Copyright (c) 2000 Theo Schlossnagle <jesus@omniti.com> | ||
| 194 | + * All rights reserved | ||
| 195 | + * Created: September 21, 2000 | ||
| 196 | + * This file contains the code to process a SecurID authentication | ||
| 197 | + * including the "next token" request. | ||
| 198 | + */ | ||
| 199 | + | ||
| 200 | +#include "includes.h" | ||
| 201 | + | ||
| 202 | +RCSID("$OpenBSD: auth-securid.c,v 1.0 2000/09/21 01:39:38 jesus Exp $"); | ||
| 203 | + | ||
| 204 | +#include "packet.h" | ||
| 205 | +#include "ssh.h" | ||
| 206 | +#include "log.h" | ||
| 207 | +#include "servconf.h" | ||
| 208 | +#include "xmalloc.h" | ||
| 209 | + | ||
| 210 | +#ifdef WITH_AIXAUTHENTICATE | ||
| 211 | +# include <login.h> | ||
| 212 | +#endif | ||
| 213 | +#ifdef HAVE_HPUX_TRUSTED_SYSTEM_PW | ||
| 214 | +# include <hpsecurity.h> | ||
| 215 | +# include <prot.h> | ||
| 216 | +#endif | ||
| 217 | +#ifdef HAVE_SHADOW_H | ||
| 218 | +# include <shadow.h> | ||
| 219 | +#endif | ||
| 220 | +#ifdef HAVE_GETPWANAM | ||
| 221 | +# include <sys/label.h> | ||
| 222 | +# include <sys/audit.h> | ||
| 223 | +# include <pwdadj.h> | ||
| 224 | +#endif | ||
| 225 | +#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) | ||
| 226 | +# include "md5crypt.h" | ||
| 227 | +#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */ | ||
| 228 | + | ||
| 229 | +#ifdef SECURID | ||
| 230 | +#include "sdi_athd.h" | ||
| 231 | +#include "sdconf.h" | ||
| 232 | +#include "sdacmvls.h" | ||
| 233 | + | ||
| 234 | +union config_record configure; | ||
| 235 | +#endif | ||
| 236 | + | ||
| 237 | +/* | ||
| 238 | + * Tries to authenticate the user using password. Returns true if | ||
| 239 | + * authentication succeeds. | ||
| 240 | + */ | ||
| 241 | +#define INBUFFLEN 256 | ||
| 242 | + | ||
| 243 | +int | ||
| 244 | +securid_usersfile_find(const char *pw_name) | ||
| 245 | +{ | ||
| 246 | + extern ServerOptions options; | ||
| 247 | + FILE *inf; | ||
| 248 | + char inbuff[INBUFFLEN]; | ||
| 249 | + struct stat fileinfo; | ||
| 250 | + int retval = 0; | ||
| 251 | + | ||
| 252 | + if(!options.securid_usersfile) { | ||
| 253 | + error("In securid_usersfile_find() with NULL filename!"); | ||
| 254 | + return -1; | ||
| 255 | + } | ||
| 256 | + if(lstat(options.securid_usersfile, &fileinfo)) { | ||
| 257 | + error("Cannot open %s: %s", | ||
| 258 | + options.securid_usersfile, strerror(errno)); | ||
| 259 | + return -1; | ||
| 260 | + } | ||
| 261 | + if(fileinfo.st_mode & (S_IWOTH|S_IWGRP)) { | ||
| 262 | + error("SecurIDUsersFile is writeable by group and other"); | ||
| 263 | + return -1; | ||
| 264 | + } | ||
| 265 | + if(!(inf = fopen(options.securid_usersfile, "r"))) { | ||
| 266 | + error("Cannot open %s: %s", | ||
| 267 | + options.securid_usersfile, strerror(errno)); | ||
| 268 | + return -1; | ||
| 269 | + } | ||
| 270 | + while(fgets(inbuff,INBUFFLEN-1,inf) != NULL) { | ||
| 271 | + if(inbuff[strlen(inbuff) - 1] == '\n') | ||
| 272 | + inbuff[strlen(inbuff) - 1] = '\0'; | ||
| 273 | + retval = !strcmp(inbuff,pw_name); | ||
| 274 | + if(retval) break; | ||
| 275 | + } | ||
| 276 | + fclose(inf); | ||
| 277 | + if(retval) return 1; | ||
| 278 | + debug2("Failed to find %s in %s", | ||
| 279 | + pw_name, options.securid_usersfile); | ||
| 280 | + return 0; | ||
| 281 | +} | ||
| 282 | +int | ||
| 283 | +auth_securid_password(struct passwd * pw, const char *password) | ||
| 284 | +{ | ||
| 285 | + static int state = 0; /* This tells us where we expect a | ||
| 286 | + 0 "PIN" | ||
| 287 | + 1 "Next Token" | ||
| 288 | + */ | ||
| 289 | + int doauth; | ||
| 290 | + char *ecp; | ||
| 291 | + extern ServerOptions options; | ||
| 292 | +#ifndef SECURID | ||
| 293 | + return -1; | ||
| 294 | +#else | ||
| 295 | + /* Add static for the nexttoken case -- Anders Olsen 20010409 */ | ||
| 296 | + static struct SD_CLIENT sd_dat, *sd; | ||
| 297 | + | ||
| 298 | + /* Check for users with no sdshell and pass them by. */ | ||
| 299 | + if(options.securid_usersfile) { | ||
| 300 | + doauth = securid_usersfile_find(pw->pw_name); | ||
| 301 | + if(doauth == 0) { /* file is there, user is not */ | ||
| 302 | + if(options.allow_nonsecurid) return -1; | ||
| 303 | + return 0; | ||
| 304 | + } else if(doauth < 0) { /* File not there or bad perms! */ | ||
| 305 | + error("Failing SecurID login attempt"); | ||
| 306 | + return 0; /* Fail */ | ||
| 307 | + } | ||
| 308 | + } else { | ||
| 309 | + /* No users securid_usersfile | ||
| 310 | + so use shells that end in sdshell */ | ||
| 311 | + if (!((ecp = strstr(pw->pw_shell, "sdshell")) && | ||
| 312 | + (*(ecp+8)=='\0'))) | ||
| 313 | + if(options.allow_nonsecurid) return -1; | ||
| 314 | + else | ||
| 315 | + return 0; | ||
| 316 | + } | ||
| 317 | + /* sd_check on with an empty password causes segfault against some | ||
| 318 | + versions of sdiclient -- Anders Olsen 20010409 */ | ||
| 319 | + if (*password == '\0') { | ||
| 320 | + debug2("auth_securid_password: empty password, skipping"); | ||
| 321 | + return 0; | ||
| 322 | + } | ||
| 323 | + /* Don't reopen session to securid-server is nexttoken | ||
| 324 | + -- Adres Olsen 20010410 */ | ||
| 325 | + if (state == 0) { | ||
| 326 | + int ret; | ||
| 327 | + memset(&sd_dat, 0, sizeof(sd_dat)); /* clear struct */ | ||
| 328 | + sd = &sd_dat; | ||
| 329 | + | ||
| 330 | + if(creadcfg()) { | ||
| 331 | + /* Can't read sdconf.rec! Gotta bail */ | ||
| 332 | + packet_send_debug("Couldn't read sdconf.rec."); | ||
| 333 | + if(options.securid_fallback) return -1; | ||
| 334 | + return 0; | ||
| 335 | + } | ||
| 336 | + if(sd_init(sd)) { | ||
| 337 | + /* Can't establish client/server comms! Gotta bail */ | ||
| 338 | + packet_send_debug("Couldn't establish client/server communications."); | ||
| 339 | + if(options.securid_fallback) return -1; | ||
| 340 | + return 0; | ||
| 341 | + } | ||
| 342 | + /* Auth PIN... */ | ||
| 343 | + ret = sd_check(password, pw->pw_name, sd); | ||
| 344 | + if(ret == ACM_OK) { | ||
| 345 | + goto success; | ||
| 346 | + } | ||
| 347 | + if(ret == ACM_ACCESS_DENIED) { | ||
| 348 | + packet_send_debug("SecurID passcode rejected."); | ||
| 349 | + return 0; /* Failed! */ | ||
| 350 | + } | ||
| 351 | + if(ret == ACM_NEXT_CODE_REQUIRED) { | ||
| 352 | + packet_send_debug("SecurID needs next token."); | ||
| 353 | + state = 1; /* Process next try as sd_next */ | ||
| 354 | + return 0; /* Fail, so ssh will prmpt again */ | ||
| 355 | + } | ||
| 356 | + } else { | ||
| 357 | + /* Auth next token... */ | ||
| 358 | + int ret; | ||
| 359 | + state = 0; /* Set back to PIN mode */ | ||
| 360 | + ret = sd_next(password, sd); | ||
| 361 | + if(ret == ACM_OK) { | ||
| 362 | + goto success; | ||
| 363 | + } | ||
| 364 | + packet_send_debug("SecurID passcode rejected."); | ||
| 365 | + return 0; /* Failed */ | ||
| 366 | + } | ||
| 367 | + packet_send_debug("Unhandled sdcheck() return code."); | ||
| 368 | + return 0; /* Failed! */ | ||
| 369 | + | ||
| 370 | +success: | ||
| 371 | + /* We don't free pw->pw_shell here, becuase we don't know how it was | ||
| 372 | + allocated... Besides it is a very small, one-time leak if we did | ||
| 373 | + need to free it. */ | ||
| 374 | + if(!options.securid_ignore_shell) | ||
| 375 | + pw->pw_shell = strdup(sd->shell); | ||
| 376 | + packet_send_debug("SecurID passcode accepted."); | ||
| 377 | + return 1; /* Success */ | ||
| 378 | +#endif | ||
| 379 | +} | ||
| 380 | diff -ruN openssh-2.9p1-orig/config.h.in openssh-2.9p1/config.h.in | ||
| 381 | --- openssh-2.9p1-orig/config.h.in Sun Apr 29 21:49:45 2001 | ||
| 382 | +++ openssh-2.9p1/config.h.in Sun Apr 29 22:00:53 2001 | ||
| 383 | @@ -193,6 +193,9 @@ | ||
| 384 | /* Define if you want S/Key support */ | ||
| 385 | #undef SKEY | ||
| 386 | |||
| 387 | +/* Define if you want SecurID support */ | ||
| 388 | +#undef SECURID | ||
| 389 | + | ||
| 390 | /* Define if you want TCP Wrappers support */ | ||
| 391 | #undef LIBWRAP | ||
| 392 | |||
| 393 | diff -ruN openssh-2.9p1-orig/configure openssh-2.9p1/configure | ||
| 394 | --- openssh-2.9p1-orig/configure Sun Apr 29 21:49:46 2001 | ||
| 395 | +++ openssh-2.9p1/configure Sun Apr 29 22:00:56 2001 | ||
| 396 | @@ -24,6 +24,8 @@ | ||
| 397 | ac_help="$ac_help | ||
| 398 | --with-skey=PATH Enable S/Key support" | ||
| 399 | ac_help="$ac_help | ||
| 400 | + --with-securid Enable SecurID support" | ||
| 401 | +ac_help="$ac_help | ||
| 402 | --with-tcp-wrappers Enable tcpwrappers support" | ||
| 403 | ac_help="$ac_help | ||
| 404 | --with-pam Enable PAM support " | ||
| 405 | @@ -599,7 +601,7 @@ | ||
| 406 | # Extract the first word of "gcc", so it can be a program name with args. | ||
| 407 | set dummy gcc; ac_word=$2 | ||
| 408 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 409 | -echo "configure:603: checking for $ac_word" >&5 | ||
| 410 | +echo "configure:605: checking for $ac_word" >&5 | ||
| 411 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
| 412 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 413 | else | ||
| 414 | @@ -629,7 +631,7 @@ | ||
| 415 | # Extract the first word of "cc", so it can be a program name with args. | ||
| 416 | set dummy cc; ac_word=$2 | ||
| 417 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 418 | -echo "configure:633: checking for $ac_word" >&5 | ||
| 419 | +echo "configure:635: checking for $ac_word" >&5 | ||
| 420 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
| 421 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 422 | else | ||
| 423 | @@ -680,7 +682,7 @@ | ||
| 424 | # Extract the first word of "cl", so it can be a program name with args. | ||
| 425 | set dummy cl; ac_word=$2 | ||
| 426 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 427 | -echo "configure:684: checking for $ac_word" >&5 | ||
| 428 | +echo "configure:686: checking for $ac_word" >&5 | ||
| 429 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
| 430 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 431 | else | ||
| 432 | @@ -712,7 +714,7 @@ | ||
| 433 | fi | ||
| 434 | |||
| 435 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
| 436 | -echo "configure:716: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
| 437 | +echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
| 438 | |||
| 439 | ac_ext=c | ||
| 440 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
| 441 | @@ -723,12 +725,12 @@ | ||
| 442 | |||
| 443 | cat > conftest.$ac_ext << EOF | ||
| 444 | |||
| 445 | -#line 727 "configure" | ||
| 446 | +#line 729 "configure" | ||
| 447 | #include "confdefs.h" | ||
| 448 | |||
| 449 | main(){return(0);} | ||
| 450 | EOF | ||
| 451 | -if { (eval echo configure:732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 452 | +if { (eval echo configure:734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 453 | ac_cv_prog_cc_works=yes | ||
| 454 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
| 455 | if (./conftest; exit) 2>/dev/null; then | ||
| 456 | @@ -754,12 +756,12 @@ | ||
| 457 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
| 458 | fi | ||
| 459 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
| 460 | -echo "configure:758: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
| 461 | +echo "configure:760: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
| 462 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
| 463 | cross_compiling=$ac_cv_prog_cc_cross | ||
| 464 | |||
| 465 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
| 466 | -echo "configure:763: checking whether we are using GNU C" >&5 | ||
| 467 | +echo "configure:765: checking whether we are using GNU C" >&5 | ||
| 468 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
| 469 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 470 | else | ||
| 471 | @@ -768,7 +770,7 @@ | ||
| 472 | yes; | ||
| 473 | #endif | ||
| 474 | EOF | ||
| 475 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
| 476 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
| 477 | ac_cv_prog_gcc=yes | ||
| 478 | else | ||
| 479 | ac_cv_prog_gcc=no | ||
| 480 | @@ -787,7 +789,7 @@ | ||
| 481 | ac_save_CFLAGS="$CFLAGS" | ||
| 482 | CFLAGS= | ||
| 483 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
| 484 | -echo "configure:791: checking whether ${CC-cc} accepts -g" >&5 | ||
| 485 | +echo "configure:793: checking whether ${CC-cc} accepts -g" >&5 | ||
| 486 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
| 487 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 488 | else | ||
| 489 | @@ -844,7 +846,7 @@ | ||
| 490 | fi | ||
| 491 | |||
| 492 | echo $ac_n "checking host system type""... $ac_c" 1>&6 | ||
| 493 | -echo "configure:848: checking host system type" >&5 | ||
| 494 | +echo "configure:850: checking host system type" >&5 | ||
| 495 | |||
| 496 | host_alias=$host | ||
| 497 | case "$host_alias" in | ||
| 498 | @@ -865,14 +867,14 @@ | ||
| 499 | echo "$ac_t""$host" 1>&6 | ||
| 500 | |||
| 501 | echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 | ||
| 502 | -echo "configure:869: checking whether byte ordering is bigendian" >&5 | ||
| 503 | +echo "configure:871: checking whether byte ordering is bigendian" >&5 | ||
| 504 | if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then | ||
| 505 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 506 | else | ||
| 507 | ac_cv_c_bigendian=unknown | ||
| 508 | # See if sys/param.h defines the BYTE_ORDER macro. | ||
| 509 | cat > conftest.$ac_ext <<EOF | ||
| 510 | -#line 876 "configure" | ||
| 511 | +#line 878 "configure" | ||
| 512 | #include "confdefs.h" | ||
| 513 | #include <sys/types.h> | ||
| 514 | #include <sys/param.h> | ||
| 515 | @@ -883,11 +885,11 @@ | ||
| 516 | #endif | ||
| 517 | ; return 0; } | ||
| 518 | EOF | ||
| 519 | -if { (eval echo configure:887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 520 | +if { (eval echo configure:889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 521 | rm -rf conftest* | ||
| 522 | # It does; now see whether it defined to BIG_ENDIAN or not. | ||
| 523 | cat > conftest.$ac_ext <<EOF | ||
| 524 | -#line 891 "configure" | ||
| 525 | +#line 893 "configure" | ||
| 526 | #include "confdefs.h" | ||
| 527 | #include <sys/types.h> | ||
| 528 | #include <sys/param.h> | ||
| 529 | @@ -898,7 +900,7 @@ | ||
| 530 | #endif | ||
| 531 | ; return 0; } | ||
| 532 | EOF | ||
| 533 | -if { (eval echo configure:902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 534 | +if { (eval echo configure:904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 535 | rm -rf conftest* | ||
| 536 | ac_cv_c_bigendian=yes | ||
| 537 | else | ||
| 538 | @@ -918,7 +920,7 @@ | ||
| 539 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 540 | else | ||
| 541 | cat > conftest.$ac_ext <<EOF | ||
| 542 | -#line 922 "configure" | ||
| 543 | +#line 924 "configure" | ||
| 544 | #include "confdefs.h" | ||
| 545 | main () { | ||
| 546 | /* Are we little or big endian? From Harbison&Steele. */ | ||
| 547 | @@ -931,7 +933,7 @@ | ||
| 548 | exit (u.c[sizeof (long) - 1] == 1); | ||
| 549 | } | ||
| 550 | EOF | ||
| 551 | -if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 552 | +if { (eval echo configure:937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 553 | then | ||
| 554 | ac_cv_c_bigendian=no | ||
| 555 | else | ||
| 556 | @@ -957,7 +959,7 @@ | ||
| 557 | |||
| 558 | # Checks for programs. | ||
| 559 | echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | ||
| 560 | -echo "configure:961: checking how to run the C preprocessor" >&5 | ||
| 561 | +echo "configure:963: checking how to run the C preprocessor" >&5 | ||
| 562 | # On Suns, sometimes $CPP names a directory. | ||
| 563 | if test -n "$CPP" && test -d "$CPP"; then | ||
| 564 | CPP= | ||
| 565 | @@ -972,13 +974,13 @@ | ||
| 566 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
| 567 | # not just through cpp. | ||
| 568 | cat > conftest.$ac_ext <<EOF | ||
| 569 | -#line 976 "configure" | ||
| 570 | +#line 978 "configure" | ||
| 571 | #include "confdefs.h" | ||
| 572 | #include <assert.h> | ||
| 573 | Syntax Error | ||
| 574 | EOF | ||
| 575 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 576 | -{ (eval echo configure:982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 577 | +{ (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 578 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 579 | if test -z "$ac_err"; then | ||
| 580 | : | ||
| 581 | @@ -989,13 +991,13 @@ | ||
| 582 | rm -rf conftest* | ||
| 583 | CPP="${CC-cc} -E -traditional-cpp" | ||
| 584 | cat > conftest.$ac_ext <<EOF | ||
| 585 | -#line 993 "configure" | ||
| 586 | +#line 995 "configure" | ||
| 587 | #include "confdefs.h" | ||
| 588 | #include <assert.h> | ||
| 589 | Syntax Error | ||
| 590 | EOF | ||
| 591 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 592 | -{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 593 | +{ (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 594 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 595 | if test -z "$ac_err"; then | ||
| 596 | : | ||
| 597 | @@ -1006,13 +1008,13 @@ | ||
| 598 | rm -rf conftest* | ||
| 599 | CPP="${CC-cc} -nologo -E" | ||
| 600 | cat > conftest.$ac_ext <<EOF | ||
| 601 | -#line 1010 "configure" | ||
| 602 | +#line 1012 "configure" | ||
| 603 | #include "confdefs.h" | ||
| 604 | #include <assert.h> | ||
| 605 | Syntax Error | ||
| 606 | EOF | ||
| 607 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 608 | -{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 609 | +{ (eval echo configure:1018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 610 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 611 | if test -z "$ac_err"; then | ||
| 612 | : | ||
| 613 | @@ -1039,7 +1041,7 @@ | ||
| 614 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
| 615 | set dummy ranlib; ac_word=$2 | ||
| 616 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 617 | -echo "configure:1043: checking for $ac_word" >&5 | ||
| 618 | +echo "configure:1045: checking for $ac_word" >&5 | ||
| 619 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
| 620 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 621 | else | ||
| 622 | @@ -1078,7 +1080,7 @@ | ||
| 623 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
| 624 | # ./install, which can be erroneously created by make from ./install.sh. | ||
| 625 | echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 | ||
| 626 | -echo "configure:1082: checking for a BSD compatible install" >&5 | ||
| 627 | +echo "configure:1084: checking for a BSD compatible install" >&5 | ||
| 628 | if test -z "$INSTALL"; then | ||
| 629 | if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then | ||
| 630 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 631 | @@ -1133,7 +1135,7 @@ | ||
| 632 | # Extract the first word of "ar", so it can be a program name with args. | ||
| 633 | set dummy ar; ac_word=$2 | ||
| 634 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 635 | -echo "configure:1137: checking for $ac_word" >&5 | ||
| 636 | +echo "configure:1139: checking for $ac_word" >&5 | ||
| 637 | if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then | ||
| 638 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 639 | else | ||
| 640 | @@ -1170,7 +1172,7 @@ | ||
| 641 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
| 642 | set dummy $ac_prog; ac_word=$2 | ||
| 643 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 644 | -echo "configure:1174: checking for $ac_word" >&5 | ||
| 645 | +echo "configure:1176: checking for $ac_word" >&5 | ||
| 646 | if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then | ||
| 647 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 648 | else | ||
| 649 | @@ -1209,7 +1211,7 @@ | ||
| 650 | # Extract the first word of "ent", so it can be a program name with args. | ||
| 651 | set dummy ent; ac_word=$2 | ||
| 652 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 653 | -echo "configure:1213: checking for $ac_word" >&5 | ||
| 654 | +echo "configure:1215: checking for $ac_word" >&5 | ||
| 655 | if eval "test \"`echo '$''{'ac_cv_path_ENT'+set}'`\" = set"; then | ||
| 656 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 657 | else | ||
| 658 | @@ -1247,7 +1249,7 @@ | ||
| 659 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
| 660 | set dummy $ac_prog; ac_word=$2 | ||
| 661 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 662 | -echo "configure:1251: checking for $ac_word" >&5 | ||
| 663 | +echo "configure:1253: checking for $ac_word" >&5 | ||
| 664 | if eval "test \"`echo '$''{'ac_cv_path_FILEPRIV'+set}'`\" = set"; then | ||
| 665 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 666 | else | ||
| 667 | @@ -1286,7 +1288,7 @@ | ||
| 668 | # Extract the first word of "bash", so it can be a program name with args. | ||
| 669 | set dummy bash; ac_word=$2 | ||
| 670 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 671 | -echo "configure:1290: checking for $ac_word" >&5 | ||
| 672 | +echo "configure:1292: checking for $ac_word" >&5 | ||
| 673 | if eval "test \"`echo '$''{'ac_cv_path_TEST_MINUS_S_SH'+set}'`\" = set"; then | ||
| 674 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 675 | else | ||
| 676 | @@ -1321,7 +1323,7 @@ | ||
| 677 | # Extract the first word of "ksh", so it can be a program name with args. | ||
| 678 | set dummy ksh; ac_word=$2 | ||
| 679 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 680 | -echo "configure:1325: checking for $ac_word" >&5 | ||
| 681 | +echo "configure:1327: checking for $ac_word" >&5 | ||
| 682 | if eval "test \"`echo '$''{'ac_cv_path_TEST_MINUS_S_SH'+set}'`\" = set"; then | ||
| 683 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 684 | else | ||
| 685 | @@ -1356,7 +1358,7 @@ | ||
| 686 | # Extract the first word of "sh", so it can be a program name with args. | ||
| 687 | set dummy sh; ac_word=$2 | ||
| 688 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 689 | -echo "configure:1360: checking for $ac_word" >&5 | ||
| 690 | +echo "configure:1362: checking for $ac_word" >&5 | ||
| 691 | if eval "test \"`echo '$''{'ac_cv_path_TEST_MINUS_S_SH'+set}'`\" = set"; then | ||
| 692 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 693 | else | ||
| 694 | @@ -1404,7 +1406,7 @@ | ||
| 695 | # Extract the first word of "login", so it can be a program name with args. | ||
| 696 | set dummy login; ac_word=$2 | ||
| 697 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 698 | -echo "configure:1408: checking for $ac_word" >&5 | ||
| 699 | +echo "configure:1410: checking for $ac_word" >&5 | ||
| 700 | if eval "test \"`echo '$''{'ac_cv_path_LOGIN_PROGRAM_FALLBACK'+set}'`\" = set"; then | ||
| 701 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 702 | else | ||
| 703 | @@ -1451,21 +1453,21 @@ | ||
| 704 | |||
| 705 | # C Compiler features | ||
| 706 | echo $ac_n "checking for inline""... $ac_c" 1>&6 | ||
| 707 | -echo "configure:1455: checking for inline" >&5 | ||
| 708 | +echo "configure:1457: checking for inline" >&5 | ||
| 709 | if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then | ||
| 710 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 711 | else | ||
| 712 | ac_cv_c_inline=no | ||
| 713 | for ac_kw in inline __inline__ __inline; do | ||
| 714 | cat > conftest.$ac_ext <<EOF | ||
| 715 | -#line 1462 "configure" | ||
| 716 | +#line 1464 "configure" | ||
| 717 | #include "confdefs.h" | ||
| 718 | |||
| 719 | int main() { | ||
| 720 | } $ac_kw foo() { | ||
| 721 | ; return 0; } | ||
| 722 | EOF | ||
| 723 | -if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 724 | +if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 725 | rm -rf conftest* | ||
| 726 | ac_cv_c_inline=$ac_kw; break | ||
| 727 | else | ||
| 728 | @@ -1504,12 +1506,12 @@ | ||
| 729 | blibpath="/usr/lib:/lib:/usr/local/lib" | ||
| 730 | fi | ||
| 731 | echo $ac_n "checking for authenticate""... $ac_c" 1>&6 | ||
| 732 | -echo "configure:1508: checking for authenticate" >&5 | ||
| 733 | +echo "configure:1510: checking for authenticate" >&5 | ||
| 734 | if eval "test \"`echo '$''{'ac_cv_func_authenticate'+set}'`\" = set"; then | ||
| 735 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 736 | else | ||
| 737 | cat > conftest.$ac_ext <<EOF | ||
| 738 | -#line 1513 "configure" | ||
| 739 | +#line 1515 "configure" | ||
| 740 | #include "confdefs.h" | ||
| 741 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 742 | which can conflict with char authenticate(); below. */ | ||
| 743 | @@ -1532,7 +1534,7 @@ | ||
| 744 | |||
| 745 | ; return 0; } | ||
| 746 | EOF | ||
| 747 | -if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 748 | +if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 749 | rm -rf conftest* | ||
| 750 | eval "ac_cv_func_authenticate=yes" | ||
| 751 | else | ||
| 752 | @@ -1671,12 +1673,12 @@ | ||
| 753 | EOF | ||
| 754 | |||
| 755 | echo $ac_n "checking for jlimit_startjob""... $ac_c" 1>&6 | ||
| 756 | -echo "configure:1675: checking for jlimit_startjob" >&5 | ||
| 757 | +echo "configure:1677: checking for jlimit_startjob" >&5 | ||
| 758 | if eval "test \"`echo '$''{'ac_cv_func_jlimit_startjob'+set}'`\" = set"; then | ||
| 759 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 760 | else | ||
| 761 | cat > conftest.$ac_ext <<EOF | ||
| 762 | -#line 1680 "configure" | ||
| 763 | +#line 1682 "configure" | ||
| 764 | #include "confdefs.h" | ||
| 765 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 766 | which can conflict with char jlimit_startjob(); below. */ | ||
| 767 | @@ -1699,7 +1701,7 @@ | ||
| 768 | |||
| 769 | ; return 0; } | ||
| 770 | EOF | ||
| 771 | -if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 772 | +if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 773 | rm -rf conftest* | ||
| 774 | eval "ac_cv_func_jlimit_startjob=yes" | ||
| 775 | else | ||
| 776 | @@ -1748,7 +1750,7 @@ | ||
| 777 | |||
| 778 | SONY=1 | ||
| 779 | echo $ac_n "checking for xatexit in -liberty""... $ac_c" 1>&6 | ||
| 780 | -echo "configure:1752: checking for xatexit in -liberty" >&5 | ||
| 781 | +echo "configure:1754: checking for xatexit in -liberty" >&5 | ||
| 782 | ac_lib_var=`echo iberty'_'xatexit | sed 'y%./+-%__p_%'` | ||
| 783 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 784 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 785 | @@ -1756,7 +1758,7 @@ | ||
| 786 | ac_save_LIBS="$LIBS" | ||
| 787 | LIBS="-liberty $LIBS" | ||
| 788 | cat > conftest.$ac_ext <<EOF | ||
| 789 | -#line 1760 "configure" | ||
| 790 | +#line 1762 "configure" | ||
| 791 | #include "confdefs.h" | ||
| 792 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 793 | /* We use char because int might match the return type of a gcc2 | ||
| 794 | @@ -1767,7 +1769,7 @@ | ||
| 795 | xatexit() | ||
| 796 | ; return 0; } | ||
| 797 | EOF | ||
| 798 | -if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 799 | +if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 800 | rm -rf conftest* | ||
| 801 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 802 | else | ||
| 803 | @@ -1834,7 +1836,7 @@ | ||
| 804 | # hardwire lastlog location (can't detect it on some versions) | ||
| 805 | conf_lastlog_location="/var/adm/lastlog" | ||
| 806 | echo $ac_n "checking for obsolete utmp and wtmp in solaris2.x""... $ac_c" 1>&6 | ||
| 807 | -echo "configure:1838: checking for obsolete utmp and wtmp in solaris2.x" >&5 | ||
| 808 | +echo "configure:1840: checking for obsolete utmp and wtmp in solaris2.x" >&5 | ||
| 809 | sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'` | ||
| 810 | if test "$sol2ver" -ge 8; then | ||
| 811 | echo "$ac_t""yes" 1>&6 | ||
| 812 | @@ -1855,12 +1857,12 @@ | ||
| 813 | for ac_func in getpwanam | ||
| 814 | do | ||
| 815 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 816 | -echo "configure:1859: checking for $ac_func" >&5 | ||
| 817 | +echo "configure:1861: checking for $ac_func" >&5 | ||
| 818 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 819 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 820 | else | ||
| 821 | cat > conftest.$ac_ext <<EOF | ||
| 822 | -#line 1864 "configure" | ||
| 823 | +#line 1866 "configure" | ||
| 824 | #include "confdefs.h" | ||
| 825 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 826 | which can conflict with char $ac_func(); below. */ | ||
| 827 | @@ -1883,7 +1885,7 @@ | ||
| 828 | |||
| 829 | ; return 0; } | ||
| 830 | EOF | ||
| 831 | -if { (eval echo configure:1887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 832 | +if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 833 | rm -rf conftest* | ||
| 834 | eval "ac_cv_func_$ac_func=yes" | ||
| 835 | else | ||
| 836 | @@ -2007,12 +2009,12 @@ | ||
| 837 | for ac_func in getluid setluid | ||
| 838 | do | ||
| 839 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 840 | -echo "configure:2011: checking for $ac_func" >&5 | ||
| 841 | +echo "configure:2013: checking for $ac_func" >&5 | ||
| 842 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 843 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 844 | else | ||
| 845 | cat > conftest.$ac_ext <<EOF | ||
| 846 | -#line 2016 "configure" | ||
| 847 | +#line 2018 "configure" | ||
| 848 | #include "confdefs.h" | ||
| 849 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 850 | which can conflict with char $ac_func(); below. */ | ||
| 851 | @@ -2035,7 +2037,7 @@ | ||
| 852 | |||
| 853 | ; return 0; } | ||
| 854 | EOF | ||
| 855 | -if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 856 | +if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 857 | rm -rf conftest* | ||
| 858 | eval "ac_cv_func_$ac_func=yes" | ||
| 859 | else | ||
| 860 | @@ -2086,12 +2088,12 @@ | ||
| 861 | for ac_func in getluid setluid | ||
| 862 | do | ||
| 863 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 864 | -echo "configure:2090: checking for $ac_func" >&5 | ||
| 865 | +echo "configure:2092: checking for $ac_func" >&5 | ||
| 866 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 867 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 868 | else | ||
| 869 | cat > conftest.$ac_ext <<EOF | ||
| 870 | -#line 2095 "configure" | ||
| 871 | +#line 2097 "configure" | ||
| 872 | #include "confdefs.h" | ||
| 873 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 874 | which can conflict with char $ac_func(); below. */ | ||
| 875 | @@ -2114,7 +2116,7 @@ | ||
| 876 | |||
| 877 | ; return 0; } | ||
| 878 | EOF | ||
| 879 | -if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 880 | +if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 881 | rm -rf conftest* | ||
| 882 | eval "ac_cv_func_$ac_func=yes" | ||
| 883 | else | ||
| 884 | @@ -2143,7 +2145,7 @@ | ||
| 885 | *-dec-osf*) | ||
| 886 | if test ! -z "USE_SIA" ; then | ||
| 887 | echo $ac_n "checking for Digital Unix Security Integration Architecture""... $ac_c" 1>&6 | ||
| 888 | -echo "configure:2147: checking for Digital Unix Security Integration Architecture" >&5 | ||
| 889 | +echo "configure:2149: checking for Digital Unix Security Integration Architecture" >&5 | ||
| 890 | if test -f /etc/sia/matrix.conf; then | ||
| 891 | echo "$ac_t""yes" 1>&6 | ||
| 892 | cat >> confdefs.h <<\EOF | ||
| 893 | @@ -2214,7 +2216,7 @@ | ||
| 894 | |||
| 895 | |||
| 896 | echo $ac_n "checking for pcre_info in -lpcre""... $ac_c" 1>&6 | ||
| 897 | -echo "configure:2218: checking for pcre_info in -lpcre" >&5 | ||
| 898 | +echo "configure:2220: checking for pcre_info in -lpcre" >&5 | ||
| 899 | ac_lib_var=`echo pcre'_'pcre_info | sed 'y%./+-%__p_%'` | ||
| 900 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 901 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 902 | @@ -2222,7 +2224,7 @@ | ||
| 903 | ac_save_LIBS="$LIBS" | ||
| 904 | LIBS="-lpcre $LIBS" | ||
| 905 | cat > conftest.$ac_ext <<EOF | ||
| 906 | -#line 2226 "configure" | ||
| 907 | +#line 2228 "configure" | ||
| 908 | #include "confdefs.h" | ||
| 909 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 910 | /* We use char because int might match the return type of a gcc2 | ||
| 911 | @@ -2233,7 +2235,7 @@ | ||
| 912 | pcre_info() | ||
| 913 | ; return 0; } | ||
| 914 | EOF | ||
| 915 | -if { (eval echo configure:2237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 916 | +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 917 | rm -rf conftest* | ||
| 918 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 919 | else | ||
| 920 | @@ -2270,7 +2272,7 @@ | ||
| 921 | # Checks for libraries. | ||
| 922 | if test -z "$no_libnsl" ; then | ||
| 923 | echo $ac_n "checking for yp_match in -lnsl""... $ac_c" 1>&6 | ||
| 924 | -echo "configure:2274: checking for yp_match in -lnsl" >&5 | ||
| 925 | +echo "configure:2276: checking for yp_match in -lnsl" >&5 | ||
| 926 | ac_lib_var=`echo nsl'_'yp_match | sed 'y%./+-%__p_%'` | ||
| 927 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 928 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 929 | @@ -2278,7 +2280,7 @@ | ||
| 930 | ac_save_LIBS="$LIBS" | ||
| 931 | LIBS="-lnsl $LIBS" | ||
| 932 | cat > conftest.$ac_ext <<EOF | ||
| 933 | -#line 2282 "configure" | ||
| 934 | +#line 2284 "configure" | ||
| 935 | #include "confdefs.h" | ||
| 936 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 937 | /* We use char because int might match the return type of a gcc2 | ||
| 938 | @@ -2289,7 +2291,7 @@ | ||
| 939 | yp_match() | ||
| 940 | ; return 0; } | ||
| 941 | EOF | ||
| 942 | -if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 943 | +if { (eval echo configure:2295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 944 | rm -rf conftest* | ||
| 945 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 946 | else | ||
| 947 | @@ -2319,7 +2321,7 @@ | ||
| 948 | fi | ||
| 949 | if test -z "$no_libsocket" ; then | ||
| 950 | echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 | ||
| 951 | -echo "configure:2323: checking for main in -lsocket" >&5 | ||
| 952 | +echo "configure:2325: checking for main in -lsocket" >&5 | ||
| 953 | ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` | ||
| 954 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 955 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 956 | @@ -2327,14 +2329,14 @@ | ||
| 957 | ac_save_LIBS="$LIBS" | ||
| 958 | LIBS="-lsocket $LIBS" | ||
| 959 | cat > conftest.$ac_ext <<EOF | ||
| 960 | -#line 2331 "configure" | ||
| 961 | +#line 2333 "configure" | ||
| 962 | #include "confdefs.h" | ||
| 963 | |||
| 964 | int main() { | ||
| 965 | main() | ||
| 966 | ; return 0; } | ||
| 967 | EOF | ||
| 968 | -if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 969 | +if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 970 | rm -rf conftest* | ||
| 971 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 972 | else | ||
| 973 | @@ -2364,7 +2366,7 @@ | ||
| 974 | fi | ||
| 975 | |||
| 976 | echo $ac_n "checking for innetgr in -lrpc""... $ac_c" 1>&6 | ||
| 977 | -echo "configure:2368: checking for innetgr in -lrpc" >&5 | ||
| 978 | +echo "configure:2370: checking for innetgr in -lrpc" >&5 | ||
| 979 | ac_lib_var=`echo rpc'_'innetgr | sed 'y%./+-%__p_%'` | ||
| 980 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 981 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 982 | @@ -2372,7 +2374,7 @@ | ||
| 983 | ac_save_LIBS="$LIBS" | ||
| 984 | LIBS="-lrpc -lyp -lrpc $LIBS" | ||
| 985 | cat > conftest.$ac_ext <<EOF | ||
| 986 | -#line 2376 "configure" | ||
| 987 | +#line 2378 "configure" | ||
| 988 | #include "confdefs.h" | ||
| 989 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 990 | /* We use char because int might match the return type of a gcc2 | ||
| 991 | @@ -2383,7 +2385,7 @@ | ||
| 992 | innetgr() | ||
| 993 | ; return 0; } | ||
| 994 | EOF | ||
| 995 | -if { (eval echo configure:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 996 | +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 997 | rm -rf conftest* | ||
| 998 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 999 | else | ||
| 1000 | @@ -2405,7 +2407,7 @@ | ||
| 1001 | |||
| 1002 | |||
| 1003 | echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6 | ||
| 1004 | -echo "configure:2409: checking for getspnam in -lgen" >&5 | ||
| 1005 | +echo "configure:2411: checking for getspnam in -lgen" >&5 | ||
| 1006 | ac_lib_var=`echo gen'_'getspnam | sed 'y%./+-%__p_%'` | ||
| 1007 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1008 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1009 | @@ -2413,7 +2415,7 @@ | ||
| 1010 | ac_save_LIBS="$LIBS" | ||
| 1011 | LIBS="-lgen $LIBS" | ||
| 1012 | cat > conftest.$ac_ext <<EOF | ||
| 1013 | -#line 2417 "configure" | ||
| 1014 | +#line 2419 "configure" | ||
| 1015 | #include "confdefs.h" | ||
| 1016 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1017 | /* We use char because int might match the return type of a gcc2 | ||
| 1018 | @@ -2424,7 +2426,7 @@ | ||
| 1019 | getspnam() | ||
| 1020 | ; return 0; } | ||
| 1021 | EOF | ||
| 1022 | -if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1023 | +if { (eval echo configure:2430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1024 | rm -rf conftest* | ||
| 1025 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1026 | else | ||
| 1027 | @@ -2445,7 +2447,7 @@ | ||
| 1028 | fi | ||
| 1029 | |||
| 1030 | echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 | ||
| 1031 | -echo "configure:2449: checking for deflate in -lz" >&5 | ||
| 1032 | +echo "configure:2451: checking for deflate in -lz" >&5 | ||
| 1033 | ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` | ||
| 1034 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1035 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1036 | @@ -2453,7 +2455,7 @@ | ||
| 1037 | ac_save_LIBS="$LIBS" | ||
| 1038 | LIBS="-lz $LIBS" | ||
| 1039 | cat > conftest.$ac_ext <<EOF | ||
| 1040 | -#line 2457 "configure" | ||
| 1041 | +#line 2459 "configure" | ||
| 1042 | #include "confdefs.h" | ||
| 1043 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1044 | /* We use char because int might match the return type of a gcc2 | ||
| 1045 | @@ -2464,7 +2466,7 @@ | ||
| 1046 | deflate() | ||
| 1047 | ; return 0; } | ||
| 1048 | EOF | ||
| 1049 | -if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1050 | +if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1051 | rm -rf conftest* | ||
| 1052 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1053 | else | ||
| 1054 | @@ -2493,7 +2495,7 @@ | ||
| 1055 | fi | ||
| 1056 | |||
| 1057 | echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6 | ||
| 1058 | -echo "configure:2497: checking for login in -lutil" >&5 | ||
| 1059 | +echo "configure:2499: checking for login in -lutil" >&5 | ||
| 1060 | ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'` | ||
| 1061 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1062 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1063 | @@ -2501,7 +2503,7 @@ | ||
| 1064 | ac_save_LIBS="$LIBS" | ||
| 1065 | LIBS="-lutil $LIBS" | ||
| 1066 | cat > conftest.$ac_ext <<EOF | ||
| 1067 | -#line 2505 "configure" | ||
| 1068 | +#line 2507 "configure" | ||
| 1069 | #include "confdefs.h" | ||
| 1070 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1071 | /* We use char because int might match the return type of a gcc2 | ||
| 1072 | @@ -2512,7 +2514,7 @@ | ||
| 1073 | login() | ||
| 1074 | ; return 0; } | ||
| 1075 | EOF | ||
| 1076 | -if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1077 | +if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1078 | rm -rf conftest* | ||
| 1079 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1080 | else | ||
| 1081 | @@ -2539,12 +2541,12 @@ | ||
| 1082 | # We don't want to check if we did an pcre override. | ||
| 1083 | if test -z "$no_comp_check" ; then | ||
| 1084 | echo $ac_n "checking for regcomp""... $ac_c" 1>&6 | ||
| 1085 | -echo "configure:2543: checking for regcomp" >&5 | ||
| 1086 | +echo "configure:2545: checking for regcomp" >&5 | ||
| 1087 | if eval "test \"`echo '$''{'ac_cv_func_regcomp'+set}'`\" = set"; then | ||
| 1088 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1089 | else | ||
| 1090 | cat > conftest.$ac_ext <<EOF | ||
| 1091 | -#line 2548 "configure" | ||
| 1092 | +#line 2550 "configure" | ||
| 1093 | #include "confdefs.h" | ||
| 1094 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1095 | which can conflict with char regcomp(); below. */ | ||
| 1096 | @@ -2567,7 +2569,7 @@ | ||
| 1097 | |||
| 1098 | ; return 0; } | ||
| 1099 | EOF | ||
| 1100 | -if { (eval echo configure:2571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1101 | +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1102 | rm -rf conftest* | ||
| 1103 | eval "ac_cv_func_regcomp=yes" | ||
| 1104 | else | ||
| 1105 | @@ -2589,7 +2591,7 @@ | ||
| 1106 | echo "$ac_t""no" 1>&6 | ||
| 1107 | |||
| 1108 | echo $ac_n "checking for pcre_info in -lpcre""... $ac_c" 1>&6 | ||
| 1109 | -echo "configure:2593: checking for pcre_info in -lpcre" >&5 | ||
| 1110 | +echo "configure:2595: checking for pcre_info in -lpcre" >&5 | ||
| 1111 | ac_lib_var=`echo pcre'_'pcre_info | sed 'y%./+-%__p_%'` | ||
| 1112 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1113 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1114 | @@ -2597,7 +2599,7 @@ | ||
| 1115 | ac_save_LIBS="$LIBS" | ||
| 1116 | LIBS="-lpcre $LIBS" | ||
| 1117 | cat > conftest.$ac_ext <<EOF | ||
| 1118 | -#line 2601 "configure" | ||
| 1119 | +#line 2603 "configure" | ||
| 1120 | #include "confdefs.h" | ||
| 1121 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1122 | /* We use char because int might match the return type of a gcc2 | ||
| 1123 | @@ -2608,7 +2610,7 @@ | ||
| 1124 | pcre_info() | ||
| 1125 | ; return 0; } | ||
| 1126 | EOF | ||
| 1127 | -if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1128 | +if { (eval echo configure:2614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1129 | rm -rf conftest* | ||
| 1130 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1131 | else | ||
| 1132 | @@ -2644,12 +2646,12 @@ | ||
| 1133 | fi | ||
| 1134 | |||
| 1135 | echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 | ||
| 1136 | -echo "configure:2648: checking for strcasecmp" >&5 | ||
| 1137 | +echo "configure:2650: checking for strcasecmp" >&5 | ||
| 1138 | if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then | ||
| 1139 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1140 | else | ||
| 1141 | cat > conftest.$ac_ext <<EOF | ||
| 1142 | -#line 2653 "configure" | ||
| 1143 | +#line 2655 "configure" | ||
| 1144 | #include "confdefs.h" | ||
| 1145 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1146 | which can conflict with char strcasecmp(); below. */ | ||
| 1147 | @@ -2672,7 +2674,7 @@ | ||
| 1148 | |||
| 1149 | ; return 0; } | ||
| 1150 | EOF | ||
| 1151 | -if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1152 | +if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1153 | rm -rf conftest* | ||
| 1154 | eval "ac_cv_func_strcasecmp=yes" | ||
| 1155 | else | ||
| 1156 | @@ -2690,7 +2692,7 @@ | ||
| 1157 | else | ||
| 1158 | echo "$ac_t""no" 1>&6 | ||
| 1159 | echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 | ||
| 1160 | -echo "configure:2694: checking for strcasecmp in -lresolv" >&5 | ||
| 1161 | +echo "configure:2696: checking for strcasecmp in -lresolv" >&5 | ||
| 1162 | ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` | ||
| 1163 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1164 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1165 | @@ -2698,7 +2700,7 @@ | ||
| 1166 | ac_save_LIBS="$LIBS" | ||
| 1167 | LIBS="-lresolv $LIBS" | ||
| 1168 | cat > conftest.$ac_ext <<EOF | ||
| 1169 | -#line 2702 "configure" | ||
| 1170 | +#line 2704 "configure" | ||
| 1171 | #include "confdefs.h" | ||
| 1172 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1173 | /* We use char because int might match the return type of a gcc2 | ||
| 1174 | @@ -2709,7 +2711,7 @@ | ||
| 1175 | strcasecmp() | ||
| 1176 | ; return 0; } | ||
| 1177 | EOF | ||
| 1178 | -if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1179 | +if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1180 | rm -rf conftest* | ||
| 1181 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1182 | else | ||
| 1183 | @@ -2733,12 +2735,12 @@ | ||
| 1184 | fi | ||
| 1185 | |||
| 1186 | echo $ac_n "checking for utimes""... $ac_c" 1>&6 | ||
| 1187 | -echo "configure:2737: checking for utimes" >&5 | ||
| 1188 | +echo "configure:2739: checking for utimes" >&5 | ||
| 1189 | if eval "test \"`echo '$''{'ac_cv_func_utimes'+set}'`\" = set"; then | ||
| 1190 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1191 | else | ||
| 1192 | cat > conftest.$ac_ext <<EOF | ||
| 1193 | -#line 2742 "configure" | ||
| 1194 | +#line 2744 "configure" | ||
| 1195 | #include "confdefs.h" | ||
| 1196 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1197 | which can conflict with char utimes(); below. */ | ||
| 1198 | @@ -2761,7 +2763,7 @@ | ||
| 1199 | |||
| 1200 | ; return 0; } | ||
| 1201 | EOF | ||
| 1202 | -if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1203 | +if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1204 | rm -rf conftest* | ||
| 1205 | eval "ac_cv_func_utimes=yes" | ||
| 1206 | else | ||
| 1207 | @@ -2779,7 +2781,7 @@ | ||
| 1208 | else | ||
| 1209 | echo "$ac_t""no" 1>&6 | ||
| 1210 | echo $ac_n "checking for utimes in -lc89""... $ac_c" 1>&6 | ||
| 1211 | -echo "configure:2783: checking for utimes in -lc89" >&5 | ||
| 1212 | +echo "configure:2785: checking for utimes in -lc89" >&5 | ||
| 1213 | ac_lib_var=`echo c89'_'utimes | sed 'y%./+-%__p_%'` | ||
| 1214 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1215 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1216 | @@ -2787,7 +2789,7 @@ | ||
| 1217 | ac_save_LIBS="$LIBS" | ||
| 1218 | LIBS="-lc89 $LIBS" | ||
| 1219 | cat > conftest.$ac_ext <<EOF | ||
| 1220 | -#line 2791 "configure" | ||
| 1221 | +#line 2793 "configure" | ||
| 1222 | #include "confdefs.h" | ||
| 1223 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1224 | /* We use char because int might match the return type of a gcc2 | ||
| 1225 | @@ -2798,7 +2800,7 @@ | ||
| 1226 | utimes() | ||
| 1227 | ; return 0; } | ||
| 1228 | EOF | ||
| 1229 | -if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1230 | +if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1231 | rm -rf conftest* | ||
| 1232 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1233 | else | ||
| 1234 | @@ -2823,12 +2825,12 @@ | ||
| 1235 | |||
| 1236 | |||
| 1237 | echo $ac_n "checking for strftime""... $ac_c" 1>&6 | ||
| 1238 | -echo "configure:2827: checking for strftime" >&5 | ||
| 1239 | +echo "configure:2829: checking for strftime" >&5 | ||
| 1240 | if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then | ||
| 1241 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1242 | else | ||
| 1243 | cat > conftest.$ac_ext <<EOF | ||
| 1244 | -#line 2832 "configure" | ||
| 1245 | +#line 2834 "configure" | ||
| 1246 | #include "confdefs.h" | ||
| 1247 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1248 | which can conflict with char strftime(); below. */ | ||
| 1249 | @@ -2851,7 +2853,7 @@ | ||
| 1250 | |||
| 1251 | ; return 0; } | ||
| 1252 | EOF | ||
| 1253 | -if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1254 | +if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1255 | rm -rf conftest* | ||
| 1256 | eval "ac_cv_func_strftime=yes" | ||
| 1257 | else | ||
| 1258 | @@ -2873,7 +2875,7 @@ | ||
| 1259 | echo "$ac_t""no" 1>&6 | ||
| 1260 | # strftime is in -lintl on SCO UNIX. | ||
| 1261 | echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 | ||
| 1262 | -echo "configure:2877: checking for strftime in -lintl" >&5 | ||
| 1263 | +echo "configure:2879: checking for strftime in -lintl" >&5 | ||
| 1264 | ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` | ||
| 1265 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1266 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1267 | @@ -2881,7 +2883,7 @@ | ||
| 1268 | ac_save_LIBS="$LIBS" | ||
| 1269 | LIBS="-lintl $LIBS" | ||
| 1270 | cat > conftest.$ac_ext <<EOF | ||
| 1271 | -#line 2885 "configure" | ||
| 1272 | +#line 2887 "configure" | ||
| 1273 | #include "confdefs.h" | ||
| 1274 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1275 | /* We use char because int might match the return type of a gcc2 | ||
| 1276 | @@ -2892,7 +2894,7 @@ | ||
| 1277 | strftime() | ||
| 1278 | ; return 0; } | ||
| 1279 | EOF | ||
| 1280 | -if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1281 | +if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1282 | rm -rf conftest* | ||
| 1283 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1284 | else | ||
| 1285 | @@ -2924,17 +2926,17 @@ | ||
| 1286 | do | ||
| 1287 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
| 1288 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
| 1289 | -echo "configure:2928: checking for $ac_hdr" >&5 | ||
| 1290 | +echo "configure:2930: checking for $ac_hdr" >&5 | ||
| 1291 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
| 1292 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1293 | else | ||
| 1294 | cat > conftest.$ac_ext <<EOF | ||
| 1295 | -#line 2933 "configure" | ||
| 1296 | +#line 2935 "configure" | ||
| 1297 | #include "confdefs.h" | ||
| 1298 | #include <$ac_hdr> | ||
| 1299 | EOF | ||
| 1300 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 1301 | -{ (eval echo configure:2938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 1302 | +{ (eval echo configure:2940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 1303 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 1304 | if test -z "$ac_err"; then | ||
| 1305 | rm -rf conftest* | ||
| 1306 | @@ -2963,9 +2965,9 @@ | ||
| 1307 | |||
| 1308 | # Check for ALTDIRFUNC glob() extension | ||
| 1309 | echo $ac_n "checking for GLOB_ALTDIRFUNC support""... $ac_c" 1>&6 | ||
| 1310 | -echo "configure:2967: checking for GLOB_ALTDIRFUNC support" >&5 | ||
| 1311 | +echo "configure:2969: checking for GLOB_ALTDIRFUNC support" >&5 | ||
| 1312 | cat > conftest.$ac_ext <<EOF | ||
| 1313 | -#line 2969 "configure" | ||
| 1314 | +#line 2971 "configure" | ||
| 1315 | #include "confdefs.h" | ||
| 1316 | |||
| 1317 | #include <glob.h> | ||
| 1318 | @@ -2996,9 +2998,9 @@ | ||
| 1319 | |||
| 1320 | # Check for g.gl_matchc glob() extension | ||
| 1321 | echo $ac_n "checking for gl_matchc field in glob_t""... $ac_c" 1>&6 | ||
| 1322 | -echo "configure:3000: checking for gl_matchc field in glob_t" >&5 | ||
| 1323 | +echo "configure:3002: checking for gl_matchc field in glob_t" >&5 | ||
| 1324 | cat > conftest.$ac_ext <<EOF | ||
| 1325 | -#line 3002 "configure" | ||
| 1326 | +#line 3004 "configure" | ||
| 1327 | #include "confdefs.h" | ||
| 1328 | |||
| 1329 | #include <glob.h> | ||
| 1330 | @@ -3026,12 +3028,12 @@ | ||
| 1331 | |||
| 1332 | |||
| 1333 | echo $ac_n "checking whether struct dirent allocates space for d_name""... $ac_c" 1>&6 | ||
| 1334 | -echo "configure:3030: checking whether struct dirent allocates space for d_name" >&5 | ||
| 1335 | +echo "configure:3032: checking whether struct dirent allocates space for d_name" >&5 | ||
| 1336 | if test "$cross_compiling" = yes; then | ||
| 1337 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 1338 | else | ||
| 1339 | cat > conftest.$ac_ext <<EOF | ||
| 1340 | -#line 3035 "configure" | ||
| 1341 | +#line 3037 "configure" | ||
| 1342 | #include "confdefs.h" | ||
| 1343 | |||
| 1344 | #include <sys/types.h> | ||
| 1345 | @@ -3039,7 +3041,7 @@ | ||
| 1346 | int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));} | ||
| 1347 | |||
| 1348 | EOF | ||
| 1349 | -if { (eval echo configure:3043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1350 | +if { (eval echo configure:3045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1351 | then | ||
| 1352 | echo "$ac_t""yes" 1>&6 | ||
| 1353 | else | ||
| 1354 | @@ -3080,12 +3082,12 @@ | ||
| 1355 | SKEY_MSG="yes" | ||
| 1356 | |||
| 1357 | echo $ac_n "checking for skey_keyinfo""... $ac_c" 1>&6 | ||
| 1358 | -echo "configure:3084: checking for skey_keyinfo" >&5 | ||
| 1359 | +echo "configure:3086: checking for skey_keyinfo" >&5 | ||
| 1360 | if eval "test \"`echo '$''{'ac_cv_func_skey_keyinfo'+set}'`\" = set"; then | ||
| 1361 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1362 | else | ||
| 1363 | cat > conftest.$ac_ext <<EOF | ||
| 1364 | -#line 3089 "configure" | ||
| 1365 | +#line 3091 "configure" | ||
| 1366 | #include "confdefs.h" | ||
| 1367 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1368 | which can conflict with char skey_keyinfo(); below. */ | ||
| 1369 | @@ -3108,7 +3110,7 @@ | ||
| 1370 | |||
| 1371 | ; return 0; } | ||
| 1372 | EOF | ||
| 1373 | -if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1374 | +if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1375 | rm -rf conftest* | ||
| 1376 | eval "ac_cv_func_skey_keyinfo=yes" | ||
| 1377 | else | ||
| 1378 | @@ -3135,6 +3137,55 @@ | ||
| 1379 | |||
| 1380 | fi | ||
| 1381 | |||
| 1382 | +SECURID_MSG="no" | ||
| 1383 | +# Check whether --with-securid or --without-securid was given. | ||
| 1384 | +if test "${with_securid+set}" = set; then | ||
| 1385 | + withval="$with_securid" | ||
| 1386 | + | ||
| 1387 | + if test "x$withval" != "xno" ; then | ||
| 1388 | + saved_LIBS="$LIBS" | ||
| 1389 | + LIBS="$LIBS sdiclient.a" | ||
| 1390 | + echo $ac_n "checking for sdiclient.a""... $ac_c" 1>&6 | ||
| 1391 | +echo "configure:3150: checking for sdiclient.a" >&5 | ||
| 1392 | + cat > conftest.$ac_ext <<EOF | ||
| 1393 | +#line 3152 "configure" | ||
| 1394 | +#include "confdefs.h" | ||
| 1395 | + | ||
| 1396 | +#include "sdi_athd.h" | ||
| 1397 | +#include "sdconf.h" | ||
| 1398 | +#include "sdacmvls.h" | ||
| 1399 | + struct SD_CLIENT sd_dat, *sd; | ||
| 1400 | + union config_record configure; | ||
| 1401 | + | ||
| 1402 | +int main() { | ||
| 1403 | +sd = &sd_dat; creadcfg(); sd_init(sd); | ||
| 1404 | +; return 0; } | ||
| 1405 | +EOF | ||
| 1406 | +if { (eval echo configure:3165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1407 | + rm -rf conftest* | ||
| 1408 | + | ||
| 1409 | + echo "$ac_t""yes" 1>&6 | ||
| 1410 | + cat >> confdefs.h <<\EOF | ||
| 1411 | +#define SECURID 1 | ||
| 1412 | +EOF | ||
| 1413 | + | ||
| 1414 | + SECURID_MSG="yes" | ||
| 1415 | + | ||
| 1416 | +else | ||
| 1417 | + echo "configure: failed program was:" >&5 | ||
| 1418 | + cat conftest.$ac_ext >&5 | ||
| 1419 | + rm -rf conftest* | ||
| 1420 | + | ||
| 1421 | + { echo "configure: error: *** sdiclient.a missing" 1>&2; exit 1; } | ||
| 1422 | + | ||
| 1423 | + | ||
| 1424 | +fi | ||
| 1425 | +rm -f conftest* | ||
| 1426 | + fi | ||
| 1427 | + | ||
| 1428 | + | ||
| 1429 | +fi | ||
| 1430 | + | ||
| 1431 | |||
| 1432 | # Check whether user wants TCP wrappers support | ||
| 1433 | TCPW_MSG="no" | ||
| 1434 | @@ -3146,9 +3197,9 @@ | ||
| 1435 | saved_LIBS="$LIBS" | ||
| 1436 | LIBS="-lwrap $LIBS" | ||
| 1437 | echo $ac_n "checking for libwrap""... $ac_c" 1>&6 | ||
| 1438 | -echo "configure:3150: checking for libwrap" >&5 | ||
| 1439 | +echo "configure:3201: checking for libwrap" >&5 | ||
| 1440 | cat > conftest.$ac_ext <<EOF | ||
| 1441 | -#line 3152 "configure" | ||
| 1442 | +#line 3203 "configure" | ||
| 1443 | #include "confdefs.h" | ||
| 1444 | |||
| 1445 | #include <tcpd.h> | ||
| 1446 | @@ -3158,7 +3209,7 @@ | ||
| 1447 | hosts_access(0); | ||
| 1448 | ; return 0; } | ||
| 1449 | EOF | ||
| 1450 | -if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1451 | +if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1452 | rm -rf conftest* | ||
| 1453 | |||
| 1454 | echo "$ac_t""yes" 1>&6 | ||
| 1455 | @@ -3187,12 +3238,12 @@ | ||
| 1456 | for ac_func in arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop | ||
| 1457 | do | ||
| 1458 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1459 | -echo "configure:3191: checking for $ac_func" >&5 | ||
| 1460 | +echo "configure:3242: checking for $ac_func" >&5 | ||
| 1461 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1462 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1463 | else | ||
| 1464 | cat > conftest.$ac_ext <<EOF | ||
| 1465 | -#line 3196 "configure" | ||
| 1466 | +#line 3247 "configure" | ||
| 1467 | #include "confdefs.h" | ||
| 1468 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1469 | which can conflict with char $ac_func(); below. */ | ||
| 1470 | @@ -3215,7 +3266,7 @@ | ||
| 1471 | |||
| 1472 | ; return 0; } | ||
| 1473 | EOF | ||
| 1474 | -if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1475 | +if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1476 | rm -rf conftest* | ||
| 1477 | eval "ac_cv_func_$ac_func=yes" | ||
| 1478 | else | ||
| 1479 | @@ -3242,12 +3293,12 @@ | ||
| 1480 | for ac_func in gettimeofday time | ||
| 1481 | do | ||
| 1482 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1483 | -echo "configure:3246: checking for $ac_func" >&5 | ||
| 1484 | +echo "configure:3297: checking for $ac_func" >&5 | ||
| 1485 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1486 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1487 | else | ||
| 1488 | cat > conftest.$ac_ext <<EOF | ||
| 1489 | -#line 3251 "configure" | ||
| 1490 | +#line 3302 "configure" | ||
| 1491 | #include "confdefs.h" | ||
| 1492 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1493 | which can conflict with char $ac_func(); below. */ | ||
| 1494 | @@ -3270,7 +3321,7 @@ | ||
| 1495 | |||
| 1496 | ; return 0; } | ||
| 1497 | EOF | ||
| 1498 | -if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1499 | +if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1500 | rm -rf conftest* | ||
| 1501 | eval "ac_cv_func_$ac_func=yes" | ||
| 1502 | else | ||
| 1503 | @@ -3298,17 +3349,17 @@ | ||
| 1504 | do | ||
| 1505 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
| 1506 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
| 1507 | -echo "configure:3302: checking for $ac_hdr" >&5 | ||
| 1508 | +echo "configure:3353: checking for $ac_hdr" >&5 | ||
| 1509 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
| 1510 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1511 | else | ||
| 1512 | cat > conftest.$ac_ext <<EOF | ||
| 1513 | -#line 3307 "configure" | ||
| 1514 | +#line 3358 "configure" | ||
| 1515 | #include "confdefs.h" | ||
| 1516 | #include <$ac_hdr> | ||
| 1517 | EOF | ||
| 1518 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 1519 | -{ (eval echo configure:3312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 1520 | +{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 1521 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 1522 | if test -z "$ac_err"; then | ||
| 1523 | rm -rf conftest* | ||
| 1524 | @@ -3337,12 +3388,12 @@ | ||
| 1525 | for ac_func in login logout updwtmp logwtmp | ||
| 1526 | do | ||
| 1527 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1528 | -echo "configure:3341: checking for $ac_func" >&5 | ||
| 1529 | +echo "configure:3392: checking for $ac_func" >&5 | ||
| 1530 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1531 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1532 | else | ||
| 1533 | cat > conftest.$ac_ext <<EOF | ||
| 1534 | -#line 3346 "configure" | ||
| 1535 | +#line 3397 "configure" | ||
| 1536 | #include "confdefs.h" | ||
| 1537 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1538 | which can conflict with char $ac_func(); below. */ | ||
| 1539 | @@ -3365,7 +3416,7 @@ | ||
| 1540 | |||
| 1541 | ; return 0; } | ||
| 1542 | EOF | ||
| 1543 | -if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1544 | +if { (eval echo configure:3420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1545 | rm -rf conftest* | ||
| 1546 | eval "ac_cv_func_$ac_func=yes" | ||
| 1547 | else | ||
| 1548 | @@ -3392,12 +3443,12 @@ | ||
| 1549 | for ac_func in endutent getutent getutid getutline pututline setutent | ||
| 1550 | do | ||
| 1551 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1552 | -echo "configure:3396: checking for $ac_func" >&5 | ||
| 1553 | +echo "configure:3447: checking for $ac_func" >&5 | ||
| 1554 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1555 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1556 | else | ||
| 1557 | cat > conftest.$ac_ext <<EOF | ||
| 1558 | -#line 3401 "configure" | ||
| 1559 | +#line 3452 "configure" | ||
| 1560 | #include "confdefs.h" | ||
| 1561 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1562 | which can conflict with char $ac_func(); below. */ | ||
| 1563 | @@ -3420,7 +3471,7 @@ | ||
| 1564 | |||
| 1565 | ; return 0; } | ||
| 1566 | EOF | ||
| 1567 | -if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1568 | +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1569 | rm -rf conftest* | ||
| 1570 | eval "ac_cv_func_$ac_func=yes" | ||
| 1571 | else | ||
| 1572 | @@ -3447,12 +3498,12 @@ | ||
| 1573 | for ac_func in utmpname | ||
| 1574 | do | ||
| 1575 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1576 | -echo "configure:3451: checking for $ac_func" >&5 | ||
| 1577 | +echo "configure:3502: checking for $ac_func" >&5 | ||
| 1578 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1579 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1580 | else | ||
| 1581 | cat > conftest.$ac_ext <<EOF | ||
| 1582 | -#line 3456 "configure" | ||
| 1583 | +#line 3507 "configure" | ||
| 1584 | #include "confdefs.h" | ||
| 1585 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1586 | which can conflict with char $ac_func(); below. */ | ||
| 1587 | @@ -3475,7 +3526,7 @@ | ||
| 1588 | |||
| 1589 | ; return 0; } | ||
| 1590 | EOF | ||
| 1591 | -if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1592 | +if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1593 | rm -rf conftest* | ||
| 1594 | eval "ac_cv_func_$ac_func=yes" | ||
| 1595 | else | ||
| 1596 | @@ -3502,12 +3553,12 @@ | ||
| 1597 | for ac_func in endutxent getutxent getutxid getutxline pututxline | ||
| 1598 | do | ||
| 1599 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1600 | -echo "configure:3506: checking for $ac_func" >&5 | ||
| 1601 | +echo "configure:3557: checking for $ac_func" >&5 | ||
| 1602 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1603 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1604 | else | ||
| 1605 | cat > conftest.$ac_ext <<EOF | ||
| 1606 | -#line 3511 "configure" | ||
| 1607 | +#line 3562 "configure" | ||
| 1608 | #include "confdefs.h" | ||
| 1609 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1610 | which can conflict with char $ac_func(); below. */ | ||
| 1611 | @@ -3530,7 +3581,7 @@ | ||
| 1612 | |||
| 1613 | ; return 0; } | ||
| 1614 | EOF | ||
| 1615 | -if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1616 | +if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1617 | rm -rf conftest* | ||
| 1618 | eval "ac_cv_func_$ac_func=yes" | ||
| 1619 | else | ||
| 1620 | @@ -3557,12 +3608,12 @@ | ||
| 1621 | for ac_func in setutxent utmpxname | ||
| 1622 | do | ||
| 1623 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1624 | -echo "configure:3561: checking for $ac_func" >&5 | ||
| 1625 | +echo "configure:3612: checking for $ac_func" >&5 | ||
| 1626 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1627 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1628 | else | ||
| 1629 | cat > conftest.$ac_ext <<EOF | ||
| 1630 | -#line 3566 "configure" | ||
| 1631 | +#line 3617 "configure" | ||
| 1632 | #include "confdefs.h" | ||
| 1633 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1634 | which can conflict with char $ac_func(); below. */ | ||
| 1635 | @@ -3585,7 +3636,7 @@ | ||
| 1636 | |||
| 1637 | ; return 0; } | ||
| 1638 | EOF | ||
| 1639 | -if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1640 | +if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1641 | rm -rf conftest* | ||
| 1642 | eval "ac_cv_func_$ac_func=yes" | ||
| 1643 | else | ||
| 1644 | @@ -3611,12 +3662,12 @@ | ||
| 1645 | |||
| 1646 | |||
| 1647 | echo $ac_n "checking for getuserattr""... $ac_c" 1>&6 | ||
| 1648 | -echo "configure:3615: checking for getuserattr" >&5 | ||
| 1649 | +echo "configure:3666: checking for getuserattr" >&5 | ||
| 1650 | if eval "test \"`echo '$''{'ac_cv_func_getuserattr'+set}'`\" = set"; then | ||
| 1651 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1652 | else | ||
| 1653 | cat > conftest.$ac_ext <<EOF | ||
| 1654 | -#line 3620 "configure" | ||
| 1655 | +#line 3671 "configure" | ||
| 1656 | #include "confdefs.h" | ||
| 1657 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1658 | which can conflict with char getuserattr(); below. */ | ||
| 1659 | @@ -3639,7 +3690,7 @@ | ||
| 1660 | |||
| 1661 | ; return 0; } | ||
| 1662 | EOF | ||
| 1663 | -if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1664 | +if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1665 | rm -rf conftest* | ||
| 1666 | eval "ac_cv_func_getuserattr=yes" | ||
| 1667 | else | ||
| 1668 | @@ -3660,7 +3711,7 @@ | ||
| 1669 | else | ||
| 1670 | echo "$ac_t""no" 1>&6 | ||
| 1671 | echo $ac_n "checking for getuserattr in -ls""... $ac_c" 1>&6 | ||
| 1672 | -echo "configure:3664: checking for getuserattr in -ls" >&5 | ||
| 1673 | +echo "configure:3715: checking for getuserattr in -ls" >&5 | ||
| 1674 | ac_lib_var=`echo s'_'getuserattr | sed 'y%./+-%__p_%'` | ||
| 1675 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1676 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1677 | @@ -3668,7 +3719,7 @@ | ||
| 1678 | ac_save_LIBS="$LIBS" | ||
| 1679 | LIBS="-ls $LIBS" | ||
| 1680 | cat > conftest.$ac_ext <<EOF | ||
| 1681 | -#line 3672 "configure" | ||
| 1682 | +#line 3723 "configure" | ||
| 1683 | #include "confdefs.h" | ||
| 1684 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1685 | /* We use char because int might match the return type of a gcc2 | ||
| 1686 | @@ -3679,7 +3730,7 @@ | ||
| 1687 | getuserattr() | ||
| 1688 | ; return 0; } | ||
| 1689 | EOF | ||
| 1690 | -if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1691 | +if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1692 | rm -rf conftest* | ||
| 1693 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1694 | else | ||
| 1695 | @@ -3707,12 +3758,12 @@ | ||
| 1696 | |||
| 1697 | |||
| 1698 | echo $ac_n "checking for login""... $ac_c" 1>&6 | ||
| 1699 | -echo "configure:3711: checking for login" >&5 | ||
| 1700 | +echo "configure:3762: checking for login" >&5 | ||
| 1701 | if eval "test \"`echo '$''{'ac_cv_func_login'+set}'`\" = set"; then | ||
| 1702 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1703 | else | ||
| 1704 | cat > conftest.$ac_ext <<EOF | ||
| 1705 | -#line 3716 "configure" | ||
| 1706 | +#line 3767 "configure" | ||
| 1707 | #include "confdefs.h" | ||
| 1708 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1709 | which can conflict with char login(); below. */ | ||
| 1710 | @@ -3735,7 +3786,7 @@ | ||
| 1711 | |||
| 1712 | ; return 0; } | ||
| 1713 | EOF | ||
| 1714 | -if { (eval echo configure:3739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1715 | +if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1716 | rm -rf conftest* | ||
| 1717 | eval "ac_cv_func_login=yes" | ||
| 1718 | else | ||
| 1719 | @@ -3756,7 +3807,7 @@ | ||
| 1720 | else | ||
| 1721 | echo "$ac_t""no" 1>&6 | ||
| 1722 | echo $ac_n "checking for login in -lbsd""... $ac_c" 1>&6 | ||
| 1723 | -echo "configure:3760: checking for login in -lbsd" >&5 | ||
| 1724 | +echo "configure:3811: checking for login in -lbsd" >&5 | ||
| 1725 | ac_lib_var=`echo bsd'_'login | sed 'y%./+-%__p_%'` | ||
| 1726 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1727 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1728 | @@ -3764,7 +3815,7 @@ | ||
| 1729 | ac_save_LIBS="$LIBS" | ||
| 1730 | LIBS="-lbsd $LIBS" | ||
| 1731 | cat > conftest.$ac_ext <<EOF | ||
| 1732 | -#line 3768 "configure" | ||
| 1733 | +#line 3819 "configure" | ||
| 1734 | #include "confdefs.h" | ||
| 1735 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1736 | /* We use char because int might match the return type of a gcc2 | ||
| 1737 | @@ -3775,7 +3826,7 @@ | ||
| 1738 | login() | ||
| 1739 | ; return 0; } | ||
| 1740 | EOF | ||
| 1741 | -if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1742 | +if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1743 | rm -rf conftest* | ||
| 1744 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1745 | else | ||
| 1746 | @@ -3803,12 +3854,12 @@ | ||
| 1747 | |||
| 1748 | |||
| 1749 | echo $ac_n "checking for daemon""... $ac_c" 1>&6 | ||
| 1750 | -echo "configure:3807: checking for daemon" >&5 | ||
| 1751 | +echo "configure:3858: checking for daemon" >&5 | ||
| 1752 | if eval "test \"`echo '$''{'ac_cv_func_daemon'+set}'`\" = set"; then | ||
| 1753 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1754 | else | ||
| 1755 | cat > conftest.$ac_ext <<EOF | ||
| 1756 | -#line 3812 "configure" | ||
| 1757 | +#line 3863 "configure" | ||
| 1758 | #include "confdefs.h" | ||
| 1759 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1760 | which can conflict with char daemon(); below. */ | ||
| 1761 | @@ -3831,7 +3882,7 @@ | ||
| 1762 | |||
| 1763 | ; return 0; } | ||
| 1764 | EOF | ||
| 1765 | -if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1766 | +if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1767 | rm -rf conftest* | ||
| 1768 | eval "ac_cv_func_daemon=yes" | ||
| 1769 | else | ||
| 1770 | @@ -3852,7 +3903,7 @@ | ||
| 1771 | else | ||
| 1772 | echo "$ac_t""no" 1>&6 | ||
| 1773 | echo $ac_n "checking for daemon in -lbsd""... $ac_c" 1>&6 | ||
| 1774 | -echo "configure:3856: checking for daemon in -lbsd" >&5 | ||
| 1775 | +echo "configure:3907: checking for daemon in -lbsd" >&5 | ||
| 1776 | ac_lib_var=`echo bsd'_'daemon | sed 'y%./+-%__p_%'` | ||
| 1777 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1778 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1779 | @@ -3860,7 +3911,7 @@ | ||
| 1780 | ac_save_LIBS="$LIBS" | ||
| 1781 | LIBS="-lbsd $LIBS" | ||
| 1782 | cat > conftest.$ac_ext <<EOF | ||
| 1783 | -#line 3864 "configure" | ||
| 1784 | +#line 3915 "configure" | ||
| 1785 | #include "confdefs.h" | ||
| 1786 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1787 | /* We use char because int might match the return type of a gcc2 | ||
| 1788 | @@ -3871,7 +3922,7 @@ | ||
| 1789 | daemon() | ||
| 1790 | ; return 0; } | ||
| 1791 | EOF | ||
| 1792 | -if { (eval echo configure:3875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1793 | +if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1794 | rm -rf conftest* | ||
| 1795 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1796 | else | ||
| 1797 | @@ -3899,12 +3950,12 @@ | ||
| 1798 | |||
| 1799 | |||
| 1800 | echo $ac_n "checking for getpagesize""... $ac_c" 1>&6 | ||
| 1801 | -echo "configure:3903: checking for getpagesize" >&5 | ||
| 1802 | +echo "configure:3954: checking for getpagesize" >&5 | ||
| 1803 | if eval "test \"`echo '$''{'ac_cv_func_getpagesize'+set}'`\" = set"; then | ||
| 1804 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1805 | else | ||
| 1806 | cat > conftest.$ac_ext <<EOF | ||
| 1807 | -#line 3908 "configure" | ||
| 1808 | +#line 3959 "configure" | ||
| 1809 | #include "confdefs.h" | ||
| 1810 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1811 | which can conflict with char getpagesize(); below. */ | ||
| 1812 | @@ -3927,7 +3978,7 @@ | ||
| 1813 | |||
| 1814 | ; return 0; } | ||
| 1815 | EOF | ||
| 1816 | -if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1817 | +if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1818 | rm -rf conftest* | ||
| 1819 | eval "ac_cv_func_getpagesize=yes" | ||
| 1820 | else | ||
| 1821 | @@ -3948,7 +3999,7 @@ | ||
| 1822 | else | ||
| 1823 | echo "$ac_t""no" 1>&6 | ||
| 1824 | echo $ac_n "checking for getpagesize in -lucb""... $ac_c" 1>&6 | ||
| 1825 | -echo "configure:3952: checking for getpagesize in -lucb" >&5 | ||
| 1826 | +echo "configure:4003: checking for getpagesize in -lucb" >&5 | ||
| 1827 | ac_lib_var=`echo ucb'_'getpagesize | sed 'y%./+-%__p_%'` | ||
| 1828 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1829 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1830 | @@ -3956,7 +4007,7 @@ | ||
| 1831 | ac_save_LIBS="$LIBS" | ||
| 1832 | LIBS="-lucb $LIBS" | ||
| 1833 | cat > conftest.$ac_ext <<EOF | ||
| 1834 | -#line 3960 "configure" | ||
| 1835 | +#line 4011 "configure" | ||
| 1836 | #include "confdefs.h" | ||
| 1837 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1838 | /* We use char because int might match the return type of a gcc2 | ||
| 1839 | @@ -3967,7 +4018,7 @@ | ||
| 1840 | getpagesize() | ||
| 1841 | ; return 0; } | ||
| 1842 | EOF | ||
| 1843 | -if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1844 | +if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1845 | rm -rf conftest* | ||
| 1846 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1847 | else | ||
| 1848 | @@ -3997,19 +4048,19 @@ | ||
| 1849 | # Check for broken snprintf | ||
| 1850 | if test "x$ac_cv_func_snprintf" = "xyes" ; then | ||
| 1851 | echo $ac_n "checking whether snprintf correctly terminates long strings""... $ac_c" 1>&6 | ||
| 1852 | -echo "configure:4001: checking whether snprintf correctly terminates long strings" >&5 | ||
| 1853 | +echo "configure:4052: checking whether snprintf correctly terminates long strings" >&5 | ||
| 1854 | if test "$cross_compiling" = yes; then | ||
| 1855 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 1856 | else | ||
| 1857 | cat > conftest.$ac_ext <<EOF | ||
| 1858 | -#line 4006 "configure" | ||
| 1859 | +#line 4057 "configure" | ||
| 1860 | #include "confdefs.h" | ||
| 1861 | |||
| 1862 | #include <stdio.h> | ||
| 1863 | int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} | ||
| 1864 | |||
| 1865 | EOF | ||
| 1866 | -if { (eval echo configure:4013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1867 | +if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1868 | then | ||
| 1869 | echo "$ac_t""yes" 1>&6 | ||
| 1870 | else | ||
| 1871 | @@ -4032,7 +4083,7 @@ | ||
| 1872 | fi | ||
| 1873 | |||
| 1874 | echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 | ||
| 1875 | -echo "configure:4036: checking whether getpgrp takes no argument" >&5 | ||
| 1876 | +echo "configure:4087: checking whether getpgrp takes no argument" >&5 | ||
| 1877 | if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then | ||
| 1878 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1879 | else | ||
| 1880 | @@ -4040,7 +4091,7 @@ | ||
| 1881 | { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } | ||
| 1882 | else | ||
| 1883 | cat > conftest.$ac_ext <<EOF | ||
| 1884 | -#line 4044 "configure" | ||
| 1885 | +#line 4095 "configure" | ||
| 1886 | #include "confdefs.h" | ||
| 1887 | |||
| 1888 | /* | ||
| 1889 | @@ -4095,7 +4146,7 @@ | ||
| 1890 | } | ||
| 1891 | |||
| 1892 | EOF | ||
| 1893 | -if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1894 | +if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 1895 | then | ||
| 1896 | ac_cv_func_getpgrp_void=yes | ||
| 1897 | else | ||
| 1898 | @@ -4131,7 +4182,7 @@ | ||
| 1899 | fi | ||
| 1900 | |||
| 1901 | echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | ||
| 1902 | -echo "configure:4135: checking for dlopen in -ldl" >&5 | ||
| 1903 | +echo "configure:4186: checking for dlopen in -ldl" >&5 | ||
| 1904 | ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` | ||
| 1905 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1906 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1907 | @@ -4139,7 +4190,7 @@ | ||
| 1908 | ac_save_LIBS="$LIBS" | ||
| 1909 | LIBS="-ldl $LIBS" | ||
| 1910 | cat > conftest.$ac_ext <<EOF | ||
| 1911 | -#line 4143 "configure" | ||
| 1912 | +#line 4194 "configure" | ||
| 1913 | #include "confdefs.h" | ||
| 1914 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1915 | /* We use char because int might match the return type of a gcc2 | ||
| 1916 | @@ -4150,7 +4201,7 @@ | ||
| 1917 | dlopen() | ||
| 1918 | ; return 0; } | ||
| 1919 | EOF | ||
| 1920 | -if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1921 | +if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1922 | rm -rf conftest* | ||
| 1923 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1924 | else | ||
| 1925 | @@ -4178,7 +4229,7 @@ | ||
| 1926 | fi | ||
| 1927 | |||
| 1928 | echo $ac_n "checking for pam_set_item in -lpam""... $ac_c" 1>&6 | ||
| 1929 | -echo "configure:4182: checking for pam_set_item in -lpam" >&5 | ||
| 1930 | +echo "configure:4233: checking for pam_set_item in -lpam" >&5 | ||
| 1931 | ac_lib_var=`echo pam'_'pam_set_item | sed 'y%./+-%__p_%'` | ||
| 1932 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 1933 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1934 | @@ -4186,7 +4237,7 @@ | ||
| 1935 | ac_save_LIBS="$LIBS" | ||
| 1936 | LIBS="-lpam $LIBS" | ||
| 1937 | cat > conftest.$ac_ext <<EOF | ||
| 1938 | -#line 4190 "configure" | ||
| 1939 | +#line 4241 "configure" | ||
| 1940 | #include "confdefs.h" | ||
| 1941 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 1942 | /* We use char because int might match the return type of a gcc2 | ||
| 1943 | @@ -4197,7 +4248,7 @@ | ||
| 1944 | pam_set_item() | ||
| 1945 | ; return 0; } | ||
| 1946 | EOF | ||
| 1947 | -if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1948 | +if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1949 | rm -rf conftest* | ||
| 1950 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 1951 | else | ||
| 1952 | @@ -4228,12 +4279,12 @@ | ||
| 1953 | for ac_func in pam_getenvlist | ||
| 1954 | do | ||
| 1955 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
| 1956 | -echo "configure:4232: checking for $ac_func" >&5 | ||
| 1957 | +echo "configure:4283: checking for $ac_func" >&5 | ||
| 1958 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
| 1959 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 1960 | else | ||
| 1961 | cat > conftest.$ac_ext <<EOF | ||
| 1962 | -#line 4237 "configure" | ||
| 1963 | +#line 4288 "configure" | ||
| 1964 | #include "confdefs.h" | ||
| 1965 | /* System header to define __stub macros and hopefully few prototypes, | ||
| 1966 | which can conflict with char $ac_func(); below. */ | ||
| 1967 | @@ -4256,7 +4307,7 @@ | ||
| 1968 | |||
| 1969 | ; return 0; } | ||
| 1970 | EOF | ||
| 1971 | -if { (eval echo configure:4260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1972 | +if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 1973 | rm -rf conftest* | ||
| 1974 | eval "ac_cv_func_$ac_func=yes" | ||
| 1975 | else | ||
| 1976 | @@ -4298,9 +4349,9 @@ | ||
| 1977 | if test "x$PAM_MSG" = "xyes" ; then | ||
| 1978 | # Check PAM strerror arguments (old PAM) | ||
| 1979 | echo $ac_n "checking whether pam_strerror takes only one argument""... $ac_c" 1>&6 | ||
| 1980 | -echo "configure:4302: checking whether pam_strerror takes only one argument" >&5 | ||
| 1981 | +echo "configure:4353: checking whether pam_strerror takes only one argument" >&5 | ||
| 1982 | cat > conftest.$ac_ext <<EOF | ||
| 1983 | -#line 4304 "configure" | ||
| 1984 | +#line 4355 "configure" | ||
| 1985 | #include "confdefs.h" | ||
| 1986 | |||
| 1987 | #include <stdlib.h> | ||
| 1988 | @@ -4310,7 +4361,7 @@ | ||
| 1989 | (void)pam_strerror((pam_handle_t *)NULL, -1); | ||
| 1990 | ; return 0; } | ||
| 1991 | EOF | ||
| 1992 | -if { (eval echo configure:4314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 1993 | +if { (eval echo configure:4365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 1994 | rm -rf conftest* | ||
| 1995 | echo "$ac_t""no" 1>&6 | ||
| 1996 | else | ||
| 1997 | @@ -4350,7 +4401,7 @@ | ||
| 1998 | tryssldir="$tryssldir $prefix" | ||
| 1999 | fi | ||
| 2000 | echo $ac_n "checking for OpenSSL directory""... $ac_c" 1>&6 | ||
| 2001 | -echo "configure:4354: checking for OpenSSL directory" >&5 | ||
| 2002 | +echo "configure:4405: checking for OpenSSL directory" >&5 | ||
| 2003 | if eval "test \"`echo '$''{'ac_cv_openssldir'+set}'`\" = set"; then | ||
| 2004 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2005 | else | ||
| 2006 | @@ -4393,7 +4444,7 @@ | ||
| 2007 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 2008 | else | ||
| 2009 | cat > conftest.$ac_ext <<EOF | ||
| 2010 | -#line 4397 "configure" | ||
| 2011 | +#line 4448 "configure" | ||
| 2012 | #include "confdefs.h" | ||
| 2013 | |||
| 2014 | #include <string.h> | ||
| 2015 | @@ -4407,7 +4458,7 @@ | ||
| 2016 | } | ||
| 2017 | |||
| 2018 | EOF | ||
| 2019 | -if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2020 | +if { (eval echo configure:4462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2021 | then | ||
| 2022 | |||
| 2023 | found_crypto=1 | ||
| 2024 | @@ -4476,7 +4527,7 @@ | ||
| 2025 | # Now test RSA support | ||
| 2026 | saved_LIBS="$LIBS" | ||
| 2027 | echo $ac_n "checking for RSA support""... $ac_c" 1>&6 | ||
| 2028 | -echo "configure:4480: checking for RSA support" >&5 | ||
| 2029 | +echo "configure:4531: checking for RSA support" >&5 | ||
| 2030 | for WANTS_RSAREF in "" 1 ; do | ||
| 2031 | if test -z "$WANTS_RSAREF" ; then | ||
| 2032 | LIBS="$saved_LIBS" | ||
| 2033 | @@ -4487,7 +4538,7 @@ | ||
| 2034 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 2035 | else | ||
| 2036 | cat > conftest.$ac_ext <<EOF | ||
| 2037 | -#line 4491 "configure" | ||
| 2038 | +#line 4542 "configure" | ||
| 2039 | #include "confdefs.h" | ||
| 2040 | |||
| 2041 | #include <string.h> | ||
| 2042 | @@ -4506,7 +4557,7 @@ | ||
| 2043 | } | ||
| 2044 | |||
| 2045 | EOF | ||
| 2046 | -if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2047 | +if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2048 | then | ||
| 2049 | |||
| 2050 | rsa_works=1 | ||
| 2051 | @@ -4544,7 +4595,7 @@ | ||
| 2052 | # version in OpenSSL. Skip this for PAM | ||
| 2053 | if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then | ||
| 2054 | echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 | ||
| 2055 | -echo "configure:4548: checking for crypt in -lcrypt" >&5 | ||
| 2056 | +echo "configure:4599: checking for crypt in -lcrypt" >&5 | ||
| 2057 | ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` | ||
| 2058 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 2059 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2060 | @@ -4552,7 +4603,7 @@ | ||
| 2061 | ac_save_LIBS="$LIBS" | ||
| 2062 | LIBS="-lcrypt $LIBS" | ||
| 2063 | cat > conftest.$ac_ext <<EOF | ||
| 2064 | -#line 4556 "configure" | ||
| 2065 | +#line 4607 "configure" | ||
| 2066 | #include "confdefs.h" | ||
| 2067 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 2068 | /* We use char because int might match the return type of a gcc2 | ||
| 2069 | @@ -4563,7 +4614,7 @@ | ||
| 2070 | crypt() | ||
| 2071 | ; return 0; } | ||
| 2072 | EOF | ||
| 2073 | -if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 2074 | +if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 2075 | rm -rf conftest* | ||
| 2076 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 2077 | else | ||
| 2078 | @@ -4592,7 +4643,7 @@ | ||
| 2079 | |||
| 2080 | # Checks for data types | ||
| 2081 | echo $ac_n "checking size of char""... $ac_c" 1>&6 | ||
| 2082 | -echo "configure:4596: checking size of char" >&5 | ||
| 2083 | +echo "configure:4647: checking size of char" >&5 | ||
| 2084 | if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then | ||
| 2085 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2086 | else | ||
| 2087 | @@ -4600,7 +4651,7 @@ | ||
| 2088 | ac_cv_sizeof_char=1 | ||
| 2089 | else | ||
| 2090 | cat > conftest.$ac_ext <<EOF | ||
| 2091 | -#line 4604 "configure" | ||
| 2092 | +#line 4655 "configure" | ||
| 2093 | #include "confdefs.h" | ||
| 2094 | #include <stdio.h> | ||
| 2095 | main() | ||
| 2096 | @@ -4611,7 +4662,7 @@ | ||
| 2097 | exit(0); | ||
| 2098 | } | ||
| 2099 | EOF | ||
| 2100 | -if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2101 | +if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2102 | then | ||
| 2103 | ac_cv_sizeof_char=`cat conftestval` | ||
| 2104 | else | ||
| 2105 | @@ -4631,7 +4682,7 @@ | ||
| 2106 | |||
| 2107 | |||
| 2108 | echo $ac_n "checking size of short int""... $ac_c" 1>&6 | ||
| 2109 | -echo "configure:4635: checking size of short int" >&5 | ||
| 2110 | +echo "configure:4686: checking size of short int" >&5 | ||
| 2111 | if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then | ||
| 2112 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2113 | else | ||
| 2114 | @@ -4639,7 +4690,7 @@ | ||
| 2115 | ac_cv_sizeof_short_int=2 | ||
| 2116 | else | ||
| 2117 | cat > conftest.$ac_ext <<EOF | ||
| 2118 | -#line 4643 "configure" | ||
| 2119 | +#line 4694 "configure" | ||
| 2120 | #include "confdefs.h" | ||
| 2121 | #include <stdio.h> | ||
| 2122 | main() | ||
| 2123 | @@ -4650,7 +4701,7 @@ | ||
| 2124 | exit(0); | ||
| 2125 | } | ||
| 2126 | EOF | ||
| 2127 | -if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2128 | +if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2129 | then | ||
| 2130 | ac_cv_sizeof_short_int=`cat conftestval` | ||
| 2131 | else | ||
| 2132 | @@ -4670,7 +4721,7 @@ | ||
| 2133 | |||
| 2134 | |||
| 2135 | echo $ac_n "checking size of int""... $ac_c" 1>&6 | ||
| 2136 | -echo "configure:4674: checking size of int" >&5 | ||
| 2137 | +echo "configure:4725: checking size of int" >&5 | ||
| 2138 | if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then | ||
| 2139 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2140 | else | ||
| 2141 | @@ -4678,7 +4729,7 @@ | ||
| 2142 | ac_cv_sizeof_int=4 | ||
| 2143 | else | ||
| 2144 | cat > conftest.$ac_ext <<EOF | ||
| 2145 | -#line 4682 "configure" | ||
| 2146 | +#line 4733 "configure" | ||
| 2147 | #include "confdefs.h" | ||
| 2148 | #include <stdio.h> | ||
| 2149 | main() | ||
| 2150 | @@ -4689,7 +4740,7 @@ | ||
| 2151 | exit(0); | ||
| 2152 | } | ||
| 2153 | EOF | ||
| 2154 | -if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2155 | +if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2156 | then | ||
| 2157 | ac_cv_sizeof_int=`cat conftestval` | ||
| 2158 | else | ||
| 2159 | @@ -4709,7 +4760,7 @@ | ||
| 2160 | |||
| 2161 | |||
| 2162 | echo $ac_n "checking size of long int""... $ac_c" 1>&6 | ||
| 2163 | -echo "configure:4713: checking size of long int" >&5 | ||
| 2164 | +echo "configure:4764: checking size of long int" >&5 | ||
| 2165 | if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then | ||
| 2166 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2167 | else | ||
| 2168 | @@ -4717,7 +4768,7 @@ | ||
| 2169 | ac_cv_sizeof_long_int=4 | ||
| 2170 | else | ||
| 2171 | cat > conftest.$ac_ext <<EOF | ||
| 2172 | -#line 4721 "configure" | ||
| 2173 | +#line 4772 "configure" | ||
| 2174 | #include "confdefs.h" | ||
| 2175 | #include <stdio.h> | ||
| 2176 | main() | ||
| 2177 | @@ -4728,7 +4779,7 @@ | ||
| 2178 | exit(0); | ||
| 2179 | } | ||
| 2180 | EOF | ||
| 2181 | -if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2182 | +if { (eval echo configure:4783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2183 | then | ||
| 2184 | ac_cv_sizeof_long_int=`cat conftestval` | ||
| 2185 | else | ||
| 2186 | @@ -4748,7 +4799,7 @@ | ||
| 2187 | |||
| 2188 | |||
| 2189 | echo $ac_n "checking size of long long int""... $ac_c" 1>&6 | ||
| 2190 | -echo "configure:4752: checking size of long long int" >&5 | ||
| 2191 | +echo "configure:4803: checking size of long long int" >&5 | ||
| 2192 | if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then | ||
| 2193 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2194 | else | ||
| 2195 | @@ -4756,7 +4807,7 @@ | ||
| 2196 | ac_cv_sizeof_long_long_int=8 | ||
| 2197 | else | ||
| 2198 | cat > conftest.$ac_ext <<EOF | ||
| 2199 | -#line 4760 "configure" | ||
| 2200 | +#line 4811 "configure" | ||
| 2201 | #include "confdefs.h" | ||
| 2202 | #include <stdio.h> | ||
| 2203 | main() | ||
| 2204 | @@ -4767,7 +4818,7 @@ | ||
| 2205 | exit(0); | ||
| 2206 | } | ||
| 2207 | EOF | ||
| 2208 | -if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2209 | +if { (eval echo configure:4822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2210 | then | ||
| 2211 | ac_cv_sizeof_long_long_int=`cat conftestval` | ||
| 2212 | else | ||
| 2213 | @@ -4789,20 +4840,20 @@ | ||
| 2214 | |||
| 2215 | # More checks for data types | ||
| 2216 | echo $ac_n "checking for u_int type""... $ac_c" 1>&6 | ||
| 2217 | -echo "configure:4793: checking for u_int type" >&5 | ||
| 2218 | +echo "configure:4844: checking for u_int type" >&5 | ||
| 2219 | if eval "test \"`echo '$''{'ac_cv_have_u_int'+set}'`\" = set"; then | ||
| 2220 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2221 | else | ||
| 2222 | |||
| 2223 | cat > conftest.$ac_ext <<EOF | ||
| 2224 | -#line 4799 "configure" | ||
| 2225 | +#line 4850 "configure" | ||
| 2226 | #include "confdefs.h" | ||
| 2227 | #include <sys/types.h> | ||
| 2228 | int main() { | ||
| 2229 | u_int a; a = 1; | ||
| 2230 | ; return 0; } | ||
| 2231 | EOF | ||
| 2232 | -if { (eval echo configure:4806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2233 | +if { (eval echo configure:4857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2234 | rm -rf conftest* | ||
| 2235 | ac_cv_have_u_int="yes" | ||
| 2236 | else | ||
| 2237 | @@ -4826,20 +4877,20 @@ | ||
| 2238 | fi | ||
| 2239 | |||
| 2240 | echo $ac_n "checking for intXX_t types""... $ac_c" 1>&6 | ||
| 2241 | -echo "configure:4830: checking for intXX_t types" >&5 | ||
| 2242 | +echo "configure:4881: checking for intXX_t types" >&5 | ||
| 2243 | if eval "test \"`echo '$''{'ac_cv_have_intxx_t'+set}'`\" = set"; then | ||
| 2244 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2245 | else | ||
| 2246 | |||
| 2247 | cat > conftest.$ac_ext <<EOF | ||
| 2248 | -#line 4836 "configure" | ||
| 2249 | +#line 4887 "configure" | ||
| 2250 | #include "confdefs.h" | ||
| 2251 | #include <sys/types.h> | ||
| 2252 | int main() { | ||
| 2253 | int8_t a; int16_t b; int32_t c; a = b = c = 1; | ||
| 2254 | ; return 0; } | ||
| 2255 | EOF | ||
| 2256 | -if { (eval echo configure:4843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2257 | +if { (eval echo configure:4894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2258 | rm -rf conftest* | ||
| 2259 | ac_cv_have_intxx_t="yes" | ||
| 2260 | else | ||
| 2261 | @@ -4863,20 +4914,20 @@ | ||
| 2262 | fi | ||
| 2263 | |||
| 2264 | echo $ac_n "checking for int64_t type""... $ac_c" 1>&6 | ||
| 2265 | -echo "configure:4867: checking for int64_t type" >&5 | ||
| 2266 | +echo "configure:4918: checking for int64_t type" >&5 | ||
| 2267 | if eval "test \"`echo '$''{'ac_cv_have_int64_t'+set}'`\" = set"; then | ||
| 2268 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2269 | else | ||
| 2270 | |||
| 2271 | cat > conftest.$ac_ext <<EOF | ||
| 2272 | -#line 4873 "configure" | ||
| 2273 | +#line 4924 "configure" | ||
| 2274 | #include "confdefs.h" | ||
| 2275 | #include <sys/types.h> | ||
| 2276 | int main() { | ||
| 2277 | int64_t a; a = 1; | ||
| 2278 | ; return 0; } | ||
| 2279 | EOF | ||
| 2280 | -if { (eval echo configure:4880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2281 | +if { (eval echo configure:4931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2282 | rm -rf conftest* | ||
| 2283 | ac_cv_have_int64_t="yes" | ||
| 2284 | else | ||
| 2285 | @@ -4900,20 +4951,20 @@ | ||
| 2286 | fi | ||
| 2287 | |||
| 2288 | echo $ac_n "checking for u_intXX_t types""... $ac_c" 1>&6 | ||
| 2289 | -echo "configure:4904: checking for u_intXX_t types" >&5 | ||
| 2290 | +echo "configure:4955: checking for u_intXX_t types" >&5 | ||
| 2291 | if eval "test \"`echo '$''{'ac_cv_have_u_intxx_t'+set}'`\" = set"; then | ||
| 2292 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2293 | else | ||
| 2294 | |||
| 2295 | cat > conftest.$ac_ext <<EOF | ||
| 2296 | -#line 4910 "configure" | ||
| 2297 | +#line 4961 "configure" | ||
| 2298 | #include "confdefs.h" | ||
| 2299 | #include <sys/types.h> | ||
| 2300 | int main() { | ||
| 2301 | u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; | ||
| 2302 | ; return 0; } | ||
| 2303 | EOF | ||
| 2304 | -if { (eval echo configure:4917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2305 | +if { (eval echo configure:4968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2306 | rm -rf conftest* | ||
| 2307 | ac_cv_have_u_intxx_t="yes" | ||
| 2308 | else | ||
| 2309 | @@ -4937,20 +4988,20 @@ | ||
| 2310 | fi | ||
| 2311 | |||
| 2312 | echo $ac_n "checking for u_int64_t types""... $ac_c" 1>&6 | ||
| 2313 | -echo "configure:4941: checking for u_int64_t types" >&5 | ||
| 2314 | +echo "configure:4992: checking for u_int64_t types" >&5 | ||
| 2315 | if eval "test \"`echo '$''{'ac_cv_have_u_int64_t'+set}'`\" = set"; then | ||
| 2316 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2317 | else | ||
| 2318 | |||
| 2319 | cat > conftest.$ac_ext <<EOF | ||
| 2320 | -#line 4947 "configure" | ||
| 2321 | +#line 4998 "configure" | ||
| 2322 | #include "confdefs.h" | ||
| 2323 | #include <sys/types.h> | ||
| 2324 | int main() { | ||
| 2325 | u_int64_t a; a = 1; | ||
| 2326 | ; return 0; } | ||
| 2327 | EOF | ||
| 2328 | -if { (eval echo configure:4954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2329 | +if { (eval echo configure:5005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2330 | rm -rf conftest* | ||
| 2331 | ac_cv_have_u_int64_t="yes" | ||
| 2332 | else | ||
| 2333 | @@ -4977,9 +5028,9 @@ | ||
| 2334 | test "x$ac_cv_header_sys_bitypes_h" = "xyes") | ||
| 2335 | then | ||
| 2336 | echo $ac_n "checking for intXX_t and u_intXX_t types in sys/bitypes.h""... $ac_c" 1>&6 | ||
| 2337 | -echo "configure:4981: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 | ||
| 2338 | +echo "configure:5032: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 | ||
| 2339 | cat > conftest.$ac_ext <<EOF | ||
| 2340 | -#line 4983 "configure" | ||
| 2341 | +#line 5034 "configure" | ||
| 2342 | #include "confdefs.h" | ||
| 2343 | |||
| 2344 | #include <sys/bitypes.h> | ||
| 2345 | @@ -4992,7 +5043,7 @@ | ||
| 2346 | |||
| 2347 | ; return 0; } | ||
| 2348 | EOF | ||
| 2349 | -if { (eval echo configure:4996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2350 | +if { (eval echo configure:5047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2351 | rm -rf conftest* | ||
| 2352 | |||
| 2353 | cat >> confdefs.h <<\EOF | ||
| 2354 | @@ -5017,13 +5068,13 @@ | ||
| 2355 | |||
| 2356 | if test -z "$have_u_intxx_t" ; then | ||
| 2357 | echo $ac_n "checking for uintXX_t types""... $ac_c" 1>&6 | ||
| 2358 | -echo "configure:5021: checking for uintXX_t types" >&5 | ||
| 2359 | +echo "configure:5072: checking for uintXX_t types" >&5 | ||
| 2360 | if eval "test \"`echo '$''{'ac_cv_have_uintxx_t'+set}'`\" = set"; then | ||
| 2361 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2362 | else | ||
| 2363 | |||
| 2364 | cat > conftest.$ac_ext <<EOF | ||
| 2365 | -#line 5027 "configure" | ||
| 2366 | +#line 5078 "configure" | ||
| 2367 | #include "confdefs.h" | ||
| 2368 | |||
| 2369 | #include <sys/types.h> | ||
| 2370 | @@ -5032,7 +5083,7 @@ | ||
| 2371 | uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; | ||
| 2372 | ; return 0; } | ||
| 2373 | EOF | ||
| 2374 | -if { (eval echo configure:5036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2375 | +if { (eval echo configure:5087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2376 | rm -rf conftest* | ||
| 2377 | ac_cv_have_uintxx_t="yes" | ||
| 2378 | else | ||
| 2379 | @@ -5056,13 +5107,13 @@ | ||
| 2380 | fi | ||
| 2381 | |||
| 2382 | echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 | ||
| 2383 | -echo "configure:5060: checking for socklen_t" >&5 | ||
| 2384 | +echo "configure:5111: checking for socklen_t" >&5 | ||
| 2385 | if eval "test \"`echo '$''{'ac_cv_have_socklen_t'+set}'`\" = set"; then | ||
| 2386 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2387 | else | ||
| 2388 | |||
| 2389 | cat > conftest.$ac_ext <<EOF | ||
| 2390 | -#line 5066 "configure" | ||
| 2391 | +#line 5117 "configure" | ||
| 2392 | #include "confdefs.h" | ||
| 2393 | |||
| 2394 | #include <sys/types.h> | ||
| 2395 | @@ -5072,7 +5123,7 @@ | ||
| 2396 | socklen_t foo; foo = 1235; | ||
| 2397 | ; return 0; } | ||
| 2398 | EOF | ||
| 2399 | -if { (eval echo configure:5076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2400 | +if { (eval echo configure:5127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2401 | rm -rf conftest* | ||
| 2402 | ac_cv_have_socklen_t="yes" | ||
| 2403 | else | ||
| 2404 | @@ -5095,13 +5146,13 @@ | ||
| 2405 | fi | ||
| 2406 | |||
| 2407 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | ||
| 2408 | -echo "configure:5099: checking for size_t" >&5 | ||
| 2409 | +echo "configure:5150: checking for size_t" >&5 | ||
| 2410 | if eval "test \"`echo '$''{'ac_cv_have_size_t'+set}'`\" = set"; then | ||
| 2411 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2412 | else | ||
| 2413 | |||
| 2414 | cat > conftest.$ac_ext <<EOF | ||
| 2415 | -#line 5105 "configure" | ||
| 2416 | +#line 5156 "configure" | ||
| 2417 | #include "confdefs.h" | ||
| 2418 | |||
| 2419 | #include <sys/types.h> | ||
| 2420 | @@ -5110,7 +5161,7 @@ | ||
| 2421 | size_t foo; foo = 1235; | ||
| 2422 | ; return 0; } | ||
| 2423 | EOF | ||
| 2424 | -if { (eval echo configure:5114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2425 | +if { (eval echo configure:5165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2426 | rm -rf conftest* | ||
| 2427 | ac_cv_have_size_t="yes" | ||
| 2428 | else | ||
| 2429 | @@ -5133,13 +5184,13 @@ | ||
| 2430 | fi | ||
| 2431 | |||
| 2432 | echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 | ||
| 2433 | -echo "configure:5137: checking for ssize_t" >&5 | ||
| 2434 | +echo "configure:5188: checking for ssize_t" >&5 | ||
| 2435 | if eval "test \"`echo '$''{'ac_cv_have_ssize_t'+set}'`\" = set"; then | ||
| 2436 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2437 | else | ||
| 2438 | |||
| 2439 | cat > conftest.$ac_ext <<EOF | ||
| 2440 | -#line 5143 "configure" | ||
| 2441 | +#line 5194 "configure" | ||
| 2442 | #include "confdefs.h" | ||
| 2443 | |||
| 2444 | #include <sys/types.h> | ||
| 2445 | @@ -5148,7 +5199,7 @@ | ||
| 2446 | ssize_t foo; foo = 1235; | ||
| 2447 | ; return 0; } | ||
| 2448 | EOF | ||
| 2449 | -if { (eval echo configure:5152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2450 | +if { (eval echo configure:5203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2451 | rm -rf conftest* | ||
| 2452 | ac_cv_have_ssize_t="yes" | ||
| 2453 | else | ||
| 2454 | @@ -5171,13 +5222,13 @@ | ||
| 2455 | fi | ||
| 2456 | |||
| 2457 | echo $ac_n "checking for clock_t""... $ac_c" 1>&6 | ||
| 2458 | -echo "configure:5175: checking for clock_t" >&5 | ||
| 2459 | +echo "configure:5226: checking for clock_t" >&5 | ||
| 2460 | if eval "test \"`echo '$''{'ac_cv_have_clock_t'+set}'`\" = set"; then | ||
| 2461 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2462 | else | ||
| 2463 | |||
| 2464 | cat > conftest.$ac_ext <<EOF | ||
| 2465 | -#line 5181 "configure" | ||
| 2466 | +#line 5232 "configure" | ||
| 2467 | #include "confdefs.h" | ||
| 2468 | |||
| 2469 | #include <time.h> | ||
| 2470 | @@ -5186,7 +5237,7 @@ | ||
| 2471 | clock_t foo; foo = 1235; | ||
| 2472 | ; return 0; } | ||
| 2473 | EOF | ||
| 2474 | -if { (eval echo configure:5190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2475 | +if { (eval echo configure:5241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2476 | rm -rf conftest* | ||
| 2477 | ac_cv_have_clock_t="yes" | ||
| 2478 | else | ||
| 2479 | @@ -5209,13 +5260,13 @@ | ||
| 2480 | fi | ||
| 2481 | |||
| 2482 | echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6 | ||
| 2483 | -echo "configure:5213: checking for sa_family_t" >&5 | ||
| 2484 | +echo "configure:5264: checking for sa_family_t" >&5 | ||
| 2485 | if eval "test \"`echo '$''{'ac_cv_have_sa_family_t'+set}'`\" = set"; then | ||
| 2486 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2487 | else | ||
| 2488 | |||
| 2489 | cat > conftest.$ac_ext <<EOF | ||
| 2490 | -#line 5219 "configure" | ||
| 2491 | +#line 5270 "configure" | ||
| 2492 | #include "confdefs.h" | ||
| 2493 | |||
| 2494 | #include <sys/types.h> | ||
| 2495 | @@ -5225,7 +5276,7 @@ | ||
| 2496 | sa_family_t foo; foo = 1235; | ||
| 2497 | ; return 0; } | ||
| 2498 | EOF | ||
| 2499 | -if { (eval echo configure:5229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2500 | +if { (eval echo configure:5280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2501 | rm -rf conftest* | ||
| 2502 | ac_cv_have_sa_family_t="yes" | ||
| 2503 | else | ||
| 2504 | @@ -5233,7 +5284,7 @@ | ||
| 2505 | cat conftest.$ac_ext >&5 | ||
| 2506 | rm -rf conftest* | ||
| 2507 | cat > conftest.$ac_ext <<EOF | ||
| 2508 | -#line 5237 "configure" | ||
| 2509 | +#line 5288 "configure" | ||
| 2510 | #include "confdefs.h" | ||
| 2511 | |||
| 2512 | #include <sys/types.h> | ||
| 2513 | @@ -5244,7 +5295,7 @@ | ||
| 2514 | sa_family_t foo; foo = 1235; | ||
| 2515 | ; return 0; } | ||
| 2516 | EOF | ||
| 2517 | -if { (eval echo configure:5248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2518 | +if { (eval echo configure:5299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2519 | rm -rf conftest* | ||
| 2520 | ac_cv_have_sa_family_t="yes" | ||
| 2521 | else | ||
| 2522 | @@ -5270,13 +5321,13 @@ | ||
| 2523 | fi | ||
| 2524 | |||
| 2525 | echo $ac_n "checking for pid_t""... $ac_c" 1>&6 | ||
| 2526 | -echo "configure:5274: checking for pid_t" >&5 | ||
| 2527 | +echo "configure:5325: checking for pid_t" >&5 | ||
| 2528 | if eval "test \"`echo '$''{'ac_cv_have_pid_t'+set}'`\" = set"; then | ||
| 2529 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2530 | else | ||
| 2531 | |||
| 2532 | cat > conftest.$ac_ext <<EOF | ||
| 2533 | -#line 5280 "configure" | ||
| 2534 | +#line 5331 "configure" | ||
| 2535 | #include "confdefs.h" | ||
| 2536 | |||
| 2537 | #include <sys/types.h> | ||
| 2538 | @@ -5285,7 +5336,7 @@ | ||
| 2539 | pid_t foo; foo = 1235; | ||
| 2540 | ; return 0; } | ||
| 2541 | EOF | ||
| 2542 | -if { (eval echo configure:5289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2543 | +if { (eval echo configure:5340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2544 | rm -rf conftest* | ||
| 2545 | ac_cv_have_pid_t="yes" | ||
| 2546 | else | ||
| 2547 | @@ -5308,13 +5359,13 @@ | ||
| 2548 | fi | ||
| 2549 | |||
| 2550 | echo $ac_n "checking for mode_t""... $ac_c" 1>&6 | ||
| 2551 | -echo "configure:5312: checking for mode_t" >&5 | ||
| 2552 | +echo "configure:5363: checking for mode_t" >&5 | ||
| 2553 | if eval "test \"`echo '$''{'ac_cv_have_mode_t'+set}'`\" = set"; then | ||
| 2554 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2555 | else | ||
| 2556 | |||
| 2557 | cat > conftest.$ac_ext <<EOF | ||
| 2558 | -#line 5318 "configure" | ||
| 2559 | +#line 5369 "configure" | ||
| 2560 | #include "confdefs.h" | ||
| 2561 | |||
| 2562 | #include <sys/types.h> | ||
| 2563 | @@ -5323,7 +5374,7 @@ | ||
| 2564 | mode_t foo; foo = 1235; | ||
| 2565 | ; return 0; } | ||
| 2566 | EOF | ||
| 2567 | -if { (eval echo configure:5327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2568 | +if { (eval echo configure:5378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2569 | rm -rf conftest* | ||
| 2570 | ac_cv_have_mode_t="yes" | ||
| 2571 | else | ||
| 2572 | @@ -5347,13 +5398,13 @@ | ||
| 2573 | |||
| 2574 | |||
| 2575 | echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 | ||
| 2576 | -echo "configure:5351: checking for struct sockaddr_storage" >&5 | ||
| 2577 | +echo "configure:5402: checking for struct sockaddr_storage" >&5 | ||
| 2578 | if eval "test \"`echo '$''{'ac_cv_have_struct_sockaddr_storage'+set}'`\" = set"; then | ||
| 2579 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2580 | else | ||
| 2581 | |||
| 2582 | cat > conftest.$ac_ext <<EOF | ||
| 2583 | -#line 5357 "configure" | ||
| 2584 | +#line 5408 "configure" | ||
| 2585 | #include "confdefs.h" | ||
| 2586 | |||
| 2587 | #include <sys/types.h> | ||
| 2588 | @@ -5363,7 +5414,7 @@ | ||
| 2589 | struct sockaddr_storage s; | ||
| 2590 | ; return 0; } | ||
| 2591 | EOF | ||
| 2592 | -if { (eval echo configure:5367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2593 | +if { (eval echo configure:5418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2594 | rm -rf conftest* | ||
| 2595 | ac_cv_have_struct_sockaddr_storage="yes" | ||
| 2596 | else | ||
| 2597 | @@ -5386,13 +5437,13 @@ | ||
| 2598 | fi | ||
| 2599 | |||
| 2600 | echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6 | ||
| 2601 | -echo "configure:5390: checking for struct sockaddr_in6" >&5 | ||
| 2602 | +echo "configure:5441: checking for struct sockaddr_in6" >&5 | ||
| 2603 | if eval "test \"`echo '$''{'ac_cv_have_struct_sockaddr_in6'+set}'`\" = set"; then | ||
| 2604 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2605 | else | ||
| 2606 | |||
| 2607 | cat > conftest.$ac_ext <<EOF | ||
| 2608 | -#line 5396 "configure" | ||
| 2609 | +#line 5447 "configure" | ||
| 2610 | #include "confdefs.h" | ||
| 2611 | |||
| 2612 | #include <sys/types.h> | ||
| 2613 | @@ -5402,7 +5453,7 @@ | ||
| 2614 | struct sockaddr_in6 s; s.sin6_family = 0; | ||
| 2615 | ; return 0; } | ||
| 2616 | EOF | ||
| 2617 | -if { (eval echo configure:5406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2618 | +if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2619 | rm -rf conftest* | ||
| 2620 | ac_cv_have_struct_sockaddr_in6="yes" | ||
| 2621 | else | ||
| 2622 | @@ -5425,13 +5476,13 @@ | ||
| 2623 | fi | ||
| 2624 | |||
| 2625 | echo $ac_n "checking for struct in6_addr""... $ac_c" 1>&6 | ||
| 2626 | -echo "configure:5429: checking for struct in6_addr" >&5 | ||
| 2627 | +echo "configure:5480: checking for struct in6_addr" >&5 | ||
| 2628 | if eval "test \"`echo '$''{'ac_cv_have_struct_in6_addr'+set}'`\" = set"; then | ||
| 2629 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2630 | else | ||
| 2631 | |||
| 2632 | cat > conftest.$ac_ext <<EOF | ||
| 2633 | -#line 5435 "configure" | ||
| 2634 | +#line 5486 "configure" | ||
| 2635 | #include "confdefs.h" | ||
| 2636 | |||
| 2637 | #include <sys/types.h> | ||
| 2638 | @@ -5441,7 +5492,7 @@ | ||
| 2639 | struct in6_addr s; s.s6_addr[0] = 0; | ||
| 2640 | ; return 0; } | ||
| 2641 | EOF | ||
| 2642 | -if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2643 | +if { (eval echo configure:5496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2644 | rm -rf conftest* | ||
| 2645 | ac_cv_have_struct_in6_addr="yes" | ||
| 2646 | else | ||
| 2647 | @@ -5464,13 +5515,13 @@ | ||
| 2648 | fi | ||
| 2649 | |||
| 2650 | echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 | ||
| 2651 | -echo "configure:5468: checking for struct addrinfo" >&5 | ||
| 2652 | +echo "configure:5519: checking for struct addrinfo" >&5 | ||
| 2653 | if eval "test \"`echo '$''{'ac_cv_have_struct_addrinfo'+set}'`\" = set"; then | ||
| 2654 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2655 | else | ||
| 2656 | |||
| 2657 | cat > conftest.$ac_ext <<EOF | ||
| 2658 | -#line 5474 "configure" | ||
| 2659 | +#line 5525 "configure" | ||
| 2660 | #include "confdefs.h" | ||
| 2661 | |||
| 2662 | #include <sys/types.h> | ||
| 2663 | @@ -5481,7 +5532,7 @@ | ||
| 2664 | struct addrinfo s; s.ai_flags = AI_PASSIVE; | ||
| 2665 | ; return 0; } | ||
| 2666 | EOF | ||
| 2667 | -if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2668 | +if { (eval echo configure:5536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2669 | rm -rf conftest* | ||
| 2670 | ac_cv_have_struct_addrinfo="yes" | ||
| 2671 | else | ||
| 2672 | @@ -5504,20 +5555,20 @@ | ||
| 2673 | fi | ||
| 2674 | |||
| 2675 | echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 | ||
| 2676 | -echo "configure:5508: checking for struct timeval" >&5 | ||
| 2677 | +echo "configure:5559: checking for struct timeval" >&5 | ||
| 2678 | if eval "test \"`echo '$''{'ac_cv_have_struct_timeval'+set}'`\" = set"; then | ||
| 2679 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2680 | else | ||
| 2681 | |||
| 2682 | cat > conftest.$ac_ext <<EOF | ||
| 2683 | -#line 5514 "configure" | ||
| 2684 | +#line 5565 "configure" | ||
| 2685 | #include "confdefs.h" | ||
| 2686 | #include <sys/time.h> | ||
| 2687 | int main() { | ||
| 2688 | struct timeval tv; tv.tv_sec = 1; | ||
| 2689 | ; return 0; } | ||
| 2690 | EOF | ||
| 2691 | -if { (eval echo configure:5521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2692 | +if { (eval echo configure:5572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 2693 | rm -rf conftest* | ||
| 2694 | ac_cv_have_struct_timeval="yes" | ||
| 2695 | else | ||
| 2696 | @@ -5551,7 +5602,7 @@ | ||
| 2697 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
| 2698 | else | ||
| 2699 | cat > conftest.$ac_ext <<EOF | ||
| 2700 | -#line 5555 "configure" | ||
| 2701 | +#line 5606 "configure" | ||
| 2702 | #include "confdefs.h" | ||
| 2703 | |||
| 2704 | #include <stdio.h> | ||
| 2705 | @@ -5578,7 +5629,7 @@ | ||
| 2706 | #endif | ||
| 2707 | |||
| 2708 | EOF | ||
| 2709 | -if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2710 | +if { (eval echo configure:5633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 2711 | then | ||
| 2712 | true | ||
| 2713 | else | ||
| 2714 | @@ -5602,13 +5653,13 @@ | ||
| 2715 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2716 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host | ||
| 2717 | echo $ac_n "checking for ut_host field in utmp.h""... $ac_c" 1>&6 | ||
| 2718 | -echo "configure:5606: checking for ut_host field in utmp.h" >&5 | ||
| 2719 | +echo "configure:5657: checking for ut_host field in utmp.h" >&5 | ||
| 2720 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2721 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2722 | else | ||
| 2723 | |||
| 2724 | cat > conftest.$ac_ext <<EOF | ||
| 2725 | -#line 5612 "configure" | ||
| 2726 | +#line 5663 "configure" | ||
| 2727 | #include "confdefs.h" | ||
| 2728 | #include <utmp.h> | ||
| 2729 | EOF | ||
| 2730 | @@ -5642,13 +5693,13 @@ | ||
| 2731 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2732 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host | ||
| 2733 | echo $ac_n "checking for ut_host field in utmpx.h""... $ac_c" 1>&6 | ||
| 2734 | -echo "configure:5646: checking for ut_host field in utmpx.h" >&5 | ||
| 2735 | +echo "configure:5697: checking for ut_host field in utmpx.h" >&5 | ||
| 2736 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2737 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2738 | else | ||
| 2739 | |||
| 2740 | cat > conftest.$ac_ext <<EOF | ||
| 2741 | -#line 5652 "configure" | ||
| 2742 | +#line 5703 "configure" | ||
| 2743 | #include "confdefs.h" | ||
| 2744 | #include <utmpx.h> | ||
| 2745 | EOF | ||
| 2746 | @@ -5682,13 +5733,13 @@ | ||
| 2747 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2748 | ossh_varname="ossh_cv_$ossh_safe""_has_"syslen | ||
| 2749 | echo $ac_n "checking for syslen field in utmpx.h""... $ac_c" 1>&6 | ||
| 2750 | -echo "configure:5686: checking for syslen field in utmpx.h" >&5 | ||
| 2751 | +echo "configure:5737: checking for syslen field in utmpx.h" >&5 | ||
| 2752 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2753 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2754 | else | ||
| 2755 | |||
| 2756 | cat > conftest.$ac_ext <<EOF | ||
| 2757 | -#line 5692 "configure" | ||
| 2758 | +#line 5743 "configure" | ||
| 2759 | #include "confdefs.h" | ||
| 2760 | #include <utmpx.h> | ||
| 2761 | EOF | ||
| 2762 | @@ -5722,13 +5773,13 @@ | ||
| 2763 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2764 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid | ||
| 2765 | echo $ac_n "checking for ut_pid field in utmp.h""... $ac_c" 1>&6 | ||
| 2766 | -echo "configure:5726: checking for ut_pid field in utmp.h" >&5 | ||
| 2767 | +echo "configure:5777: checking for ut_pid field in utmp.h" >&5 | ||
| 2768 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2769 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2770 | else | ||
| 2771 | |||
| 2772 | cat > conftest.$ac_ext <<EOF | ||
| 2773 | -#line 5732 "configure" | ||
| 2774 | +#line 5783 "configure" | ||
| 2775 | #include "confdefs.h" | ||
| 2776 | #include <utmp.h> | ||
| 2777 | EOF | ||
| 2778 | @@ -5762,13 +5813,13 @@ | ||
| 2779 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2780 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type | ||
| 2781 | echo $ac_n "checking for ut_type field in utmp.h""... $ac_c" 1>&6 | ||
| 2782 | -echo "configure:5766: checking for ut_type field in utmp.h" >&5 | ||
| 2783 | +echo "configure:5817: checking for ut_type field in utmp.h" >&5 | ||
| 2784 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2785 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2786 | else | ||
| 2787 | |||
| 2788 | cat > conftest.$ac_ext <<EOF | ||
| 2789 | -#line 5772 "configure" | ||
| 2790 | +#line 5823 "configure" | ||
| 2791 | #include "confdefs.h" | ||
| 2792 | #include <utmp.h> | ||
| 2793 | EOF | ||
| 2794 | @@ -5802,13 +5853,13 @@ | ||
| 2795 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2796 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type | ||
| 2797 | echo $ac_n "checking for ut_type field in utmpx.h""... $ac_c" 1>&6 | ||
| 2798 | -echo "configure:5806: checking for ut_type field in utmpx.h" >&5 | ||
| 2799 | +echo "configure:5857: checking for ut_type field in utmpx.h" >&5 | ||
| 2800 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2801 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2802 | else | ||
| 2803 | |||
| 2804 | cat > conftest.$ac_ext <<EOF | ||
| 2805 | -#line 5812 "configure" | ||
| 2806 | +#line 5863 "configure" | ||
| 2807 | #include "confdefs.h" | ||
| 2808 | #include <utmpx.h> | ||
| 2809 | EOF | ||
| 2810 | @@ -5842,13 +5893,13 @@ | ||
| 2811 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2812 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv | ||
| 2813 | echo $ac_n "checking for ut_tv field in utmp.h""... $ac_c" 1>&6 | ||
| 2814 | -echo "configure:5846: checking for ut_tv field in utmp.h" >&5 | ||
| 2815 | +echo "configure:5897: checking for ut_tv field in utmp.h" >&5 | ||
| 2816 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2817 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2818 | else | ||
| 2819 | |||
| 2820 | cat > conftest.$ac_ext <<EOF | ||
| 2821 | -#line 5852 "configure" | ||
| 2822 | +#line 5903 "configure" | ||
| 2823 | #include "confdefs.h" | ||
| 2824 | #include <utmp.h> | ||
| 2825 | EOF | ||
| 2826 | @@ -5882,13 +5933,13 @@ | ||
| 2827 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2828 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id | ||
| 2829 | echo $ac_n "checking for ut_id field in utmp.h""... $ac_c" 1>&6 | ||
| 2830 | -echo "configure:5886: checking for ut_id field in utmp.h" >&5 | ||
| 2831 | +echo "configure:5937: checking for ut_id field in utmp.h" >&5 | ||
| 2832 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2833 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2834 | else | ||
| 2835 | |||
| 2836 | cat > conftest.$ac_ext <<EOF | ||
| 2837 | -#line 5892 "configure" | ||
| 2838 | +#line 5943 "configure" | ||
| 2839 | #include "confdefs.h" | ||
| 2840 | #include <utmp.h> | ||
| 2841 | EOF | ||
| 2842 | @@ -5922,13 +5973,13 @@ | ||
| 2843 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2844 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id | ||
| 2845 | echo $ac_n "checking for ut_id field in utmpx.h""... $ac_c" 1>&6 | ||
| 2846 | -echo "configure:5926: checking for ut_id field in utmpx.h" >&5 | ||
| 2847 | +echo "configure:5977: checking for ut_id field in utmpx.h" >&5 | ||
| 2848 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2849 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2850 | else | ||
| 2851 | |||
| 2852 | cat > conftest.$ac_ext <<EOF | ||
| 2853 | -#line 5932 "configure" | ||
| 2854 | +#line 5983 "configure" | ||
| 2855 | #include "confdefs.h" | ||
| 2856 | #include <utmpx.h> | ||
| 2857 | EOF | ||
| 2858 | @@ -5962,13 +6013,13 @@ | ||
| 2859 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2860 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr | ||
| 2861 | echo $ac_n "checking for ut_addr field in utmp.h""... $ac_c" 1>&6 | ||
| 2862 | -echo "configure:5966: checking for ut_addr field in utmp.h" >&5 | ||
| 2863 | +echo "configure:6017: checking for ut_addr field in utmp.h" >&5 | ||
| 2864 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2865 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2866 | else | ||
| 2867 | |||
| 2868 | cat > conftest.$ac_ext <<EOF | ||
| 2869 | -#line 5972 "configure" | ||
| 2870 | +#line 6023 "configure" | ||
| 2871 | #include "confdefs.h" | ||
| 2872 | #include <utmp.h> | ||
| 2873 | EOF | ||
| 2874 | @@ -6002,13 +6053,13 @@ | ||
| 2875 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2876 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr | ||
| 2877 | echo $ac_n "checking for ut_addr field in utmpx.h""... $ac_c" 1>&6 | ||
| 2878 | -echo "configure:6006: checking for ut_addr field in utmpx.h" >&5 | ||
| 2879 | +echo "configure:6057: checking for ut_addr field in utmpx.h" >&5 | ||
| 2880 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2881 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2882 | else | ||
| 2883 | |||
| 2884 | cat > conftest.$ac_ext <<EOF | ||
| 2885 | -#line 6012 "configure" | ||
| 2886 | +#line 6063 "configure" | ||
| 2887 | #include "confdefs.h" | ||
| 2888 | #include <utmpx.h> | ||
| 2889 | EOF | ||
| 2890 | @@ -6042,13 +6093,13 @@ | ||
| 2891 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2892 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 | ||
| 2893 | echo $ac_n "checking for ut_addr_v6 field in utmp.h""... $ac_c" 1>&6 | ||
| 2894 | -echo "configure:6046: checking for ut_addr_v6 field in utmp.h" >&5 | ||
| 2895 | +echo "configure:6097: checking for ut_addr_v6 field in utmp.h" >&5 | ||
| 2896 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2897 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2898 | else | ||
| 2899 | |||
| 2900 | cat > conftest.$ac_ext <<EOF | ||
| 2901 | -#line 6052 "configure" | ||
| 2902 | +#line 6103 "configure" | ||
| 2903 | #include "confdefs.h" | ||
| 2904 | #include <utmp.h> | ||
| 2905 | EOF | ||
| 2906 | @@ -6082,13 +6133,13 @@ | ||
| 2907 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2908 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 | ||
| 2909 | echo $ac_n "checking for ut_addr_v6 field in utmpx.h""... $ac_c" 1>&6 | ||
| 2910 | -echo "configure:6086: checking for ut_addr_v6 field in utmpx.h" >&5 | ||
| 2911 | +echo "configure:6137: checking for ut_addr_v6 field in utmpx.h" >&5 | ||
| 2912 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2913 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2914 | else | ||
| 2915 | |||
| 2916 | cat > conftest.$ac_ext <<EOF | ||
| 2917 | -#line 6092 "configure" | ||
| 2918 | +#line 6143 "configure" | ||
| 2919 | #include "confdefs.h" | ||
| 2920 | #include <utmpx.h> | ||
| 2921 | EOF | ||
| 2922 | @@ -6122,13 +6173,13 @@ | ||
| 2923 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2924 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit | ||
| 2925 | echo $ac_n "checking for ut_exit field in utmp.h""... $ac_c" 1>&6 | ||
| 2926 | -echo "configure:6126: checking for ut_exit field in utmp.h" >&5 | ||
| 2927 | +echo "configure:6177: checking for ut_exit field in utmp.h" >&5 | ||
| 2928 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2929 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2930 | else | ||
| 2931 | |||
| 2932 | cat > conftest.$ac_ext <<EOF | ||
| 2933 | -#line 6132 "configure" | ||
| 2934 | +#line 6183 "configure" | ||
| 2935 | #include "confdefs.h" | ||
| 2936 | #include <utmp.h> | ||
| 2937 | EOF | ||
| 2938 | @@ -6162,13 +6213,13 @@ | ||
| 2939 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | ||
| 2940 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time | ||
| 2941 | echo $ac_n "checking for ut_time field in utmp.h""... $ac_c" 1>&6 | ||
| 2942 | -echo "configure:6166: checking for ut_time field in utmp.h" >&5 | ||
| 2943 | +echo "configure:6217: checking for ut_time field in utmp.h" >&5 | ||
| 2944 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2945 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2946 | else | ||
| 2947 | |||
| 2948 | cat > conftest.$ac_ext <<EOF | ||
| 2949 | -#line 6172 "configure" | ||
| 2950 | +#line 6223 "configure" | ||
| 2951 | #include "confdefs.h" | ||
| 2952 | #include <utmp.h> | ||
| 2953 | EOF | ||
| 2954 | @@ -6202,13 +6253,13 @@ | ||
| 2955 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2956 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time | ||
| 2957 | echo $ac_n "checking for ut_time field in utmpx.h""... $ac_c" 1>&6 | ||
| 2958 | -echo "configure:6206: checking for ut_time field in utmpx.h" >&5 | ||
| 2959 | +echo "configure:6257: checking for ut_time field in utmpx.h" >&5 | ||
| 2960 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2961 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2962 | else | ||
| 2963 | |||
| 2964 | cat > conftest.$ac_ext <<EOF | ||
| 2965 | -#line 6212 "configure" | ||
| 2966 | +#line 6263 "configure" | ||
| 2967 | #include "confdefs.h" | ||
| 2968 | #include <utmpx.h> | ||
| 2969 | EOF | ||
| 2970 | @@ -6242,13 +6293,13 @@ | ||
| 2971 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | ||
| 2972 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv | ||
| 2973 | echo $ac_n "checking for ut_tv field in utmpx.h""... $ac_c" 1>&6 | ||
| 2974 | -echo "configure:6246: checking for ut_tv field in utmpx.h" >&5 | ||
| 2975 | +echo "configure:6297: checking for ut_tv field in utmpx.h" >&5 | ||
| 2976 | if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then | ||
| 2977 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2978 | else | ||
| 2979 | |||
| 2980 | cat > conftest.$ac_ext <<EOF | ||
| 2981 | -#line 6252 "configure" | ||
| 2982 | +#line 6303 "configure" | ||
| 2983 | #include "confdefs.h" | ||
| 2984 | #include <utmpx.h> | ||
| 2985 | EOF | ||
| 2986 | @@ -6278,12 +6329,12 @@ | ||
| 2987 | fi | ||
| 2988 | |||
| 2989 | echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 | ||
| 2990 | -echo "configure:6282: checking for st_blksize in struct stat" >&5 | ||
| 2991 | +echo "configure:6333: checking for st_blksize in struct stat" >&5 | ||
| 2992 | if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then | ||
| 2993 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 2994 | else | ||
| 2995 | cat > conftest.$ac_ext <<EOF | ||
| 2996 | -#line 6287 "configure" | ||
| 2997 | +#line 6338 "configure" | ||
| 2998 | #include "confdefs.h" | ||
| 2999 | #include <sys/types.h> | ||
| 3000 | #include <sys/stat.h> | ||
| 3001 | @@ -6291,7 +6342,7 @@ | ||
| 3002 | struct stat s; s.st_blksize; | ||
| 3003 | ; return 0; } | ||
| 3004 | EOF | ||
| 3005 | -if { (eval echo configure:6295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3006 | +if { (eval echo configure:6346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3007 | rm -rf conftest* | ||
| 3008 | ac_cv_struct_st_blksize=yes | ||
| 3009 | else | ||
| 3010 | @@ -6313,13 +6364,13 @@ | ||
| 3011 | |||
| 3012 | |||
| 3013 | echo $ac_n "checking for sun_len field in struct sockaddr_un""... $ac_c" 1>&6 | ||
| 3014 | -echo "configure:6317: checking for sun_len field in struct sockaddr_un" >&5 | ||
| 3015 | +echo "configure:6368: checking for sun_len field in struct sockaddr_un" >&5 | ||
| 3016 | if eval "test \"`echo '$''{'ac_cv_have_sun_len_in_struct_sockaddr_un'+set}'`\" = set"; then | ||
| 3017 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3018 | else | ||
| 3019 | |||
| 3020 | cat > conftest.$ac_ext <<EOF | ||
| 3021 | -#line 6323 "configure" | ||
| 3022 | +#line 6374 "configure" | ||
| 3023 | #include "confdefs.h" | ||
| 3024 | |||
| 3025 | #include <sys/types.h> | ||
| 3026 | @@ -6329,7 +6380,7 @@ | ||
| 3027 | struct sockaddr_un s; s.sun_len = 1; | ||
| 3028 | ; return 0; } | ||
| 3029 | EOF | ||
| 3030 | -if { (eval echo configure:6333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3031 | +if { (eval echo configure:6384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3032 | rm -rf conftest* | ||
| 3033 | ac_cv_have_sun_len_in_struct_sockaddr_un="yes" | ||
| 3034 | else | ||
| 3035 | @@ -6351,13 +6402,13 @@ | ||
| 3036 | fi | ||
| 3037 | |||
| 3038 | echo $ac_n "checking for ss_family field in struct sockaddr_storage""... $ac_c" 1>&6 | ||
| 3039 | -echo "configure:6355: checking for ss_family field in struct sockaddr_storage" >&5 | ||
| 3040 | +echo "configure:6406: checking for ss_family field in struct sockaddr_storage" >&5 | ||
| 3041 | if eval "test \"`echo '$''{'ac_cv_have_ss_family_in_struct_ss'+set}'`\" = set"; then | ||
| 3042 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3043 | else | ||
| 3044 | |||
| 3045 | cat > conftest.$ac_ext <<EOF | ||
| 3046 | -#line 6361 "configure" | ||
| 3047 | +#line 6412 "configure" | ||
| 3048 | #include "confdefs.h" | ||
| 3049 | |||
| 3050 | #include <sys/types.h> | ||
| 3051 | @@ -6367,7 +6418,7 @@ | ||
| 3052 | struct sockaddr_storage s; s.ss_family = 1; | ||
| 3053 | ; return 0; } | ||
| 3054 | EOF | ||
| 3055 | -if { (eval echo configure:6371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3056 | +if { (eval echo configure:6422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3057 | rm -rf conftest* | ||
| 3058 | ac_cv_have_ss_family_in_struct_ss="yes" | ||
| 3059 | else | ||
| 3060 | @@ -6389,13 +6440,13 @@ | ||
| 3061 | fi | ||
| 3062 | |||
| 3063 | echo $ac_n "checking for __ss_family field in struct sockaddr_storage""... $ac_c" 1>&6 | ||
| 3064 | -echo "configure:6393: checking for __ss_family field in struct sockaddr_storage" >&5 | ||
| 3065 | +echo "configure:6444: checking for __ss_family field in struct sockaddr_storage" >&5 | ||
| 3066 | if eval "test \"`echo '$''{'ac_cv_have___ss_family_in_struct_ss'+set}'`\" = set"; then | ||
| 3067 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3068 | else | ||
| 3069 | |||
| 3070 | cat > conftest.$ac_ext <<EOF | ||
| 3071 | -#line 6399 "configure" | ||
| 3072 | +#line 6450 "configure" | ||
| 3073 | #include "confdefs.h" | ||
| 3074 | |||
| 3075 | #include <sys/types.h> | ||
| 3076 | @@ -6405,7 +6456,7 @@ | ||
| 3077 | struct sockaddr_storage s; s.__ss_family = 1; | ||
| 3078 | ; return 0; } | ||
| 3079 | EOF | ||
| 3080 | -if { (eval echo configure:6409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3081 | +if { (eval echo configure:6460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3082 | rm -rf conftest* | ||
| 3083 | ac_cv_have___ss_family_in_struct_ss="yes" | ||
| 3084 | else | ||
| 3085 | @@ -6428,13 +6479,13 @@ | ||
| 3086 | fi | ||
| 3087 | |||
| 3088 | echo $ac_n "checking for pw_class field in struct passwd""... $ac_c" 1>&6 | ||
| 3089 | -echo "configure:6432: checking for pw_class field in struct passwd" >&5 | ||
| 3090 | +echo "configure:6483: checking for pw_class field in struct passwd" >&5 | ||
| 3091 | if eval "test \"`echo '$''{'ac_cv_have_pw_class_in_struct_passwd'+set}'`\" = set"; then | ||
| 3092 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3093 | else | ||
| 3094 | |||
| 3095 | cat > conftest.$ac_ext <<EOF | ||
| 3096 | -#line 6438 "configure" | ||
| 3097 | +#line 6489 "configure" | ||
| 3098 | #include "confdefs.h" | ||
| 3099 | |||
| 3100 | #include <pwd.h> | ||
| 3101 | @@ -6443,7 +6494,7 @@ | ||
| 3102 | struct passwd p; p.pw_class = 0; | ||
| 3103 | ; return 0; } | ||
| 3104 | EOF | ||
| 3105 | -if { (eval echo configure:6447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3106 | +if { (eval echo configure:6498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3107 | rm -rf conftest* | ||
| 3108 | ac_cv_have_pw_class_in_struct_passwd="yes" | ||
| 3109 | else | ||
| 3110 | @@ -6467,20 +6518,20 @@ | ||
| 3111 | |||
| 3112 | |||
| 3113 | echo $ac_n "checking if libc defines __progname""... $ac_c" 1>&6 | ||
| 3114 | -echo "configure:6471: checking if libc defines __progname" >&5 | ||
| 3115 | +echo "configure:6522: checking if libc defines __progname" >&5 | ||
| 3116 | if eval "test \"`echo '$''{'ac_cv_libc_defines___progname'+set}'`\" = set"; then | ||
| 3117 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3118 | else | ||
| 3119 | |||
| 3120 | cat > conftest.$ac_ext <<EOF | ||
| 3121 | -#line 6477 "configure" | ||
| 3122 | +#line 6528 "configure" | ||
| 3123 | #include "confdefs.h" | ||
| 3124 | |||
| 3125 | int main() { | ||
| 3126 | extern char *__progname; printf("%s", __progname); | ||
| 3127 | ; return 0; } | ||
| 3128 | EOF | ||
| 3129 | -if { (eval echo configure:6484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3130 | +if { (eval echo configure:6535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3131 | rm -rf conftest* | ||
| 3132 | ac_cv_libc_defines___progname="yes" | ||
| 3133 | else | ||
| 3134 | @@ -6504,20 +6555,20 @@ | ||
| 3135 | |||
| 3136 | |||
| 3137 | echo $ac_n "checking if libc defines sys_errlist""... $ac_c" 1>&6 | ||
| 3138 | -echo "configure:6508: checking if libc defines sys_errlist" >&5 | ||
| 3139 | +echo "configure:6559: checking if libc defines sys_errlist" >&5 | ||
| 3140 | if eval "test \"`echo '$''{'ac_cv_libc_defines_sys_errlist'+set}'`\" = set"; then | ||
| 3141 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3142 | else | ||
| 3143 | |||
| 3144 | cat > conftest.$ac_ext <<EOF | ||
| 3145 | -#line 6514 "configure" | ||
| 3146 | +#line 6565 "configure" | ||
| 3147 | #include "confdefs.h" | ||
| 3148 | |||
| 3149 | int main() { | ||
| 3150 | extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); | ||
| 3151 | ; return 0; } | ||
| 3152 | EOF | ||
| 3153 | -if { (eval echo configure:6521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3154 | +if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3155 | rm -rf conftest* | ||
| 3156 | ac_cv_libc_defines_sys_errlist="yes" | ||
| 3157 | else | ||
| 3158 | @@ -6541,20 +6592,20 @@ | ||
| 3159 | |||
| 3160 | |||
| 3161 | echo $ac_n "checking if libc defines sys_nerr""... $ac_c" 1>&6 | ||
| 3162 | -echo "configure:6545: checking if libc defines sys_nerr" >&5 | ||
| 3163 | +echo "configure:6596: checking if libc defines sys_nerr" >&5 | ||
| 3164 | if eval "test \"`echo '$''{'ac_cv_libc_defines_sys_nerr'+set}'`\" = set"; then | ||
| 3165 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3166 | else | ||
| 3167 | |||
| 3168 | cat > conftest.$ac_ext <<EOF | ||
| 3169 | -#line 6551 "configure" | ||
| 3170 | +#line 6602 "configure" | ||
| 3171 | #include "confdefs.h" | ||
| 3172 | |||
| 3173 | int main() { | ||
| 3174 | extern int sys_nerr; printf("%i", sys_nerr); | ||
| 3175 | ; return 0; } | ||
| 3176 | EOF | ||
| 3177 | -if { (eval echo configure:6558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3178 | +if { (eval echo configure:6609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3179 | rm -rf conftest* | ||
| 3180 | ac_cv_libc_defines_sys_nerr="yes" | ||
| 3181 | else | ||
| 3182 | @@ -6604,17 +6655,17 @@ | ||
| 3183 | do | ||
| 3184 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
| 3185 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
| 3186 | -echo "configure:6608: checking for $ac_hdr" >&5 | ||
| 3187 | +echo "configure:6659: checking for $ac_hdr" >&5 | ||
| 3188 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
| 3189 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3190 | else | ||
| 3191 | cat > conftest.$ac_ext <<EOF | ||
| 3192 | -#line 6613 "configure" | ||
| 3193 | +#line 6664 "configure" | ||
| 3194 | #include "confdefs.h" | ||
| 3195 | #include <$ac_hdr> | ||
| 3196 | EOF | ||
| 3197 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
| 3198 | -{ (eval echo configure:6618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 3199 | +{ (eval echo configure:6669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
| 3200 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
| 3201 | if test -z "$ac_err"; then | ||
| 3202 | rm -rf conftest* | ||
| 3203 | @@ -6644,7 +6695,7 @@ | ||
| 3204 | echo "configure: warning: Cannot find krb.h, build may fail" 1>&2 | ||
| 3205 | fi | ||
| 3206 | echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6 | ||
| 3207 | -echo "configure:6648: checking for main in -lkrb" >&5 | ||
| 3208 | +echo "configure:6699: checking for main in -lkrb" >&5 | ||
| 3209 | ac_lib_var=`echo krb'_'main | sed 'y%./+-%__p_%'` | ||
| 3210 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 3211 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3212 | @@ -6652,14 +6703,14 @@ | ||
| 3213 | ac_save_LIBS="$LIBS" | ||
| 3214 | LIBS="-lkrb $LIBS" | ||
| 3215 | cat > conftest.$ac_ext <<EOF | ||
| 3216 | -#line 6656 "configure" | ||
| 3217 | +#line 6707 "configure" | ||
| 3218 | #include "confdefs.h" | ||
| 3219 | |||
| 3220 | int main() { | ||
| 3221 | main() | ||
| 3222 | ; return 0; } | ||
| 3223 | EOF | ||
| 3224 | -if { (eval echo configure:6663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3225 | +if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3226 | rm -rf conftest* | ||
| 3227 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 3228 | else | ||
| 3229 | @@ -6688,7 +6739,7 @@ | ||
| 3230 | |||
| 3231 | if test "$ac_cv_lib_krb_main" != yes; then | ||
| 3232 | echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 | ||
| 3233 | -echo "configure:6692: checking for main in -lkrb4" >&5 | ||
| 3234 | +echo "configure:6743: checking for main in -lkrb4" >&5 | ||
| 3235 | ac_lib_var=`echo krb4'_'main | sed 'y%./+-%__p_%'` | ||
| 3236 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 3237 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3238 | @@ -6696,14 +6747,14 @@ | ||
| 3239 | ac_save_LIBS="$LIBS" | ||
| 3240 | LIBS="-lkrb4 $LIBS" | ||
| 3241 | cat > conftest.$ac_ext <<EOF | ||
| 3242 | -#line 6700 "configure" | ||
| 3243 | +#line 6751 "configure" | ||
| 3244 | #include "confdefs.h" | ||
| 3245 | |||
| 3246 | int main() { | ||
| 3247 | main() | ||
| 3248 | ; return 0; } | ||
| 3249 | EOF | ||
| 3250 | -if { (eval echo configure:6707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3251 | +if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3252 | rm -rf conftest* | ||
| 3253 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 3254 | else | ||
| 3255 | @@ -6739,7 +6790,7 @@ | ||
| 3256 | KLIBS="-lkrb" | ||
| 3257 | fi | ||
| 3258 | echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6 | ||
| 3259 | -echo "configure:6743: checking for des_cbc_encrypt in -ldes" >&5 | ||
| 3260 | +echo "configure:6794: checking for des_cbc_encrypt in -ldes" >&5 | ||
| 3261 | ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` | ||
| 3262 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 3263 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3264 | @@ -6747,7 +6798,7 @@ | ||
| 3265 | ac_save_LIBS="$LIBS" | ||
| 3266 | LIBS="-ldes $LIBS" | ||
| 3267 | cat > conftest.$ac_ext <<EOF | ||
| 3268 | -#line 6751 "configure" | ||
| 3269 | +#line 6802 "configure" | ||
| 3270 | #include "confdefs.h" | ||
| 3271 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 3272 | /* We use char because int might match the return type of a gcc2 | ||
| 3273 | @@ -6758,7 +6809,7 @@ | ||
| 3274 | des_cbc_encrypt() | ||
| 3275 | ; return 0; } | ||
| 3276 | EOF | ||
| 3277 | -if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3278 | +if { (eval echo configure:6813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3279 | rm -rf conftest* | ||
| 3280 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 3281 | else | ||
| 3282 | @@ -6787,7 +6838,7 @@ | ||
| 3283 | |||
| 3284 | if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then | ||
| 3285 | echo $ac_n "checking for des_cbc_encrypt in -ldes425""... $ac_c" 1>&6 | ||
| 3286 | -echo "configure:6791: checking for des_cbc_encrypt in -ldes425" >&5 | ||
| 3287 | +echo "configure:6842: checking for des_cbc_encrypt in -ldes425" >&5 | ||
| 3288 | ac_lib_var=`echo des425'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` | ||
| 3289 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 3290 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3291 | @@ -6795,7 +6846,7 @@ | ||
| 3292 | ac_save_LIBS="$LIBS" | ||
| 3293 | LIBS="-ldes425 $LIBS" | ||
| 3294 | cat > conftest.$ac_ext <<EOF | ||
| 3295 | -#line 6799 "configure" | ||
| 3296 | +#line 6850 "configure" | ||
| 3297 | #include "confdefs.h" | ||
| 3298 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 3299 | /* We use char because int might match the return type of a gcc2 | ||
| 3300 | @@ -6806,7 +6857,7 @@ | ||
| 3301 | des_cbc_encrypt() | ||
| 3302 | ; return 0; } | ||
| 3303 | EOF | ||
| 3304 | -if { (eval echo configure:6810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3305 | +if { (eval echo configure:6861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3306 | rm -rf conftest* | ||
| 3307 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 3308 | else | ||
| 3309 | @@ -6842,7 +6893,7 @@ | ||
| 3310 | KLIBS="-ldes" | ||
| 3311 | fi | ||
| 3312 | echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 | ||
| 3313 | -echo "configure:6846: checking for dn_expand in -lresolv" >&5 | ||
| 3314 | +echo "configure:6897: checking for dn_expand in -lresolv" >&5 | ||
| 3315 | ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` | ||
| 3316 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
| 3317 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3318 | @@ -6850,7 +6901,7 @@ | ||
| 3319 | ac_save_LIBS="$LIBS" | ||
| 3320 | LIBS="-lresolv $LIBS" | ||
| 3321 | cat > conftest.$ac_ext <<EOF | ||
| 3322 | -#line 6854 "configure" | ||
| 3323 | +#line 6905 "configure" | ||
| 3324 | #include "confdefs.h" | ||
| 3325 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
| 3326 | /* We use char because int might match the return type of a gcc2 | ||
| 3327 | @@ -6861,7 +6912,7 @@ | ||
| 3328 | dn_expand() | ||
| 3329 | ; return 0; } | ||
| 3330 | EOF | ||
| 3331 | -if { (eval echo configure:6865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3332 | +if { (eval echo configure:6916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
| 3333 | rm -rf conftest* | ||
| 3334 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
| 3335 | else | ||
| 3336 | @@ -6947,7 +6998,7 @@ | ||
| 3337 | # Extract the first word of "rsh", so it can be a program name with args. | ||
| 3338 | set dummy rsh; ac_word=$2 | ||
| 3339 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3340 | -echo "configure:6951: checking for $ac_word" >&5 | ||
| 3341 | +echo "configure:7002: checking for $ac_word" >&5 | ||
| 3342 | if eval "test \"`echo '$''{'ac_cv_path_rsh_path'+set}'`\" = set"; then | ||
| 3343 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3344 | else | ||
| 3345 | @@ -6997,7 +7048,7 @@ | ||
| 3346 | # Extract the first word of "xauth", so it can be a program name with args. | ||
| 3347 | set dummy xauth; ac_word=$2 | ||
| 3348 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3349 | -echo "configure:7001: checking for $ac_word" >&5 | ||
| 3350 | +echo "configure:7052: checking for $ac_word" >&5 | ||
| 3351 | if eval "test \"`echo '$''{'ac_cv_path_xauth_path'+set}'`\" = set"; then | ||
| 3352 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3353 | else | ||
| 3354 | @@ -7068,7 +7119,7 @@ | ||
| 3355 | |||
| 3356 | ac_safe=`echo ""/dev/ptmx"" | sed 'y%./+-%__p_%'` | ||
| 3357 | echo $ac_n "checking for "/dev/ptmx"""... $ac_c" 1>&6 | ||
| 3358 | -echo "configure:7072: checking for "/dev/ptmx"" >&5 | ||
| 3359 | +echo "configure:7123: checking for "/dev/ptmx"" >&5 | ||
| 3360 | if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then | ||
| 3361 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3362 | else | ||
| 3363 | @@ -7101,7 +7152,7 @@ | ||
| 3364 | |||
| 3365 | ac_safe=`echo ""/dev/ptc"" | sed 'y%./+-%__p_%'` | ||
| 3366 | echo $ac_n "checking for "/dev/ptc"""... $ac_c" 1>&6 | ||
| 3367 | -echo "configure:7105: checking for "/dev/ptc"" >&5 | ||
| 3368 | +echo "configure:7156: checking for "/dev/ptc"" >&5 | ||
| 3369 | if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then | ||
| 3370 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3371 | else | ||
| 3372 | @@ -7152,7 +7203,7 @@ | ||
| 3373 | |||
| 3374 | ac_safe=`echo ""/dev/urandom"" | sed 'y%./+-%__p_%'` | ||
| 3375 | echo $ac_n "checking for "/dev/urandom"""... $ac_c" 1>&6 | ||
| 3376 | -echo "configure:7156: checking for "/dev/urandom"" >&5 | ||
| 3377 | +echo "configure:7207: checking for "/dev/urandom"" >&5 | ||
| 3378 | if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then | ||
| 3379 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3380 | else | ||
| 3381 | @@ -7222,7 +7273,7 @@ | ||
| 3382 | # Check for existing socket only if we don't have a random device already | ||
| 3383 | if test -z "$RANDOM_POOL" ; then | ||
| 3384 | echo $ac_n "checking for PRNGD/EGD socket""... $ac_c" 1>&6 | ||
| 3385 | -echo "configure:7226: checking for PRNGD/EGD socket" >&5 | ||
| 3386 | +echo "configure:7277: checking for PRNGD/EGD socket" >&5 | ||
| 3387 | # Insert other locations here | ||
| 3388 | for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do | ||
| 3389 | if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then | ||
| 3390 | @@ -7255,7 +7306,7 @@ | ||
| 3391 | # Extract the first word of "ls", so it can be a program name with args. | ||
| 3392 | set dummy ls; ac_word=$2 | ||
| 3393 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3394 | -echo "configure:7259: checking for $ac_word" >&5 | ||
| 3395 | +echo "configure:7310: checking for $ac_word" >&5 | ||
| 3396 | if eval "test \"`echo '$''{'ac_cv_path_PROG_LS'+set}'`\" = set"; then | ||
| 3397 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3398 | else | ||
| 3399 | @@ -7296,7 +7347,7 @@ | ||
| 3400 | # Extract the first word of "netstat", so it can be a program name with args. | ||
| 3401 | set dummy netstat; ac_word=$2 | ||
| 3402 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3403 | -echo "configure:7300: checking for $ac_word" >&5 | ||
| 3404 | +echo "configure:7351: checking for $ac_word" >&5 | ||
| 3405 | if eval "test \"`echo '$''{'ac_cv_path_PROG_NETSTAT'+set}'`\" = set"; then | ||
| 3406 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3407 | else | ||
| 3408 | @@ -7337,7 +7388,7 @@ | ||
| 3409 | # Extract the first word of "arp", so it can be a program name with args. | ||
| 3410 | set dummy arp; ac_word=$2 | ||
| 3411 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3412 | -echo "configure:7341: checking for $ac_word" >&5 | ||
| 3413 | +echo "configure:7392: checking for $ac_word" >&5 | ||
| 3414 | if eval "test \"`echo '$''{'ac_cv_path_PROG_ARP'+set}'`\" = set"; then | ||
| 3415 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3416 | else | ||
| 3417 | @@ -7378,7 +7429,7 @@ | ||
| 3418 | # Extract the first word of "ifconfig", so it can be a program name with args. | ||
| 3419 | set dummy ifconfig; ac_word=$2 | ||
| 3420 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3421 | -echo "configure:7382: checking for $ac_word" >&5 | ||
| 3422 | +echo "configure:7433: checking for $ac_word" >&5 | ||
| 3423 | if eval "test \"`echo '$''{'ac_cv_path_PROG_IFCONFIG'+set}'`\" = set"; then | ||
| 3424 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3425 | else | ||
| 3426 | @@ -7419,7 +7470,7 @@ | ||
| 3427 | # Extract the first word of "ps", so it can be a program name with args. | ||
| 3428 | set dummy ps; ac_word=$2 | ||
| 3429 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3430 | -echo "configure:7423: checking for $ac_word" >&5 | ||
| 3431 | +echo "configure:7474: checking for $ac_word" >&5 | ||
| 3432 | if eval "test \"`echo '$''{'ac_cv_path_PROG_PS'+set}'`\" = set"; then | ||
| 3433 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3434 | else | ||
| 3435 | @@ -7460,7 +7511,7 @@ | ||
| 3436 | # Extract the first word of "w", so it can be a program name with args. | ||
| 3437 | set dummy w; ac_word=$2 | ||
| 3438 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3439 | -echo "configure:7464: checking for $ac_word" >&5 | ||
| 3440 | +echo "configure:7515: checking for $ac_word" >&5 | ||
| 3441 | if eval "test \"`echo '$''{'ac_cv_path_PROG_W'+set}'`\" = set"; then | ||
| 3442 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3443 | else | ||
| 3444 | @@ -7501,7 +7552,7 @@ | ||
| 3445 | # Extract the first word of "who", so it can be a program name with args. | ||
| 3446 | set dummy who; ac_word=$2 | ||
| 3447 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3448 | -echo "configure:7505: checking for $ac_word" >&5 | ||
| 3449 | +echo "configure:7556: checking for $ac_word" >&5 | ||
| 3450 | if eval "test \"`echo '$''{'ac_cv_path_PROG_WHO'+set}'`\" = set"; then | ||
| 3451 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3452 | else | ||
| 3453 | @@ -7542,7 +7593,7 @@ | ||
| 3454 | # Extract the first word of "last", so it can be a program name with args. | ||
| 3455 | set dummy last; ac_word=$2 | ||
| 3456 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3457 | -echo "configure:7546: checking for $ac_word" >&5 | ||
| 3458 | +echo "configure:7597: checking for $ac_word" >&5 | ||
| 3459 | if eval "test \"`echo '$''{'ac_cv_path_PROG_LAST'+set}'`\" = set"; then | ||
| 3460 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3461 | else | ||
| 3462 | @@ -7583,7 +7634,7 @@ | ||
| 3463 | # Extract the first word of "lastlog", so it can be a program name with args. | ||
| 3464 | set dummy lastlog; ac_word=$2 | ||
| 3465 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3466 | -echo "configure:7587: checking for $ac_word" >&5 | ||
| 3467 | +echo "configure:7638: checking for $ac_word" >&5 | ||
| 3468 | if eval "test \"`echo '$''{'ac_cv_path_PROG_LASTLOG'+set}'`\" = set"; then | ||
| 3469 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3470 | else | ||
| 3471 | @@ -7624,7 +7675,7 @@ | ||
| 3472 | # Extract the first word of "df", so it can be a program name with args. | ||
| 3473 | set dummy df; ac_word=$2 | ||
| 3474 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3475 | -echo "configure:7628: checking for $ac_word" >&5 | ||
| 3476 | +echo "configure:7679: checking for $ac_word" >&5 | ||
| 3477 | if eval "test \"`echo '$''{'ac_cv_path_PROG_DF'+set}'`\" = set"; then | ||
| 3478 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3479 | else | ||
| 3480 | @@ -7665,7 +7716,7 @@ | ||
| 3481 | # Extract the first word of "vmstat", so it can be a program name with args. | ||
| 3482 | set dummy vmstat; ac_word=$2 | ||
| 3483 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3484 | -echo "configure:7669: checking for $ac_word" >&5 | ||
| 3485 | +echo "configure:7720: checking for $ac_word" >&5 | ||
| 3486 | if eval "test \"`echo '$''{'ac_cv_path_PROG_VMSTAT'+set}'`\" = set"; then | ||
| 3487 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3488 | else | ||
| 3489 | @@ -7706,7 +7757,7 @@ | ||
| 3490 | # Extract the first word of "uptime", so it can be a program name with args. | ||
| 3491 | set dummy uptime; ac_word=$2 | ||
| 3492 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3493 | -echo "configure:7710: checking for $ac_word" >&5 | ||
| 3494 | +echo "configure:7761: checking for $ac_word" >&5 | ||
| 3495 | if eval "test \"`echo '$''{'ac_cv_path_PROG_UPTIME'+set}'`\" = set"; then | ||
| 3496 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3497 | else | ||
| 3498 | @@ -7747,7 +7798,7 @@ | ||
| 3499 | # Extract the first word of "ipcs", so it can be a program name with args. | ||
| 3500 | set dummy ipcs; ac_word=$2 | ||
| 3501 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3502 | -echo "configure:7751: checking for $ac_word" >&5 | ||
| 3503 | +echo "configure:7802: checking for $ac_word" >&5 | ||
| 3504 | if eval "test \"`echo '$''{'ac_cv_path_PROG_IPCS'+set}'`\" = set"; then | ||
| 3505 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3506 | else | ||
| 3507 | @@ -7788,7 +7839,7 @@ | ||
| 3508 | # Extract the first word of "tail", so it can be a program name with args. | ||
| 3509 | set dummy tail; ac_word=$2 | ||
| 3510 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3511 | -echo "configure:7792: checking for $ac_word" >&5 | ||
| 3512 | +echo "configure:7843: checking for $ac_word" >&5 | ||
| 3513 | if eval "test \"`echo '$''{'ac_cv_path_PROG_TAIL'+set}'`\" = set"; then | ||
| 3514 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3515 | else | ||
| 3516 | @@ -7853,7 +7904,7 @@ | ||
| 3517 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
| 3518 | set dummy $ac_prog; ac_word=$2 | ||
| 3519 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
| 3520 | -echo "configure:7857: checking for $ac_word" >&5 | ||
| 3521 | +echo "configure:7908: checking for $ac_word" >&5 | ||
| 3522 | if eval "test \"`echo '$''{'ac_cv_path_NROFF'+set}'`\" = set"; then | ||
| 3523 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3524 | else | ||
| 3525 | @@ -7942,9 +7993,9 @@ | ||
| 3526 | |||
| 3527 | if test -z "$disable_shadow" ; then | ||
| 3528 | echo $ac_n "checking if the systems has expire shadow information""... $ac_c" 1>&6 | ||
| 3529 | -echo "configure:7946: checking if the systems has expire shadow information" >&5 | ||
| 3530 | +echo "configure:7997: checking if the systems has expire shadow information" >&5 | ||
| 3531 | cat > conftest.$ac_ext <<EOF | ||
| 3532 | -#line 7948 "configure" | ||
| 3533 | +#line 7999 "configure" | ||
| 3534 | #include "confdefs.h" | ||
| 3535 | |||
| 3536 | #include <sys/types.h> | ||
| 3537 | @@ -7955,7 +8006,7 @@ | ||
| 3538 | sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; | ||
| 3539 | ; return 0; } | ||
| 3540 | EOF | ||
| 3541 | -if { (eval echo configure:7959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3542 | +if { (eval echo configure:8010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3543 | rm -rf conftest* | ||
| 3544 | sp_expire_available=yes | ||
| 3545 | else | ||
| 3546 | @@ -8022,7 +8073,7 @@ | ||
| 3547 | |||
| 3548 | else | ||
| 3549 | cat > conftest.$ac_ext <<EOF | ||
| 3550 | -#line 8026 "configure" | ||
| 3551 | +#line 8077 "configure" | ||
| 3552 | #include "confdefs.h" | ||
| 3553 | |||
| 3554 | /* find out what STDPATH is */ | ||
| 3555 | @@ -8054,7 +8105,7 @@ | ||
| 3556 | } | ||
| 3557 | |||
| 3558 | EOF | ||
| 3559 | -if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 3560 | +if { (eval echo configure:8109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
| 3561 | then | ||
| 3562 | user_path=`cat conftest.stdpath` | ||
| 3563 | else | ||
| 3564 | @@ -8111,7 +8162,7 @@ | ||
| 3565 | |||
| 3566 | |||
| 3567 | echo $ac_n "checking if we need to convert IPv4 in IPv6-mapped addresses""... $ac_c" 1>&6 | ||
| 3568 | -echo "configure:8115: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 | ||
| 3569 | +echo "configure:8166: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 | ||
| 3570 | IPV4_IN6_HACK_MSG="no" | ||
| 3571 | # Check whether --with-4in6 or --without-4in6 was given. | ||
| 3572 | if test "${with_4in6+set}" = set; then | ||
| 3573 | @@ -8163,7 +8214,7 @@ | ||
| 3574 | |||
| 3575 | |||
| 3576 | echo $ac_n "checking whether to install ssh as suid root""... $ac_c" 1>&6 | ||
| 3577 | -echo "configure:8167: checking whether to install ssh as suid root" >&5 | ||
| 3578 | +echo "configure:8218: checking whether to install ssh as suid root" >&5 | ||
| 3579 | # Check whether --enable-suid-ssh or --disable-suid-ssh was given. | ||
| 3580 | if test "${enable_suid_ssh+set}" = set; then | ||
| 3581 | enableval="$enable_suid_ssh" | ||
| 3582 | @@ -8312,9 +8363,9 @@ | ||
| 3583 | |||
| 3584 | |||
| 3585 | echo $ac_n "checking if your system defines LASTLOG_FILE""... $ac_c" 1>&6 | ||
| 3586 | -echo "configure:8316: checking if your system defines LASTLOG_FILE" >&5 | ||
| 3587 | +echo "configure:8367: checking if your system defines LASTLOG_FILE" >&5 | ||
| 3588 | cat > conftest.$ac_ext <<EOF | ||
| 3589 | -#line 8318 "configure" | ||
| 3590 | +#line 8369 "configure" | ||
| 3591 | #include "confdefs.h" | ||
| 3592 | |||
| 3593 | #include <sys/types.h> | ||
| 3594 | @@ -8330,7 +8381,7 @@ | ||
| 3595 | char *lastlog = LASTLOG_FILE; | ||
| 3596 | ; return 0; } | ||
| 3597 | EOF | ||
| 3598 | -if { (eval echo configure:8334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3599 | +if { (eval echo configure:8385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3600 | rm -rf conftest* | ||
| 3601 | echo "$ac_t""yes" 1>&6 | ||
| 3602 | else | ||
| 3603 | @@ -8340,9 +8391,9 @@ | ||
| 3604 | |||
| 3605 | echo "$ac_t""no" 1>&6 | ||
| 3606 | echo $ac_n "checking if your system defines _PATH_LASTLOG""... $ac_c" 1>&6 | ||
| 3607 | -echo "configure:8344: checking if your system defines _PATH_LASTLOG" >&5 | ||
| 3608 | +echo "configure:8395: checking if your system defines _PATH_LASTLOG" >&5 | ||
| 3609 | cat > conftest.$ac_ext <<EOF | ||
| 3610 | -#line 8346 "configure" | ||
| 3611 | +#line 8397 "configure" | ||
| 3612 | #include "confdefs.h" | ||
| 3613 | |||
| 3614 | #include <sys/types.h> | ||
| 3615 | @@ -8358,7 +8409,7 @@ | ||
| 3616 | char *lastlog = _PATH_LASTLOG; | ||
| 3617 | ; return 0; } | ||
| 3618 | EOF | ||
| 3619 | -if { (eval echo configure:8362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3620 | +if { (eval echo configure:8413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3621 | rm -rf conftest* | ||
| 3622 | echo "$ac_t""yes" 1>&6 | ||
| 3623 | else | ||
| 3624 | @@ -8397,9 +8448,9 @@ | ||
| 3625 | fi | ||
| 3626 | |||
| 3627 | echo $ac_n "checking if your system defines UTMP_FILE""... $ac_c" 1>&6 | ||
| 3628 | -echo "configure:8401: checking if your system defines UTMP_FILE" >&5 | ||
| 3629 | +echo "configure:8452: checking if your system defines UTMP_FILE" >&5 | ||
| 3630 | cat > conftest.$ac_ext <<EOF | ||
| 3631 | -#line 8403 "configure" | ||
| 3632 | +#line 8454 "configure" | ||
| 3633 | #include "confdefs.h" | ||
| 3634 | |||
| 3635 | #include <sys/types.h> | ||
| 3636 | @@ -8412,7 +8463,7 @@ | ||
| 3637 | char *utmp = UTMP_FILE; | ||
| 3638 | ; return 0; } | ||
| 3639 | EOF | ||
| 3640 | -if { (eval echo configure:8416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3641 | +if { (eval echo configure:8467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3642 | rm -rf conftest* | ||
| 3643 | echo "$ac_t""yes" 1>&6 | ||
| 3644 | else | ||
| 3645 | @@ -8447,9 +8498,9 @@ | ||
| 3646 | fi | ||
| 3647 | |||
| 3648 | echo $ac_n "checking if your system defines WTMP_FILE""... $ac_c" 1>&6 | ||
| 3649 | -echo "configure:8451: checking if your system defines WTMP_FILE" >&5 | ||
| 3650 | +echo "configure:8502: checking if your system defines WTMP_FILE" >&5 | ||
| 3651 | cat > conftest.$ac_ext <<EOF | ||
| 3652 | -#line 8453 "configure" | ||
| 3653 | +#line 8504 "configure" | ||
| 3654 | #include "confdefs.h" | ||
| 3655 | |||
| 3656 | #include <sys/types.h> | ||
| 3657 | @@ -8462,7 +8513,7 @@ | ||
| 3658 | char *wtmp = WTMP_FILE; | ||
| 3659 | ; return 0; } | ||
| 3660 | EOF | ||
| 3661 | -if { (eval echo configure:8466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3662 | +if { (eval echo configure:8517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3663 | rm -rf conftest* | ||
| 3664 | echo "$ac_t""yes" 1>&6 | ||
| 3665 | else | ||
| 3666 | @@ -8498,9 +8549,9 @@ | ||
| 3667 | |||
| 3668 | |||
| 3669 | echo $ac_n "checking if your system defines UTMPX_FILE""... $ac_c" 1>&6 | ||
| 3670 | -echo "configure:8502: checking if your system defines UTMPX_FILE" >&5 | ||
| 3671 | +echo "configure:8553: checking if your system defines UTMPX_FILE" >&5 | ||
| 3672 | cat > conftest.$ac_ext <<EOF | ||
| 3673 | -#line 8504 "configure" | ||
| 3674 | +#line 8555 "configure" | ||
| 3675 | #include "confdefs.h" | ||
| 3676 | |||
| 3677 | #include <sys/types.h> | ||
| 3678 | @@ -8516,7 +8567,7 @@ | ||
| 3679 | char *utmpx = UTMPX_FILE; | ||
| 3680 | ; return 0; } | ||
| 3681 | EOF | ||
| 3682 | -if { (eval echo configure:8520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3683 | +if { (eval echo configure:8571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3684 | rm -rf conftest* | ||
| 3685 | echo "$ac_t""yes" 1>&6 | ||
| 3686 | else | ||
| 3687 | @@ -8543,9 +8594,9 @@ | ||
| 3688 | fi | ||
| 3689 | |||
| 3690 | echo $ac_n "checking if your system defines WTMPX_FILE""... $ac_c" 1>&6 | ||
| 3691 | -echo "configure:8547: checking if your system defines WTMPX_FILE" >&5 | ||
| 3692 | +echo "configure:8598: checking if your system defines WTMPX_FILE" >&5 | ||
| 3693 | cat > conftest.$ac_ext <<EOF | ||
| 3694 | -#line 8549 "configure" | ||
| 3695 | +#line 8600 "configure" | ||
| 3696 | #include "confdefs.h" | ||
| 3697 | |||
| 3698 | #include <sys/types.h> | ||
| 3699 | @@ -8561,7 +8612,7 @@ | ||
| 3700 | char *wtmpx = WTMPX_FILE; | ||
| 3701 | ; return 0; } | ||
| 3702 | EOF | ||
| 3703 | -if { (eval echo configure:8565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3704 | +if { (eval echo configure:8616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3705 | rm -rf conftest* | ||
| 3706 | echo "$ac_t""yes" 1>&6 | ||
| 3707 | else | ||
| 3708 | @@ -8613,12 +8664,12 @@ | ||
| 3709 | fi | ||
| 3710 | |||
| 3711 | echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | ||
| 3712 | -echo "configure:8617: checking for Cygwin environment" >&5 | ||
| 3713 | +echo "configure:8668: checking for Cygwin environment" >&5 | ||
| 3714 | if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then | ||
| 3715 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3716 | else | ||
| 3717 | cat > conftest.$ac_ext <<EOF | ||
| 3718 | -#line 8622 "configure" | ||
| 3719 | +#line 8673 "configure" | ||
| 3720 | #include "confdefs.h" | ||
| 3721 | |||
| 3722 | int main() { | ||
| 3723 | @@ -8629,7 +8680,7 @@ | ||
| 3724 | return __CYGWIN__; | ||
| 3725 | ; return 0; } | ||
| 3726 | EOF | ||
| 3727 | -if { (eval echo configure:8633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3728 | +if { (eval echo configure:8684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3729 | rm -rf conftest* | ||
| 3730 | ac_cv_cygwin=yes | ||
| 3731 | else | ||
| 3732 | @@ -8646,19 +8697,19 @@ | ||
| 3733 | CYGWIN= | ||
| 3734 | test "$ac_cv_cygwin" = yes && CYGWIN=yes | ||
| 3735 | echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 | ||
| 3736 | -echo "configure:8650: checking for mingw32 environment" >&5 | ||
| 3737 | +echo "configure:8701: checking for mingw32 environment" >&5 | ||
| 3738 | if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then | ||
| 3739 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3740 | else | ||
| 3741 | cat > conftest.$ac_ext <<EOF | ||
| 3742 | -#line 8655 "configure" | ||
| 3743 | +#line 8706 "configure" | ||
| 3744 | #include "confdefs.h" | ||
| 3745 | |||
| 3746 | int main() { | ||
| 3747 | return __MINGW32__; | ||
| 3748 | ; return 0; } | ||
| 3749 | EOF | ||
| 3750 | -if { (eval echo configure:8662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3751 | +if { (eval echo configure:8713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
| 3752 | rm -rf conftest* | ||
| 3753 | ac_cv_mingw32=yes | ||
| 3754 | else | ||
| 3755 | @@ -8677,7 +8728,7 @@ | ||
| 3756 | |||
| 3757 | |||
| 3758 | echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 | ||
| 3759 | -echo "configure:8681: checking for executable suffix" >&5 | ||
| 3760 | +echo "configure:8732: checking for executable suffix" >&5 | ||
| 3761 | if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then | ||
| 3762 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
| 3763 | else | ||
| 3764 | @@ -8687,7 +8738,7 @@ | ||
| 3765 | rm -f conftest* | ||
| 3766 | echo 'int main () { return 0; }' > conftest.$ac_ext | ||
| 3767 | ac_cv_exeext= | ||
| 3768 | - if { (eval echo configure:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then | ||
| 3769 | + if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then | ||
| 3770 | for file in conftest.*; do | ||
| 3771 | case $file in | ||
| 3772 | *.c | *.o | *.obj) ;; | ||
| 3773 | @@ -9146,6 +9197,7 @@ | ||
| 3774 | echo " KerberosIV support: $KRB4_MSG" | ||
| 3775 | echo " AFS support: $AFS_MSG" | ||
| 3776 | echo " S/KEY support: $SKEY_MSG" | ||
| 3777 | +echo " SecurID support: $SECURID_MSG" | ||
| 3778 | echo " TCP Wrappers support: $TCPW_MSG" | ||
| 3779 | echo " MD5 password support: $MD5_MSG" | ||
| 3780 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | ||
| 3781 | diff -ruN openssh-2.9p1-orig/configure.in openssh-2.9p1/configure.in | ||
| 3782 | --- openssh-2.9p1-orig/configure.in Thu Apr 26 14:40:28 2001 | ||
| 3783 | +++ openssh-2.9p1/configure.in Sun Apr 29 22:00:00 2001 | ||
| 3784 | @@ -417,6 +417,35 @@ | ||
| 3785 | fi | ||
| 3786 | ] | ||
| 3787 | ) | ||
| 3788 | +SECURID_MSG="no" | ||
| 3789 | +AC_ARG_WITH(securid, | ||
| 3790 | + [ --with-securid Enable SecurID support], | ||
| 3791 | + [ | ||
| 3792 | + if test "x$withval" != "xno" ; then | ||
| 3793 | + saved_LIBS="$LIBS" | ||
| 3794 | + LIBS="$LIBS sdiclient.a" | ||
| 3795 | + AC_MSG_CHECKING(for sdiclient.a) | ||
| 3796 | + AC_TRY_LINK( | ||
| 3797 | + [ | ||
| 3798 | +#include "sdi_athd.h" | ||
| 3799 | +#include "sdconf.h" | ||
| 3800 | +#include "sdacmvls.h" | ||
| 3801 | + struct SD_CLIENT sd_dat, *sd; | ||
| 3802 | + union config_record configure; | ||
| 3803 | + ], | ||
| 3804 | + [sd = &sd_dat; creadcfg(); sd_init(sd);], | ||
| 3805 | + [ | ||
| 3806 | + AC_MSG_RESULT(yes) | ||
| 3807 | + AC_DEFINE(SECURID) | ||
| 3808 | + SECURID_MSG="yes" | ||
| 3809 | + ], | ||
| 3810 | + [ | ||
| 3811 | + AC_MSG_ERROR([*** sdiclient.a missing]) | ||
| 3812 | + ] | ||
| 3813 | + ) | ||
| 3814 | + fi | ||
| 3815 | + ] | ||
| 3816 | +) | ||
| 3817 | |||
| 3818 | # Check whether user wants TCP wrappers support | ||
| 3819 | TCPW_MSG="no" | ||
| 3820 | @@ -1923,6 +1952,7 @@ | ||
| 3821 | echo " KerberosIV support: $KRB4_MSG" | ||
| 3822 | echo " AFS support: $AFS_MSG" | ||
| 3823 | echo " S/KEY support: $SKEY_MSG" | ||
| 3824 | +echo " SecurID support: $SECURID_MSG" | ||
| 3825 | echo " TCP Wrappers support: $TCPW_MSG" | ||
| 3826 | echo " MD5 password support: $MD5_MSG" | ||
| 3827 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | ||
| 3828 | diff -ruN openssh-2.9p1-orig/readconf.c openssh-2.9p1/readconf.c | ||
| 3829 | --- openssh-2.9p1-orig/readconf.c Wed Apr 18 04:11:37 2001 | ||
| 3830 | +++ openssh-2.9p1/readconf.c Sun Apr 29 22:00:00 2001 | ||
| 3831 | @@ -95,6 +95,8 @@ | ||
| 3832 | oBadOption, | ||
| 3833 | oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, | ||
| 3834 | oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh, | ||
| 3835 | + oSecurIDAuthentication, oSecurIDFallBack, | ||
| 3836 | + oAllowNonSecurID, oSecurIDUsersFile, oSecurIDIgnoreShell, | ||
| 3837 | oChallengeResponseAuthentication, oXAuthLocation, | ||
| 3838 | #ifdef KRB4 | ||
| 3839 | oKerberosAuthentication, | ||
| 3840 | @@ -126,6 +128,11 @@ | ||
| 3841 | { "gatewayports", oGatewayPorts }, | ||
| 3842 | { "useprivilegedport", oUsePrivilegedPort }, | ||
| 3843 | { "rhostsauthentication", oRhostsAuthentication }, | ||
| 3844 | + { "securidauthentication", oSecurIDAuthentication }, | ||
| 3845 | + { "securidfallback", oSecurIDFallBack }, | ||
| 3846 | + { "allownonsecurid", oAllowNonSecurID }, | ||
| 3847 | + { "securidusersfile", oSecurIDUsersFile }, | ||
| 3848 | + { "securidignoreshell", oSecurIDIgnoreShell }, | ||
| 3849 | { "passwordauthentication", oPasswordAuthentication }, | ||
| 3850 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | ||
| 3851 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | ||
| 3852 | @@ -322,6 +329,21 @@ | ||
| 3853 | case oRSAAuthentication: | ||
| 3854 | intptr = &options->rsa_authentication; | ||
| 3855 | goto parse_flag; | ||
| 3856 | + case oSecurIDAuthentication: | ||
| 3857 | + intptr = &options->securid_authentication; | ||
| 3858 | + goto parse_flag; | ||
| 3859 | + case oSecurIDFallBack: | ||
| 3860 | + intptr = &options->securid_fallback; | ||
| 3861 | + goto parse_flag; | ||
| 3862 | + case oAllowNonSecurID: | ||
| 3863 | + intptr = &options->allow_nonsecurid; | ||
| 3864 | + goto parse_flag; | ||
| 3865 | + case oSecurIDUsersFile: | ||
| 3866 | + charptr=&options->securid_usersfile; | ||
| 3867 | + goto parse_string; | ||
| 3868 | + case oSecurIDIgnoreShell: | ||
| 3869 | + intptr = &options->securid_ignore_shell; | ||
| 3870 | + goto parse_flag; | ||
| 3871 | |||
| 3872 | case oRhostsRSAAuthentication: | ||
| 3873 | intptr = &options->rhosts_rsa_authentication; | ||
| 3874 | @@ -719,6 +741,11 @@ | ||
| 3875 | options->rsa_authentication = -1; | ||
| 3876 | options->pubkey_authentication = -1; | ||
| 3877 | options->challenge_reponse_authentication = -1; | ||
| 3878 | + options->securid_authentication = -1; | ||
| 3879 | + options->securid_fallback = -1; | ||
| 3880 | + options->allow_nonsecurid = -1; | ||
| 3881 | + options->securid_usersfile = NULL; | ||
| 3882 | + options->securid_ignore_shell = -1; | ||
| 3883 | #ifdef KRB4 | ||
| 3884 | options->kerberos_authentication = -1; | ||
| 3885 | #endif | ||
| 3886 | @@ -773,6 +800,14 @@ | ||
| 3887 | { | ||
| 3888 | int len; | ||
| 3889 | |||
| 3890 | + if (options->securid_authentication == -1) | ||
| 3891 | + options->securid_authentication = 1; | ||
| 3892 | + if (options->securid_fallback == -1) | ||
| 3893 | + options->securid_fallback = 0; | ||
| 3894 | + if (options->allow_nonsecurid == -1) | ||
| 3895 | + options->allow_nonsecurid = 1; | ||
| 3896 | + if (options->securid_ignore_shell == -1) | ||
| 3897 | + options->securid_ignore_shell = 0; | ||
| 3898 | if (options->forward_agent == -1) | ||
| 3899 | options->forward_agent = 0; | ||
| 3900 | if (options->forward_x11 == -1) | ||
| 3901 | diff -ruN openssh-2.9p1-orig/readconf.h openssh-2.9p1/readconf.h | ||
| 3902 | --- openssh-2.9p1-orig/readconf.h Wed Apr 18 04:11:37 2001 | ||
| 3903 | +++ openssh-2.9p1/readconf.h Sun Apr 29 22:00:00 2001 | ||
| 3904 | @@ -40,6 +40,11 @@ | ||
| 3905 | int pubkey_authentication; /* Try ssh2 pubkey authentication. */ | ||
| 3906 | int hostbased_authentication; /* ssh2's rhosts_rsa */ | ||
| 3907 | int challenge_reponse_authentication; | ||
| 3908 | + int securid_authentication; /* Try SecurID authentication. */ | ||
| 3909 | + int securid_fallback; /* Allow fall back to normal password */ | ||
| 3910 | + int allow_nonsecurid; /* Allow non securid users logins */ | ||
| 3911 | + char *securid_usersfile; /* SecurID auth users in this file */ | ||
| 3912 | + int securid_ignore_shell; /* Ignore ACE propsed shell? */ | ||
| 3913 | /* Try S/Key or TIS, authentication. */ | ||
| 3914 | #ifdef KRB4 | ||
| 3915 | int kerberos_authentication; /* Try Kerberos | ||
| 3916 | diff -ruN openssh-2.9p1-orig/servconf.c openssh-2.9p1/servconf.c | ||
| 3917 | --- openssh-2.9p1-orig/servconf.c Wed Apr 25 22:44:15 2001 | ||
| 3918 | +++ openssh-2.9p1/servconf.c Sun Apr 29 22:00:00 2001 | ||
| 3919 | @@ -70,6 +70,13 @@ | ||
| 3920 | options->hostbased_uses_name_from_packet_only = -1; | ||
| 3921 | options->rsa_authentication = -1; | ||
| 3922 | options->pubkey_authentication = -1; | ||
| 3923 | +#ifdef SECURID | ||
| 3924 | + options->securid_authentication = -1; | ||
| 3925 | + options->securid_fallback = -1; | ||
| 3926 | + options->allow_nonsecurid = -1; | ||
| 3927 | + options->securid_usersfile = NULL; | ||
| 3928 | + options->securid_ignore_shell = -1; | ||
| 3929 | +#endif | ||
| 3930 | #ifdef KRB4 | ||
| 3931 | options->kerberos_authentication = -1; | ||
| 3932 | options->kerberos_or_local_passwd = -1; | ||
| 3933 | @@ -168,6 +175,16 @@ | ||
| 3934 | options->rsa_authentication = 1; | ||
| 3935 | if (options->pubkey_authentication == -1) | ||
| 3936 | options->pubkey_authentication = 1; | ||
| 3937 | +#ifdef SECURID | ||
| 3938 | + if (options->securid_authentication == -1) | ||
| 3939 | + options->securid_authentication = 1; | ||
| 3940 | + if (options->securid_fallback == -1) | ||
| 3941 | + options->securid_fallback = 0; | ||
| 3942 | + if (options->allow_nonsecurid == -1) | ||
| 3943 | + options->securid_fallback = 1; | ||
| 3944 | + if (options->securid_ignore_shell == -1) | ||
| 3945 | + options->securid_ignore_shell = 0; | ||
| 3946 | +#endif | ||
| 3947 | #ifdef KRB4 | ||
| 3948 | if (options->kerberos_authentication == -1) | ||
| 3949 | options->kerberos_authentication = (access(KEYFILE, R_OK) == 0); | ||
| 3950 | @@ -218,6 +235,10 @@ | ||
| 3951 | sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, | ||
| 3952 | sPermitRootLogin, sLogFacility, sLogLevel, | ||
| 3953 | sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication, | ||
| 3954 | +#ifdef SECURID | ||
| 3955 | + sSecurIDAuthentication, sSecurIDFallBack, sAllowNonSecurID, | ||
| 3956 | + sSecurIDUsersFile, sSecurIDIgnoreShell, | ||
| 3957 | +#endif | ||
| 3958 | #ifdef KRB4 | ||
| 3959 | sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup, | ||
| 3960 | #endif | ||
| 3961 | @@ -252,6 +273,13 @@ | ||
| 3962 | { "keyregenerationinterval", sKeyRegenerationTime }, | ||
| 3963 | { "permitrootlogin", sPermitRootLogin }, | ||
| 3964 | { "syslogfacility", sLogFacility }, | ||
| 3965 | +#ifdef SECURID | ||
| 3966 | + { "securidauthentication", sSecurIDAuthentication }, | ||
| 3967 | + { "securidfallback", sSecurIDFallBack }, | ||
| 3968 | + { "allownonsecurid", sAllowNonSecurID }, | ||
| 3969 | + { "securidusersfile", sSecurIDUsersFile }, | ||
| 3970 | + { "securidignoreshell", sSecurIDIgnoreShell }, | ||
| 3971 | +#endif | ||
| 3972 | { "loglevel", sLogLevel }, | ||
| 3973 | { "rhostsauthentication", sRhostsAuthentication }, | ||
| 3974 | { "rhostsrsaauthentication", sRhostsRSAAuthentication }, | ||
| 3975 | @@ -577,6 +605,23 @@ | ||
| 3976 | |||
| 3977 | case sKerberosTicketCleanup: | ||
| 3978 | intptr = &options->kerberos_ticket_cleanup; | ||
| 3979 | + goto parse_flag; | ||
| 3980 | +#endif | ||
| 3981 | +#ifdef SECURID | ||
| 3982 | + case sSecurIDAuthentication: | ||
| 3983 | + intptr = &options->securid_authentication; | ||
| 3984 | + goto parse_flag; | ||
| 3985 | + case sSecurIDFallBack: | ||
| 3986 | + intptr = &options->securid_fallback; | ||
| 3987 | + goto parse_flag; | ||
| 3988 | + case sAllowNonSecurID: | ||
| 3989 | + intptr = &options->allow_nonsecurid; | ||
| 3990 | + goto parse_flag; | ||
| 3991 | + case sSecurIDUsersFile: | ||
| 3992 | + charptr = &options->securid_usersfile; | ||
| 3993 | + goto parse_filename; | ||
| 3994 | + case sSecurIDIgnoreShell: | ||
| 3995 | + intptr = &options->securid_ignore_shell; | ||
| 3996 | goto parse_flag; | ||
| 3997 | #endif | ||
| 3998 | |||
| 3999 | diff -ruN openssh-2.9p1-orig/servconf.h openssh-2.9p1/servconf.h | ||
| 4000 | --- openssh-2.9p1-orig/servconf.h Wed Apr 25 22:44:16 2001 | ||
| 4001 | +++ openssh-2.9p1/servconf.h Sun Apr 29 22:00:00 2001 | ||
| 4002 | @@ -84,6 +84,19 @@ | ||
| 4003 | int kerberos_ticket_cleanup; /* If true, destroy ticket | ||
| 4004 | * file on logout. */ | ||
| 4005 | #endif | ||
| 4006 | +#ifdef SECURID | ||
| 4007 | + int securid_authentication; /* If set, use securid */ | ||
| 4008 | + int securid_fallback; /* If set, allow normal passwords | ||
| 4009 | + is master/slave are not accessible */ | ||
| 4010 | + int allow_nonsecurid; /* If set, allow nonsecurid users | ||
| 4011 | + logins via other means (e.g. PAM) */ | ||
| 4012 | + char *securid_usersfile; /* If set, only users in the file | ||
| 4013 | + will authenticate via SecurID | ||
| 4014 | + The shell need not be .../sdshell */ | ||
| 4015 | + int securid_ignore_shell; /* If true, use the shell in /etc/passwd | ||
| 4016 | + instead of the shell proposed by | ||
| 4017 | + the ACE server. */ | ||
| 4018 | +#endif | ||
| 4019 | #ifdef AFS | ||
| 4020 | int kerberos_tgt_passing; /* If true, permit Kerberos tgt | ||
| 4021 | * passing. */ | ||
| 4022 | diff -ruN openssh-2.9p1-orig/sshd.0 openssh-2.9p1/sshd.0 | ||
| 4023 | --- openssh-2.9p1-orig/sshd.0 Sun Apr 29 21:49:49 2001 | ||
| 4024 | +++ openssh-2.9p1/sshd.0 Sun Apr 29 22:00:50 2001 | ||
| 4025 | @@ -186,6 +186,16 @@ | ||
| 4026 | Only group names are valid; a numerical group ID isn't recogM-- | ||
| 4027 | nized. By default login is allowed regardless of the group list. | ||
| 4028 | |||
| 4029 | + AllowNonSecurID | ||
| 4030 | + This will allow users that do not meet the SecurID login activaM-- | ||
| 4031 | + tion requirements (not in the SecurIDUsersFile or do not have a | ||
| 4032 | + shell ending with sdshell, if the SecurIDUsersFile option is used | ||
| 4033 | + or is omitted, respectively) to still log in using another auM-- | ||
| 4034 | + thentication method (e.g. PAM or passwd.) | ||
| 4035 | + | ||
| 4036 | + | ||
| 4037 | + | ||
| 4038 | + | ||
| 4039 | AllowTcpForwarding | ||
| 4040 | Specifies whether TCP forwarding is permitted. The default is | ||
| 4041 | ``yes''. Note that disabling TCP forwarding does not improve seM-- | ||
| 4042 | @@ -315,6 +325,8 @@ | ||
| 4043 | is yes, the password provided by the user will be validated | ||
| 4044 | through the Kerberos KDC. To use this option, the server needs a | ||
| 4045 | Kerberos servtab which allows the verification of the KDC's idenM-- | ||
| 4046 | + | ||
| 4047 | + | ||
| 4048 | tity. Default is ``yes''. | ||
| 4049 | |||
| 4050 | KerberosOrLocalPasswd | ||
| 4051 | @@ -325,8 +337,6 @@ | ||
| 4052 | KerberosTgtPassing | ||
| 4053 | Specifies whether a Kerberos TGT may be forwarded to the server. | ||
| 4054 | Default is ``no'', as this only works when the Kerberos KDC is | ||
| 4055 | - | ||
| 4056 | - | ||
| 4057 | actually an AFS kaserver. | ||
| 4058 | |||
| 4059 | KerberosTicketCleanup | ||
| 4060 | @@ -393,7 +403,6 @@ | ||
| 4061 | lowed. This allows the use of most PAM challenge response authenM-- | ||
| 4062 | tication modules, but it will allow password authentication reM-- | ||
| 4063 | gardless of whether PasswordAuthentication is disabled. The deM-- | ||
| 4064 | - | ||
| 4065 | fault is ``no''. | ||
| 4066 | |||
| 4067 | PasswordAuthentication | ||
| 4068 | @@ -523,8 +532,6 @@ | ||
| 4069 | 1. If the login is on a tty, and no command has been specified, | ||
| 4070 | prints last login time and /etc/motd (unless prevented in the | ||
| 4071 | configuration file or by $HOME/.hushlogin; see the FILES secM-- | ||
| 4072 | - | ||
| 4073 | - | ||
| 4074 | tion). | ||
| 4075 | |||
| 4076 | 2. If the login is on a tty, records login time. | ||
| 4077 | @@ -650,6 +657,7 @@ | ||
| 4078 | Each line in these files contains the following fields: hostnames, bits, | ||
| 4079 | exponent, modulus, comment. The fields are separated by spaces. | ||
| 4080 | |||
| 4081 | + | ||
| 4082 | Hostnames is a comma-separated list of patterns ('*' and '?' act as wildM-- | ||
| 4083 | cards); each pattern in turn is matched against the canonical host name | ||
| 4084 | (when authenticating a client) or against the user-supplied name (when | ||
| 4085 | @@ -657,7 +665,6 @@ | ||
| 4086 | cate negation: if the host name matches a negated pattern, it is not acM-- | ||
| 4087 | cepted (by that line) even if it matched another pattern on the line. | ||
| 4088 | |||
| 4089 | - | ||
| 4090 | Bits, exponent, and modulus are taken directly from the RSA host key; | ||
| 4091 | they can be obtained, e.g., from /etc/ssh_host_key.pub. The optional comM-- | ||
| 4092 | ment field continues to the end of the line, and is not used. | ||
| 4093 | @@ -853,7 +860,6 @@ | ||
| 4094 | SEE ALSO | ||
| 4095 | scp(1), sftp(1), sftp-server(8), ssh(1), ssh-add(1), ssh-agent(1), | ||
| 4096 | ssh-keygen(1), rlogin(1), rsh(1) | ||
| 4097 | - | ||
| 4098 | |||
| 4099 | T. Ylonen, T. Kivinen, M. Saarinen, T. Rinne, and S. Lehtinen, SSH | ||
| 4100 | Protocol Architecture, draft-ietf-secsh-architecture-07.txt, January | ||
| 4101 | diff -ruN openssh-2.9p1-orig/sshd.8 openssh-2.9p1/sshd.8 | ||
| 4102 | --- openssh-2.9p1-orig/sshd.8 Wed Apr 25 22:44:16 2001 | ||
| 4103 | +++ openssh-2.9p1/sshd.8 Sun Apr 29 22:00:00 2001 | ||
| 4104 | @@ -310,6 +310,13 @@ | ||
| 4105 | Only group names are valid; a numerical group ID isn't recognized. | ||
| 4106 | By default login is allowed regardless of the group list. | ||
| 4107 | .Pp | ||
| 4108 | +.It Cm AllowNonSecurID | ||
| 4109 | +This will allow users that do not meet the SecurID login | ||
| 4110 | +activation requirements (not in the SecurIDUsersFile or do not | ||
| 4111 | +have a shell ending with sdshell, if the SecurIDUsersFile option | ||
| 4112 | +is used or is omitted, respectively) to still log in using another | ||
| 4113 | +authentication method (e.g. PAM or passwd.) | ||
| 4114 | +.Pp | ||
| 4115 | .It Cm AllowTcpForwarding | ||
| 4116 | Specifies whether TCP forwarding is permitted. | ||
| 4117 | The default is | ||
diff --git a/other/ssharp/contrib/caldera/CVS/Entries b/other/ssharp/contrib/caldera/CVS/Entries new file mode 100644 index 0000000..f0b2bea --- /dev/null +++ b/other/ssharp/contrib/caldera/CVS/Entries | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | /openssh.spec/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /ssh-host-keygen/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /sshd.init/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | /sshd.pam/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 5 | D | ||
diff --git a/other/ssharp/contrib/caldera/CVS/Repository b/other/ssharp/contrib/caldera/CVS/Repository new file mode 100644 index 0000000..135d5a7 --- /dev/null +++ b/other/ssharp/contrib/caldera/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/caldera | |||
diff --git a/other/ssharp/contrib/caldera/CVS/Root b/other/ssharp/contrib/caldera/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/caldera/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/caldera/CVS/Tag b/other/ssharp/contrib/caldera/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/caldera/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/caldera/openssh.spec b/other/ssharp/contrib/caldera/openssh.spec new file mode 100644 index 0000000..6bb44ec --- /dev/null +++ b/other/ssharp/contrib/caldera/openssh.spec | |||
| @@ -0,0 +1,281 @@ | |||
| 1 | %define askpass 1.2.0 | ||
| 2 | |||
| 3 | Name : openssh | ||
| 4 | Version : 2.9p1 | ||
| 5 | Release : 1 | ||
| 6 | Group : System/Network | ||
| 7 | |||
| 8 | Summary : OpenSSH free Secure Shell (SSH) implementation. | ||
| 9 | Summary(de) : OpenSSH - freie Implementation der Secure Shell (SSH). | ||
| 10 | Summary(es) : OpenSSH implementación libre de Secure Shell (SSH). | ||
| 11 | Summary(fr) : Implémentation libre du shell sécurisé OpenSSH (SSH). | ||
| 12 | Summary(it) : Implementazione gratuita OpenSSH della Secure Shell. | ||
| 13 | Summary(pt) : Implementação livre OpenSSH do protocolo 'Secure Shell' (SSH). | ||
| 14 | |||
| 15 | Copyright : BSD | ||
| 16 | Packager : Stephan Seyboth <sps@caldera.de> | ||
| 17 | #Icon : . | ||
| 18 | URL : http://www.openssh.com/ | ||
| 19 | |||
| 20 | Obsoletes : ssh, ssh-clients, openssh-clients | ||
| 21 | |||
| 22 | BuildRoot : /tmp/%{Name}-%{Version} | ||
| 23 | |||
| 24 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{Version}.tar.gz | ||
| 25 | Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{askpass}.tar.gz | ||
| 26 | |||
| 27 | |||
| 28 | %Package server | ||
| 29 | Group : System/Network | ||
| 30 | Requires : openssh = %{Version} | ||
| 31 | Obsoletes : ssh-server | ||
| 32 | |||
| 33 | Summary : OpenSSH Secure Shell protocol server (sshd). | ||
| 34 | Summary(de) : OpenSSH Secure Shell Protocol Server (sshd). | ||
| 35 | Summary(es) : Servidor del protocolo OpenSSH Secure Shell (sshd). | ||
| 36 | Summary(fr) : Serveur de protocole du shell sécurisé OpenSSH (sshd). | ||
| 37 | Summary(it) : Server OpenSSH per il protocollo Secure Shell (sshd). | ||
| 38 | Summary(pt) : Servidor do protocolo 'Secure Shell' OpenSSH (sshd). | ||
| 39 | |||
| 40 | |||
| 41 | %Package askpass | ||
| 42 | Group : System/Network | ||
| 43 | Requires : openssh = %{Version} | ||
| 44 | Obsoletes : ssh-extras | ||
| 45 | |||
| 46 | Summary : OpenSSH X11 pass-phrase dialog. | ||
| 47 | Summary(de) : OpenSSH X11 Passwort-Dialog. | ||
| 48 | Summary(es) : Aplicación de petición de frase clave OpenSSH X11. | ||
| 49 | Summary(fr) : Dialogue pass-phrase X11 d'OpenSSH. | ||
| 50 | Summary(it) : Finestra di dialogo X11 per la frase segreta di OpenSSH. | ||
| 51 | Summary(pt) : Diálogo de pedido de senha para X11 do OpenSSH. | ||
| 52 | |||
| 53 | |||
| 54 | %Description | ||
| 55 | OpenSSH (Secure Shell) provides access to a remote system. It replaces | ||
| 56 | telnet, rlogin, rexec, and rsh, and provides secure encrypted | ||
| 57 | communications between two untrusted hosts over an insecure network. | ||
| 58 | X11 connections and arbitrary TCP/IP ports can also be forwarded over | ||
| 59 | the secure channel. | ||
| 60 | |||
| 61 | %Description -l de | ||
| 62 | OpenSSH (Secure Shell) stellt den Zugang zu anderen Rechnern her. Es ersetzt | ||
| 63 | telnet, rlogin, rexec und rsh und stellt eine sichere, verschlüsselte | ||
| 64 | Verbindung zwischen zwei nicht vertrauenswürdigen Hosts über eine unsicheres | ||
| 65 | Netzwerk her. X11 Verbindungen und beliebige andere TCP/IP Ports können ebenso | ||
| 66 | über den sicheren Channel weitergeleitet werden. | ||
| 67 | |||
| 68 | %Description -l es | ||
| 69 | OpenSSH (Secure Shell) proporciona acceso a sistemas remotos. Reemplaza a | ||
| 70 | telnet, rlogin, rexec, y rsh, y proporciona comunicaciones seguras encriptadas | ||
| 71 | entre dos equipos entre los que no se ha establecido confianza a través de una | ||
| 72 | red insegura. Las conexiones X11 y puertos TCP/IP arbitrarios también pueden | ||
| 73 | ser canalizadas sobre el canal seguro. | ||
| 74 | |||
| 75 | %Description -l fr | ||
| 76 | OpenSSH (Secure Shell) fournit un accès à un système distant. Il remplace | ||
| 77 | telnet, rlogin, rexec et rsh, tout en assurant des communications cryptées | ||
| 78 | securisées entre deux hôtes non fiabilisés sur un réseau non sécurisé. Des | ||
| 79 | connexions X11 et des ports TCP/IP arbitraires peuvent également être | ||
| 80 | transmis sur le canal sécurisé. | ||
| 81 | |||
| 82 | %Description -l it | ||
| 83 | OpenSSH (Secure Shell) fornisce l'accesso ad un sistema remoto. | ||
| 84 | Sostituisce telnet, rlogin, rexec, e rsh, e fornisce comunicazioni sicure | ||
| 85 | e crittate tra due host non fidati su una rete non sicura. Le connessioni | ||
| 86 | X11 ad una porta TCP/IP arbitraria possono essere inoltrate attraverso | ||
| 87 | un canale sicuro. | ||
| 88 | |||
| 89 | %Description -l pt | ||
| 90 | OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o | ||
| 91 | telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e cifradas | ||
| 92 | entre duas máquinas sem confiança mútua sobre uma rede insegura. | ||
| 93 | Ligações X11 e portos TCP/IP arbitrários também poder ser reenviados | ||
| 94 | pelos porto seguro. | ||
| 95 | |||
| 96 | %Description server | ||
| 97 | This package installs the sshd, the server portion of OpenSSH. | ||
| 98 | |||
| 99 | %Description -l de server | ||
| 100 | Dieses Paket installiert den sshd, den Server-Teil der OpenSSH. | ||
| 101 | |||
| 102 | %Description -l es server | ||
| 103 | Este paquete instala sshd, la parte servidor de OpenSSH. | ||
| 104 | |||
| 105 | %Description -l fr server | ||
| 106 | Ce paquetage installe le 'sshd', partie serveur de OpenSSH. | ||
| 107 | |||
| 108 | %Description -l it server | ||
| 109 | Questo pacchetto installa sshd, il server di OpenSSH. | ||
| 110 | |||
| 111 | %Description -l pt server | ||
| 112 | Este pacote intala o sshd, o servidor do OpenSSH. | ||
| 113 | |||
| 114 | %Description askpass | ||
| 115 | This package contains an X11-based passphrase dialog. | ||
| 116 | |||
| 117 | %Description -l de askpass | ||
| 118 | Dieses Paket enthält einen X11-basierten Passwort Dialog. | ||
| 119 | |||
| 120 | %Description -l es askpass | ||
| 121 | Este paquete contiene una aplicación para petición de frases-contraseña basada | ||
| 122 | en X11. | ||
| 123 | |||
| 124 | %Description -l fr askpass | ||
| 125 | Ce paquetage contient un dialogue de passphrase basé sur X11. | ||
| 126 | |||
| 127 | %Description -l it askpass | ||
| 128 | Questo pacchetto contiene una finestra di X11 che chiede la frase segreta. | ||
| 129 | |||
| 130 | %Description -l pt askpass | ||
| 131 | Este pacote contém um diálogo de senha para o X11. | ||
| 132 | |||
| 133 | %Prep | ||
| 134 | %setup | ||
| 135 | %setup -D -T -a1 | ||
| 136 | |||
| 137 | |||
| 138 | %Build | ||
| 139 | CFLAGS="$RPM_OPT_FLAGS" \ | ||
| 140 | ./configure \ | ||
| 141 | --prefix=/usr \ | ||
| 142 | --sysconfdir=/etc/ssh \ | ||
| 143 | --libexecdir=/usr/lib/ssh \ | ||
| 144 | --with-pam \ | ||
| 145 | --with-tcp-wrappers \ | ||
| 146 | --with-ipv4-default \ | ||
| 147 | |||
| 148 | make | ||
| 149 | |||
| 150 | cd x11-ssh-askpass-%{askpass} | ||
| 151 | xmkmf -a | ||
| 152 | make | ||
| 153 | |||
| 154 | |||
| 155 | %Install | ||
| 156 | %{mkDESTDIR} | ||
| 157 | |||
| 158 | make DESTDIR="$DESTDIR" install | ||
| 159 | |||
| 160 | make -C x11-ssh-askpass-%{askpass} DESTDIR="$DESTDIR" \ | ||
| 161 | BINDIR="/usr/lib/ssh" install | ||
| 162 | |||
| 163 | %{fixManPages} | ||
| 164 | |||
| 165 | # install remaining docs | ||
| 166 | NV="$DESTDIR%{_defaultdocdir}/%{Name}-%{Version}" | ||
| 167 | mkdir -p $NV | ||
| 168 | cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO $NV | ||
| 169 | mkdir -p $NV/x11-ssh-askpass-%{askpass} | ||
| 170 | cp -a x11-ssh-askpass-%{askpass}/{README,ChangeLog,SshAskpass*.ad} \ | ||
| 171 | $NV/x11-ssh-askpass-%{askpass} | ||
| 172 | |||
| 173 | |||
| 174 | # OpenLinux specific configuration | ||
| 175 | mkdir -p $DESTDIR/{etc/pam.d,%{SVIcdir},%{SVIdir}} | ||
| 176 | |||
| 177 | # enabling X11 forwarding on the server is convenient and okay, | ||
| 178 | # on the client side it's a potential security risk! | ||
| 179 | %{fixUP} -vg $DESTDIR/etc/ssh/sshd_config 'X11Forwarding no' \ | ||
| 180 | 'X11Forwarding yes' | ||
| 181 | |||
| 182 | install -m644 contrib/caldera/sshd.pam $DESTDIR/etc/pam.d/sshd | ||
| 183 | # FIXME: disabled, find out why this doesn't work with nis | ||
| 184 | %{fixUP} -vg $DESTDIR/etc/pam.d/sshd '(.*pam_limits.*)' '#$1' | ||
| 185 | |||
| 186 | install -m 0755 contrib/caldera/sshd.init $DESTDIR%{SVIdir}/sshd | ||
| 187 | %{fixUP} -T $DESTDIR/%{SVIdir} -e 's:\@SVIdir\@:%{SVIdir}:' | ||
| 188 | %{fixUP} -T $DESTDIR/%{SVIdir} -e 's:\@sysconfdir\@:/etc/ssh:' | ||
| 189 | |||
| 190 | cat <<-EoD > $DESTDIR%{SVIcdir}/sshd | ||
| 191 | IDENT=sshd | ||
| 192 | DESCRIPTIVE="OpenSSH secure shell daemon" | ||
| 193 | # This service will be marked as 'skipped' on boot if there | ||
| 194 | # is no host key. Use ssh-host-keygen to generate one | ||
| 195 | ONBOOT="yes" | ||
| 196 | OPTIONS="" | ||
| 197 | EoD | ||
| 198 | |||
| 199 | SKG=$DESTDIR/usr/sbin/ssh-host-keygen | ||
| 200 | install -m 0755 contrib/caldera/ssh-host-keygen $SKG | ||
| 201 | %{fixUP} -T $SKG -e 's:\@sysconfdir\@:/etc/ssh:' | ||
| 202 | %{fixUP} -T $SKG -e 's:\@sshkeygen\@:/usr/bin/ssh-keygen:' | ||
| 203 | |||
| 204 | |||
| 205 | # generate file lists | ||
| 206 | %{mkLists} -c %{Name} | ||
| 207 | %{mkLists} -d %{Name} << 'EOF' | ||
| 208 | /etc/ssh base | ||
| 209 | ^/etc/ IGNORED | ||
| 210 | %{_defaultdocdir}/$ IGNORED | ||
| 211 | askpass askpass | ||
| 212 | * default | ||
| 213 | EOF | ||
| 214 | %{mkLists} -a -f %{Name} << 'EOF' | ||
| 215 | ^/etc * prefix(%%config) | ||
| 216 | /usr/X11R6/lib/X11/app-defaults IGNORED | ||
| 217 | [Aa]skpass askpass | ||
| 218 | %{_defaultdocdir}/%{Name}-%{Version}/ base | ||
| 219 | ssh-keygen base | ||
| 220 | sshd server | ||
| 221 | sftp-server server | ||
| 222 | .* base | ||
| 223 | EOF | ||
| 224 | |||
| 225 | |||
| 226 | %Clean | ||
| 227 | %{rmDESTDIR} | ||
| 228 | |||
| 229 | |||
| 230 | %Post | ||
| 231 | # Generate host key when none is present to get up and running, | ||
| 232 | # both client and server require this for host-based auth! | ||
| 233 | # ssh-host-keygen checks for existing keys. | ||
| 234 | /usr/sbin/ssh-host-keygen | ||
| 235 | : # to protect the rpm database | ||
| 236 | |||
| 237 | |||
| 238 | %Post server | ||
| 239 | if [ -x %{LSBinit}-install ]; then | ||
| 240 | %{LSBinit}-install sshd | ||
| 241 | else | ||
| 242 | lisa --SysV-init install sshd S55 3:4:5 K45 0:1:2:6 | ||
| 243 | fi | ||
| 244 | |||
| 245 | ! %{SVIdir}/sshd status || %{SVIdir}/sshd restart | ||
| 246 | : # to protect the rpm database | ||
| 247 | |||
| 248 | |||
| 249 | %PreUn server | ||
| 250 | [ "$1" = 0 ] || exit 0 | ||
| 251 | |||
| 252 | ! %{SVIdir}/sshd status || %{SVIdir}/sshd stop | ||
| 253 | : # to protect the rpm database | ||
| 254 | |||
| 255 | |||
| 256 | %PostUn server | ||
| 257 | if [ -x %{LSBinit}-remove ]; then | ||
| 258 | %{LSBinit}-remove sshd | ||
| 259 | else | ||
| 260 | lisa --SysV-init remove sshd $1 | ||
| 261 | fi | ||
| 262 | : # to protect the rpm database | ||
| 263 | |||
| 264 | |||
| 265 | %Files -f files-%{Name}-base | ||
| 266 | %defattr(-,root,root) | ||
| 267 | |||
| 268 | |||
| 269 | %Files server -f files-%{Name}-server | ||
| 270 | %defattr(-,root,root) | ||
| 271 | |||
| 272 | |||
| 273 | %Files askpass -f files-%{Name}-askpass | ||
| 274 | %defattr(-,root,root) | ||
| 275 | |||
| 276 | |||
| 277 | %ChangeLog | ||
| 278 | * Mon Jan 01 1998 ... | ||
| 279 | Template Version: 1.31 | ||
| 280 | |||
| 281 | $Id: openssh.spec,v 1.1.1.1 2001/09/19 14:44:59 stealth Exp $ | ||
diff --git a/other/ssharp/contrib/caldera/ssh-host-keygen b/other/ssharp/contrib/caldera/ssh-host-keygen new file mode 100755 index 0000000..cfb20ca --- /dev/null +++ b/other/ssharp/contrib/caldera/ssh-host-keygen | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | # | ||
| 3 | # $Id: ssh-host-keygen,v 1.1.1.1 2001/09/19 14:44:59 stealth Exp $ | ||
| 4 | # | ||
| 5 | # This script is normally run only *once* for a given host | ||
| 6 | # (in a given period of time) -- on updates/upgrades/recovery | ||
| 7 | # the ssh_host_key* files _should_ be retained! Otherwise false | ||
| 8 | # "man-in-the-middle-attack" alerts will frighten unsuspecting | ||
| 9 | # clients... | ||
| 10 | |||
| 11 | keydir=@sysconfdir@ | ||
| 12 | keygen=@sshkeygen@ | ||
| 13 | |||
| 14 | if [ -f $keydir/ssh_host_key -o \ | ||
| 15 | -f $keydir/ssh_host_key.pub ]; then | ||
| 16 | echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." | ||
| 17 | else | ||
| 18 | echo "Generating 1024 bit SSH1 RSA host key." | ||
| 19 | $keygen -b 1024 -t rsa1 -f $keydir/ssh_host_key -C '' -N '' | ||
| 20 | fi | ||
| 21 | |||
| 22 | if [ -f $keydir/ssh_host_rsa_key -o \ | ||
| 23 | -f $keydir/ssh_host_rsa_key.pub ]; then | ||
| 24 | echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." | ||
| 25 | else | ||
| 26 | echo "Generating 1024 bit SSH2 RSA host key." | ||
| 27 | $keygen -b 1024 -t rsa -f $keydir/ssh_host_rsa_key -C '' -N '' | ||
| 28 | fi | ||
| 29 | |||
| 30 | if [ -f $keydir/ssh_host_dsa_key -o \ | ||
| 31 | -f $keydir/ssh_host_dsa_key.pub ]; then | ||
| 32 | echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key." | ||
| 33 | else | ||
| 34 | echo "Generating SSH2 DSA host key." | ||
| 35 | $keygen -t dsa -f $keydir/ssh_host_dsa_key -C '' -N '' | ||
| 36 | fi | ||
diff --git a/other/ssharp/contrib/caldera/sshd.init b/other/ssharp/contrib/caldera/sshd.init new file mode 100755 index 0000000..1d5c1a7 --- /dev/null +++ b/other/ssharp/contrib/caldera/sshd.init | |||
| @@ -0,0 +1,125 @@ | |||
| 1 | #! /bin/bash | ||
| 2 | # | ||
| 3 | # $Id: sshd.init,v 1.1.1.1 2001/09/19 14:44:59 stealth Exp $ | ||
| 4 | # | ||
| 5 | ### BEGIN INIT INFO | ||
| 6 | # Provides: | ||
| 7 | # Required-Start: $network | ||
| 8 | # Required-Stop: | ||
| 9 | # Default-Start: 3 4 5 | ||
| 10 | # Default-Stop: 0 1 2 6 | ||
| 11 | # Description: sshd | ||
| 12 | # Bring up/down the OpenSSH secure shell daemon. | ||
| 13 | ### END INIT INFO | ||
| 14 | # | ||
| 15 | # Written by Miquel van Smoorenburg <miquels@drinkel.ow.org>. | ||
| 16 | # Modified for Debian GNU/Linux by Ian Murdock <imurdock@gnu.ai.mit.edu>. | ||
| 17 | # Modified for OpenLinux by Raymund Will <ray@caldera.de> | ||
| 18 | |||
| 19 | NAME=sshd | ||
| 20 | DAEMON=/usr/sbin/$NAME | ||
| 21 | # Hack-Alert(TM)! This is necessary to get around the 'reload'-problem | ||
| 22 | # created by recent OpenSSH daemon/ssd combinations. See Caldera internal | ||
| 23 | # PR [linux/8278] for details... | ||
| 24 | PIDF=/var/run/$NAME.pid | ||
| 25 | NAME=$DAEMON | ||
| 26 | |||
| 27 | _status() { | ||
| 28 | [ -z "$1" ] || local pidf="$1" | ||
| 29 | local ret=-1 | ||
| 30 | local pid | ||
| 31 | if [ -n "$pidf" ] && [ -r "$pidf" ]; then | ||
| 32 | pid=$(head -1 $pidf) | ||
| 33 | else | ||
| 34 | pid=$(pidof $NAME) | ||
| 35 | fi | ||
| 36 | |||
| 37 | if [ ! -e $SVIlock ]; then | ||
| 38 | # no lock-file => not started == stopped? | ||
| 39 | ret=3 | ||
| 40 | elif { [ -n "$pidf" ] && [ ! -f "$pidf" ] } || [ -z "$pid" ]; then | ||
| 41 | # pid-file given but not present or no pid => died, but was not stopped | ||
| 42 | ret=2 | ||
| 43 | elif [ -r /proc/$pid/cmdline ] && | ||
| 44 | echo -ne $NAME'\000' | cmp -s - /proc/$pid/cmdline; then | ||
| 45 | # pid-file given and present or pid found => check process... | ||
| 46 | # but don't compare exe, as this will fail after an update! | ||
| 47 | # compares OK => all's well, that ends well... | ||
| 48 | ret=0 | ||
| 49 | else | ||
| 50 | # no such process or exe does not match => stale pid-file or process died | ||
| 51 | # just recently... | ||
| 52 | ret=1 | ||
| 53 | fi | ||
| 54 | return $ret | ||
| 55 | } | ||
| 56 | |||
| 57 | # Source function library (and set vital variables). | ||
| 58 | . @SVIdir@/functions | ||
| 59 | |||
| 60 | case "$1" in | ||
| 61 | start) | ||
| 62 | [ ! -e $SVIlock ] || exit 0 | ||
| 63 | [ -x $DAEMON ] || exit 5 | ||
| 64 | SVIemptyConfig @sysconfdir@/sshd_config && exit 6 | ||
| 65 | |||
| 66 | if [ ! \( -f @sysconfdir@/ssh_host_key -a \ | ||
| 67 | -f @sysconfdir@/ssh_host_key.pub \) -a \ | ||
| 68 | ! \( -f @sysconfdir@/ssh_host_rsa_key -a \ | ||
| 69 | -f @sysconfdir@/ssh_host_rsa_key.pub \) -a \ | ||
| 70 | ! \( -f @sysconfdir@/ssh_host_dsa_key -a \ | ||
| 71 | -f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then | ||
| 72 | |||
| 73 | echo "$SVIsubsys: host key not initialized: skipped!" | ||
| 74 | echo "$SVIsubsys: use ssh-host-keygen to generate one!" | ||
| 75 | exit 6 | ||
| 76 | fi | ||
| 77 | |||
| 78 | echo -n "Starting $SVIsubsys services: " | ||
| 79 | ssd -S -x $DAEMON -n $NAME -- $OPTIONS | ||
| 80 | ret=$? | ||
| 81 | |||
| 82 | echo "." | ||
| 83 | touch $SVIlock | ||
| 84 | ;; | ||
| 85 | |||
| 86 | stop) | ||
| 87 | [ -e $SVIlock ] || exit 0 | ||
| 88 | |||
| 89 | echo -n "Stopping $SVIsubsys services: " | ||
| 90 | ssd -K -p $PIDF -n $NAME | ||
| 91 | ret=$? | ||
| 92 | |||
| 93 | echo "." | ||
| 94 | rm -f $SVIlock | ||
| 95 | ;; | ||
| 96 | |||
| 97 | force-reload|reload) | ||
| 98 | [ -e $SVIlock ] || exit 0 | ||
| 99 | |||
| 100 | echo "Reloading $SVIsubsys configuration files: " | ||
| 101 | ssd -K --signal 1 -q -p $PIDF -n $NAME | ||
| 102 | ret=$? | ||
| 103 | echo "done." | ||
| 104 | ;; | ||
| 105 | |||
| 106 | restart) | ||
| 107 | $0 stop | ||
| 108 | $0 start | ||
| 109 | ret=$? | ||
| 110 | ;; | ||
| 111 | |||
| 112 | status) | ||
| 113 | _status $PIDF | ||
| 114 | ret=$? | ||
| 115 | ;; | ||
| 116 | |||
| 117 | *) | ||
| 118 | echo "Usage: $SVIscript {[re]start|stop|[force-]reload|status}" | ||
| 119 | ret=2 | ||
| 120 | ;; | ||
| 121 | |||
| 122 | esac | ||
| 123 | |||
| 124 | exit $ret | ||
| 125 | |||
diff --git a/other/ssharp/contrib/caldera/sshd.pam b/other/ssharp/contrib/caldera/sshd.pam new file mode 100644 index 0000000..26dcb34 --- /dev/null +++ b/other/ssharp/contrib/caldera/sshd.pam | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #%PAM-1.0 | ||
| 2 | auth required /lib/security/pam_pwdb.so shadow nodelay | ||
| 3 | auth required /lib/security/pam_nologin.so | ||
| 4 | account required /lib/security/pam_pwdb.so | ||
| 5 | password required /lib/security/pam_cracklib.so | ||
| 6 | password required /lib/security/pam_pwdb.so shadow nullok use_authtok | ||
| 7 | session required /lib/security/pam_pwdb.so | ||
| 8 | session required /lib/security/pam_limits.so | ||
diff --git a/other/ssharp/contrib/chroot.diff b/other/ssharp/contrib/chroot.diff new file mode 100644 index 0000000..2e9140f --- /dev/null +++ b/other/ssharp/contrib/chroot.diff | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | From: Ricardo Cerqueira <rmcc@novis.pt> | ||
| 2 | |||
| 3 | A patch to cause sshd to chroot when it encounters the magic token | ||
| 4 | '/./' in a users home directory. The directory portion before the | ||
| 5 | token is the directory to chroot() to, the portion after the | ||
| 6 | token is the user's home directory relative to the new root. | ||
| 7 | |||
| 8 | To apply, execute the following command from the OpenSSH source directory: | ||
| 9 | |||
| 10 | patch -p0 < contrib/chroot.diff | ||
| 11 | |||
| 12 | |||
| 13 | --- session.c Thu Mar 22 01:58:27 2001 | ||
| 14 | +++ session.c.chroot Thu Apr 5 12:33:23 2001 | ||
| 15 | @@ -93,6 +93,8 @@ | ||
| 16 | # include <uinfo.h> | ||
| 17 | #endif | ||
| 18 | |||
| 19 | +#define CHROOT | ||
| 20 | + | ||
| 21 | /* types */ | ||
| 22 | |||
| 23 | #define TTYSZ 64 | ||
| 24 | @@ -1012,6 +1014,11 @@ | ||
| 25 | extern char **environ; | ||
| 26 | struct stat st; | ||
| 27 | char *argv[10]; | ||
| 28 | +#ifdef CHROOT | ||
| 29 | + char *user_dir; | ||
| 30 | + char *new_root; | ||
| 31 | +#endif /* CHROOT */ | ||
| 32 | + | ||
| 33 | int do_xauth = s->auth_proto != NULL && s->auth_data != NULL; | ||
| 34 | #ifdef WITH_IRIX_PROJECT | ||
| 35 | prid_t projid; | ||
| 36 | @@ -1095,6 +1102,27 @@ | ||
| 37 | exit(1); | ||
| 38 | } | ||
| 39 | endgrent(); | ||
| 40 | + | ||
| 41 | +#ifdef CHROOT | ||
| 42 | + user_dir = xstrdup(pw->pw_dir); | ||
| 43 | + new_root = user_dir + 1; | ||
| 44 | + | ||
| 45 | + while((new_root = strchr(new_root, '.')) != NULL) { | ||
| 46 | + new_root--; | ||
| 47 | + if(strncmp(new_root, "/./", 3) == 0) { | ||
| 48 | + *new_root = '\0'; | ||
| 49 | + new_root += 2; | ||
| 50 | + | ||
| 51 | + if(chroot(user_dir) != 0) | ||
| 52 | + fatal("Couldn't chroot to user directory %s", user_dir); | ||
| 53 | + | ||
| 54 | + pw->pw_dir = new_root; | ||
| 55 | + break; | ||
| 56 | + } | ||
| 57 | + new_root += 2; | ||
| 58 | + } | ||
| 59 | +#endif /* CHROOT */ | ||
| 60 | + | ||
| 61 | # ifdef WITH_IRIX_JOBS | ||
| 62 | jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); | ||
| 63 | if (jid == -1) { | ||
diff --git a/other/ssharp/contrib/cygwin/CVS/Entries b/other/ssharp/contrib/cygwin/CVS/Entries new file mode 100644 index 0000000..25c4b15 --- /dev/null +++ b/other/ssharp/contrib/cygwin/CVS/Entries | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | /README/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /ssh-host-config/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /ssh-user-config/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | D | ||
diff --git a/other/ssharp/contrib/cygwin/CVS/Repository b/other/ssharp/contrib/cygwin/CVS/Repository new file mode 100644 index 0000000..c96da7a --- /dev/null +++ b/other/ssharp/contrib/cygwin/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/cygwin | |||
diff --git a/other/ssharp/contrib/cygwin/CVS/Root b/other/ssharp/contrib/cygwin/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/cygwin/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/cygwin/CVS/Tag b/other/ssharp/contrib/cygwin/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/cygwin/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/cygwin/README b/other/ssharp/contrib/cygwin/README new file mode 100644 index 0000000..798e5d6 --- /dev/null +++ b/other/ssharp/contrib/cygwin/README | |||
| @@ -0,0 +1,163 @@ | |||
| 1 | This package is the actual port of OpenSSH to Cygwin 1.1. | ||
| 2 | |||
| 3 | =========================================================================== | ||
| 4 | Important change since 2.3.0p1: | ||
| 5 | |||
| 6 | When using `ntea' or `ntsec' you now have to care for the ownership | ||
| 7 | and permission bits of your host key files and your private key files. | ||
| 8 | The host key files have to be owned by the NT account which starts | ||
| 9 | sshd. The user key files have to be owned by the user. The permission | ||
| 10 | bits of the private key files (host and user) have to be at least | ||
| 11 | rw------- (0600)! | ||
| 12 | |||
| 13 | Note that this is forced under `ntsec' only if the files are on a NTFS | ||
| 14 | filesystem (which is recommended) due to the lack of any basic security | ||
| 15 | features of the FAT/FAT32 filesystems. | ||
| 16 | =========================================================================== | ||
| 17 | |||
| 18 | If you are installing OpenSSH the first time, you can generate global config | ||
| 19 | files and server keys by running | ||
| 20 | |||
| 21 | /usr/bin/ssh-host-config | ||
| 22 | |||
| 23 | Note that this binary archive doesn't contain default config files in /etc. | ||
| 24 | That files are only created if ssh-host-config is started. | ||
| 25 | |||
| 26 | If you are updating your installation you may run the above ssh-host-config | ||
| 27 | as well to move your configuration files to the new location and to | ||
| 28 | erase the files at the old location. | ||
| 29 | |||
| 30 | To support testing and unattended installation ssh-host-config got | ||
| 31 | some options: | ||
| 32 | |||
| 33 | usage: ssh-host-config [OPTION]... | ||
| 34 | Options: | ||
| 35 | --debug -d Enable shell's debug output. | ||
| 36 | --yes -y Answer all questions with "yes" automatically. | ||
| 37 | --no -n Answer all questions with "no" automatically. | ||
| 38 | --port -p <n> sshd listens on port n. | ||
| 39 | |||
| 40 | You can create the private and public keys for a user now by running | ||
| 41 | |||
| 42 | /usr/bin/ssh-user-config | ||
| 43 | |||
| 44 | under the users account. | ||
| 45 | |||
| 46 | To support testing and unattended installation ssh-user-config got | ||
| 47 | some options as well: | ||
| 48 | |||
| 49 | usage: ssh-user-config [OPTION]... | ||
| 50 | Options: | ||
| 51 | --debug -d Enable shell's debug output. | ||
| 52 | --yes -y Answer all questions with "yes" automatically. | ||
| 53 | --no -n Answer all questions with "no" automatically. | ||
| 54 | --passphrase -p word Use "word" as passphrase automatically. | ||
| 55 | |||
| 56 | Install sshd as daemon via SRVANY.EXE (recommended on NT/W2K), via inetd | ||
| 57 | (results in very slow deamon startup!) or from the command line (recommended | ||
| 58 | on 9X/ME). | ||
| 59 | |||
| 60 | If starting via inetd, copy sshd to eg. /usr/sbin/in.sshd and add the | ||
| 61 | following line to your inetd.conf file: | ||
| 62 | |||
| 63 | sshd stream tcp nowait root /usr/sbin/in.sshd sshd -i | ||
| 64 | |||
| 65 | Moreover you'll have to add the following line to your | ||
| 66 | ${SYSTEMROOT}/system32/drivers/etc/services file: | ||
| 67 | |||
| 68 | sshd 22/tcp #SSH daemon | ||
| 69 | |||
| 70 | Authentication to sshd is possible in one of two ways. | ||
| 71 | You'll have to decide before starting sshd! | ||
| 72 | |||
| 73 | - If you want to authenticate via RSA and you want to login to that | ||
| 74 | machine to exactly one user account you can do so by running sshd | ||
| 75 | under that user account. You must change /etc/sshd_config | ||
| 76 | to contain the following: | ||
| 77 | |||
| 78 | RSAAuthentication yes | ||
| 79 | |||
| 80 | Moreover it's possible to use rhosts and/or rhosts with | ||
| 81 | RSA authentication by setting the following in sshd_config: | ||
| 82 | |||
| 83 | RhostsAuthentication yes | ||
| 84 | RhostsRSAAuthentication yes | ||
| 85 | |||
| 86 | - If you want to be able to login to different user accounts you'll | ||
| 87 | have to start sshd under system account or any other account that | ||
| 88 | is able to switch user context. Note that administrators are _not_ | ||
| 89 | able to do that by default! You'll have to give the following | ||
| 90 | special user rights to the user: | ||
| 91 | "Act as part of the operating system" | ||
| 92 | "Replace process level token" | ||
| 93 | "Increase quotas" | ||
| 94 | and if used via service manager | ||
| 95 | "Logon as a service". | ||
| 96 | |||
| 97 | The system account does of course own that user rights by default. | ||
| 98 | |||
| 99 | Unfortunately, if you choose that way, you can only logon with | ||
| 100 | NT password authentification and you should change | ||
| 101 | /etc/sshd_config to contain the following: | ||
| 102 | |||
| 103 | PasswordAuthentication yes | ||
| 104 | RhostsAuthentication no | ||
| 105 | RhostsRSAAuthentication no | ||
| 106 | RSAAuthentication no | ||
| 107 | |||
| 108 | However you can login to the user which has started sshd with | ||
| 109 | RSA authentication anyway. If you want that, change the RSA | ||
| 110 | authentication setting back to "yes": | ||
| 111 | |||
| 112 | RSAAuthentication yes | ||
| 113 | |||
| 114 | Please note that OpenSSH does never use the value of $HOME to | ||
| 115 | search for the users configuration files! It always uses the | ||
| 116 | value of the pw_dir field in /etc/passwd as the home directory. | ||
| 117 | If no home diretory is set in /etc/passwd, the root directory | ||
| 118 | is used instead! | ||
| 119 | |||
| 120 | You may use all features of the CYGWIN=ntsec setting the same | ||
| 121 | way as they are used by the `login' port on sources.redhat.com: | ||
| 122 | |||
| 123 | The pw_gecos field may contain an additional field, that begins | ||
| 124 | with (upper case!) "U-", followed by the domain and the username | ||
| 125 | separated by a backslash. | ||
| 126 | CAUTION: The SID _must_ remain the _last_ field in pw_gecos! | ||
| 127 | BTW: The field separator in pw_gecos is the comma. | ||
| 128 | The username in pw_name itself may be any nice name: | ||
| 129 | |||
| 130 | domuser::1104:513:John Doe,U-domain\user,S-1-5-21-... | ||
| 131 | |||
| 132 | Now you may use `domuser' as your login name with telnet! | ||
| 133 | This is possible additionally for local users, if you don't like | ||
| 134 | your NT login name ;-) You only have to leave out the domain: | ||
| 135 | |||
| 136 | locuser::1104:513:John Doe,U-user,S-1-5-21-... | ||
| 137 | |||
| 138 | SSH2 server and user keys are generated by the `ssh-*-config' scripts | ||
| 139 | as well. | ||
| 140 | |||
| 141 | SSH2 authentication similar to SSH1: | ||
| 142 | Add keys to ~/.ssh/authorized_keys2 | ||
| 143 | Interop. w/ ssh.com dsa-keys: | ||
| 144 | ssh-keygen -f /key/from/ssh.com -X >> ~/.ssh/authorized_keys2 | ||
| 145 | and vice versa: | ||
| 146 | ssh-keygen -f /privatekey/from/openssh -x > ~/.ssh2/mykey.pub | ||
| 147 | echo Key mykey.pub >> ~/.ssh2/authorization | ||
| 148 | |||
| 149 | If you want to build from source, the following options to | ||
| 150 | configure are used for the Cygwin binary distribution: | ||
| 151 | |||
| 152 | --prefix=/usr --sysconfdir=/etc --libexecdir='${exec_prefix}/sbin | ||
| 153 | |||
| 154 | You must have installed the zlib, openssl and regex packages to | ||
| 155 | be able to build OpenSSH! | ||
| 156 | |||
| 157 | Please send requests, error reports etc. to cygwin@sources.redhat.com. | ||
| 158 | |||
| 159 | Have fun, | ||
| 160 | |||
| 161 | Corinna Vinschen <vinschen@cygnus.com> | ||
| 162 | Cygwin Developer | ||
| 163 | Red Hat Inc. | ||
diff --git a/other/ssharp/contrib/cygwin/ssh-host-config b/other/ssharp/contrib/cygwin/ssh-host-config new file mode 100644 index 0000000..70bbafd --- /dev/null +++ b/other/ssharp/contrib/cygwin/ssh-host-config | |||
| @@ -0,0 +1,449 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | # ssh-host-config, Copyright 2000, Red Hat Inc. | ||
| 4 | # | ||
| 5 | # This file is part of the Cygwin port of OpenSSH. | ||
| 6 | |||
| 7 | # Subdirectory where the new package is being installed | ||
| 8 | PREFIX=/usr | ||
| 9 | |||
| 10 | # Directory where the config files are stored | ||
| 11 | SYSCONFDIR=/etc | ||
| 12 | |||
| 13 | # Subdirectory where an old package might be installed | ||
| 14 | OLDPREFIX=/usr/local | ||
| 15 | OLDSYSCONFDIR=${OLDPREFIX}/etc | ||
| 16 | |||
| 17 | progname=$0 | ||
| 18 | auto_answer="" | ||
| 19 | port_number=22 | ||
| 20 | |||
| 21 | request() | ||
| 22 | { | ||
| 23 | if [ "${auto_answer}" = "yes" ] | ||
| 24 | then | ||
| 25 | return 0 | ||
| 26 | elif [ "${auto_answer}" = "no" ] | ||
| 27 | then | ||
| 28 | return 1 | ||
| 29 | fi | ||
| 30 | |||
| 31 | answer="" | ||
| 32 | while [ "X${answer}" != "Xyes" -a "X${answer}" != "Xno" ] | ||
| 33 | do | ||
| 34 | echo -n "$1 (yes/no) " | ||
| 35 | read answer | ||
| 36 | done | ||
| 37 | if [ "X${answer}" = "Xyes" ] | ||
| 38 | then | ||
| 39 | return 0 | ||
| 40 | else | ||
| 41 | return 1 | ||
| 42 | fi | ||
| 43 | } | ||
| 44 | |||
| 45 | # Check options | ||
| 46 | |||
| 47 | while : | ||
| 48 | do | ||
| 49 | case $# in | ||
| 50 | 0) | ||
| 51 | break | ||
| 52 | ;; | ||
| 53 | esac | ||
| 54 | |||
| 55 | option=$1 | ||
| 56 | shift | ||
| 57 | |||
| 58 | case "$option" in | ||
| 59 | -d | --debug ) | ||
| 60 | set -x | ||
| 61 | ;; | ||
| 62 | |||
| 63 | -y | --yes ) | ||
| 64 | auto_answer=yes | ||
| 65 | ;; | ||
| 66 | |||
| 67 | -n | --no ) | ||
| 68 | auto_answer=no | ||
| 69 | ;; | ||
| 70 | |||
| 71 | -p | --port ) | ||
| 72 | port_number=$1 | ||
| 73 | shift | ||
| 74 | ;; | ||
| 75 | |||
| 76 | *) | ||
| 77 | echo "usage: ${progname} [OPTION]..." | ||
| 78 | echo | ||
| 79 | echo "This script creates an OpenSSH host configuration." | ||
| 80 | echo | ||
| 81 | echo "Options:" | ||
| 82 | echo " --debug -d Enable shell's debug output." | ||
| 83 | echo " --yes -y Answer all questions with \"yes\" automatically." | ||
| 84 | echo " --no -n Answer all questions with \"no\" automatically." | ||
| 85 | echo " --port -p <n> sshd listens on port n." | ||
| 86 | echo | ||
| 87 | exit 1 | ||
| 88 | ;; | ||
| 89 | |||
| 90 | esac | ||
| 91 | done | ||
| 92 | |||
| 93 | # Check for running ssh/sshd processes first. Refuse to do anything while | ||
| 94 | # some ssh processes are still running | ||
| 95 | |||
| 96 | if ps -ef | grep -v grep | grep -q ssh | ||
| 97 | then | ||
| 98 | echo | ||
| 99 | echo "There are still ssh processes running. Please shut them down first." | ||
| 100 | echo | ||
| 101 | exit 1 | ||
| 102 | fi | ||
| 103 | |||
| 104 | # Check for ${SYSCONFDIR} directory | ||
| 105 | |||
| 106 | if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ] | ||
| 107 | then | ||
| 108 | echo | ||
| 109 | echo "${SYSCONFDIR} is existant but not a directory." | ||
| 110 | echo "Cannot create global configuration files." | ||
| 111 | echo | ||
| 112 | exit 1 | ||
| 113 | fi | ||
| 114 | |||
| 115 | # Create it if necessary | ||
| 116 | |||
| 117 | if [ ! -e "${SYSCONFDIR}" ] | ||
| 118 | then | ||
| 119 | mkdir "${SYSCONFDIR}" | ||
| 120 | if [ ! -e "${SYSCONFDIR}" ] | ||
| 121 | then | ||
| 122 | echo | ||
| 123 | echo "Creating ${SYSCONFDIR} directory failed" | ||
| 124 | echo | ||
| 125 | exit 1 | ||
| 126 | fi | ||
| 127 | fi | ||
| 128 | |||
| 129 | # Check for an old installation in ${OLDPREFIX} unless ${OLDPREFIX} isn't | ||
| 130 | # the same as ${PREFIX} | ||
| 131 | |||
| 132 | old_install=0 | ||
| 133 | if [ "${OLDPREFIX}" != "${PREFIX}" ] | ||
| 134 | then | ||
| 135 | if [ -f "${OLDPREFIX}/sbin/sshd" ] | ||
| 136 | then | ||
| 137 | echo | ||
| 138 | echo "You seem to have an older installation in ${OLDPREFIX}." | ||
| 139 | echo | ||
| 140 | # Check if old global configuration files exist | ||
| 141 | if [ -f "${OLDSYSCONFDIR}/ssh_host_key" ] | ||
| 142 | then | ||
| 143 | if request "Do you want to copy your config files to your new installation?" | ||
| 144 | then | ||
| 145 | cp -f ${OLDSYSCONFDIR}/ssh_host_key ${SYSCONFDIR} | ||
| 146 | cp -f ${OLDSYSCONFDIR}/ssh_host_key.pub ${SYSCONFDIR} | ||
| 147 | cp -f ${OLDSYSCONFDIR}/ssh_host_dsa_key ${SYSCONFDIR} | ||
| 148 | cp -f ${OLDSYSCONFDIR}/ssh_host_dsa_key.pub ${SYSCONFDIR} | ||
| 149 | cp -f ${OLDSYSCONFDIR}/ssh_config ${SYSCONFDIR} | ||
| 150 | cp -f ${OLDSYSCONFDIR}/sshd_config ${SYSCONFDIR} | ||
| 151 | fi | ||
| 152 | fi | ||
| 153 | if request "Do you want to erase your old installation?" | ||
| 154 | then | ||
| 155 | rm -f ${OLDPREFIX}/bin/ssh.exe | ||
| 156 | rm -f ${OLDPREFIX}/bin/ssh-config | ||
| 157 | rm -f ${OLDPREFIX}/bin/scp.exe | ||
| 158 | rm -f ${OLDPREFIX}/bin/ssh-add.exe | ||
| 159 | rm -f ${OLDPREFIX}/bin/ssh-agent.exe | ||
| 160 | rm -f ${OLDPREFIX}/bin/ssh-keygen.exe | ||
| 161 | rm -f ${OLDPREFIX}/bin/slogin | ||
| 162 | rm -f ${OLDSYSCONFDIR}/ssh_host_key | ||
| 163 | rm -f ${OLDSYSCONFDIR}/ssh_host_key.pub | ||
| 164 | rm -f ${OLDSYSCONFDIR}/ssh_host_dsa_key | ||
| 165 | rm -f ${OLDSYSCONFDIR}/ssh_host_dsa_key.pub | ||
| 166 | rm -f ${OLDSYSCONFDIR}/ssh_config | ||
| 167 | rm -f ${OLDSYSCONFDIR}/sshd_config | ||
| 168 | rm -f ${OLDPREFIX}/man/man1/ssh.1 | ||
| 169 | rm -f ${OLDPREFIX}/man/man1/scp.1 | ||
| 170 | rm -f ${OLDPREFIX}/man/man1/ssh-add.1 | ||
| 171 | rm -f ${OLDPREFIX}/man/man1/ssh-agent.1 | ||
| 172 | rm -f ${OLDPREFIX}/man/man1/ssh-keygen.1 | ||
| 173 | rm -f ${OLDPREFIX}/man/man1/slogin.1 | ||
| 174 | rm -f ${OLDPREFIX}/man/man8/sshd.8 | ||
| 175 | rm -f ${OLDPREFIX}/sbin/sshd.exe | ||
| 176 | rm -f ${OLDPREFIX}/sbin/sftp-server.exe | ||
| 177 | fi | ||
| 178 | old_install=1 | ||
| 179 | fi | ||
| 180 | fi | ||
| 181 | |||
| 182 | # First generate host keys if not already existing | ||
| 183 | |||
| 184 | if [ ! -f "${SYSCONFDIR}/ssh_host_key" ] | ||
| 185 | then | ||
| 186 | echo "Generating ${SYSCONFDIR}/ssh_host_key" | ||
| 187 | ssh-keygen -t rsa1 -f ${SYSCONFDIR}/ssh_host_key -N '' > /dev/null | ||
| 188 | fi | ||
| 189 | |||
| 190 | if [ ! -f "${SYSCONFDIR}/ssh_host_rsa_key" ] | ||
| 191 | then | ||
| 192 | echo "Generating ${SYSCONFDIR}/ssh_host_rsa_key" | ||
| 193 | ssh-keygen -t rsa -f ${SYSCONFDIR}/ssh_host_rsa_key -N '' > /dev/null | ||
| 194 | fi | ||
| 195 | |||
| 196 | if [ ! -f "${SYSCONFDIR}/ssh_host_dsa_key" ] | ||
| 197 | then | ||
| 198 | echo "Generating ${SYSCONFDIR}/ssh_host_dsa_key" | ||
| 199 | ssh-keygen -t dsa -f ${SYSCONFDIR}/ssh_host_dsa_key -N '' > /dev/null | ||
| 200 | fi | ||
| 201 | |||
| 202 | # Check if ssh_config exists. If yes, ask for overwriting | ||
| 203 | |||
| 204 | if [ -f "${SYSCONFDIR}/ssh_config" ] | ||
| 205 | then | ||
| 206 | if request "Overwrite existing ${SYSCONFDIR}/ssh_config file?" | ||
| 207 | then | ||
| 208 | rm -f "${SYSCONFDIR}/ssh_config" | ||
| 209 | if [ -f "${SYSCONFDIR}/ssh_config" ] | ||
| 210 | then | ||
| 211 | echo "Can't overwrite. ${SYSCONFDIR}/ssh_config is write protected." | ||
| 212 | fi | ||
| 213 | fi | ||
| 214 | fi | ||
| 215 | |||
| 216 | # Create default ssh_config from here script | ||
| 217 | |||
| 218 | if [ ! -f "${SYSCONFDIR}/ssh_config" ] | ||
| 219 | then | ||
| 220 | echo "Generating ${SYSCONFDIR}/ssh_config file" | ||
| 221 | cat > ${SYSCONFDIR}/ssh_config << EOF | ||
| 222 | # This is ssh client systemwide configuration file. This file provides | ||
| 223 | # defaults for users, and the values can be changed in per-user configuration | ||
| 224 | # files or on the command line. | ||
| 225 | |||
| 226 | # Configuration data is parsed as follows: | ||
| 227 | # 1. command line options | ||
| 228 | # 2. user-specific file | ||
| 229 | # 3. system-wide file | ||
| 230 | # Any configuration value is only changed the first time it is set. | ||
| 231 | # Thus, host-specific definitions should be at the beginning of the | ||
| 232 | # configuration file, and defaults at the end. | ||
| 233 | |||
| 234 | # Site-wide defaults for various options | ||
| 235 | |||
| 236 | # Host * | ||
| 237 | # ForwardAgent yes | ||
| 238 | # ForwardX11 yes | ||
| 239 | # RhostsAuthentication yes | ||
| 240 | # RhostsRSAAuthentication yes | ||
| 241 | # RSAAuthentication yes | ||
| 242 | # PasswordAuthentication yes | ||
| 243 | # FallBackToRsh no | ||
| 244 | # UseRsh no | ||
| 245 | # BatchMode no | ||
| 246 | # CheckHostIP yes | ||
| 247 | # StrictHostKeyChecking no | ||
| 248 | # Port 22 | ||
| 249 | # Protocol 2,1 | ||
| 250 | # Cipher 3des | ||
| 251 | # EscapeChar ~ | ||
| 252 | |||
| 253 | # Be paranoid by default | ||
| 254 | Host * | ||
| 255 | ForwardAgent no | ||
| 256 | ForwardX11 no | ||
| 257 | FallBackToRsh no | ||
| 258 | |||
| 259 | # Try authentification with the following identities | ||
| 260 | IdentityFile ~/.ssh/identity | ||
| 261 | IdentityFile ~/.ssh/id_rsa | ||
| 262 | IdentityFile ~/.ssh/id_dsa | ||
| 263 | EOF | ||
| 264 | if [ "$port_number" != "22" ] | ||
| 265 | then | ||
| 266 | echo "Host localhost" >> ${SYSCONFDIR}/ssh_config | ||
| 267 | echo " Port $port_number" >> ${SYSCONFDIR}/ssh_config | ||
| 268 | fi | ||
| 269 | fi | ||
| 270 | |||
| 271 | # Check if sshd_config exists. If yes, ask for overwriting | ||
| 272 | |||
| 273 | if [ -f "${SYSCONFDIR}/sshd_config" ] | ||
| 274 | then | ||
| 275 | if request "Overwrite existing ${SYSCONFDIR}/sshd_config file?" | ||
| 276 | then | ||
| 277 | rm -f "${SYSCONFDIR}/sshd_config" | ||
| 278 | if [ -f "${SYSCONFDIR}/sshd_config" ] | ||
| 279 | then | ||
| 280 | echo "Can't overwrite. ${SYSCONFDIR}/sshd_config is write protected." | ||
| 281 | fi | ||
| 282 | fi | ||
| 283 | fi | ||
| 284 | |||
| 285 | # Create default sshd_config from here script | ||
| 286 | |||
| 287 | if [ ! -f "${SYSCONFDIR}/sshd_config" ] | ||
| 288 | then | ||
| 289 | echo "Generating ${SYSCONFDIR}/sshd_config file" | ||
| 290 | cat > ${SYSCONFDIR}/sshd_config << EOF | ||
| 291 | # This is ssh server systemwide configuration file. | ||
| 292 | |||
| 293 | Port $port_number | ||
| 294 | # | ||
| 295 | Protocol 2,1 | ||
| 296 | ListenAddress 0.0.0.0 | ||
| 297 | #ListenAddress :: | ||
| 298 | # | ||
| 299 | # Uncomment the following lines according to the used authentication | ||
| 300 | HostKey /etc/ssh_host_key | ||
| 301 | HostKey /etc/ssh_host_rsa_key | ||
| 302 | HostKey /etc/ssh_host_dsa_key | ||
| 303 | ServerKeyBits 768 | ||
| 304 | LoginGraceTime 600 | ||
| 305 | KeyRegenerationInterval 3600 | ||
| 306 | PermitRootLogin yes | ||
| 307 | # | ||
| 308 | # Don't read ~/.rhosts and ~/.shosts files | ||
| 309 | IgnoreRhosts yes | ||
| 310 | # Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication | ||
| 311 | #IgnoreUserKnownHosts yes | ||
| 312 | StrictModes yes | ||
| 313 | X11Forwarding no | ||
| 314 | X11DisplayOffset 10 | ||
| 315 | PrintMotd yes | ||
| 316 | KeepAlive yes | ||
| 317 | |||
| 318 | # Logging | ||
| 319 | SyslogFacility AUTH | ||
| 320 | LogLevel INFO | ||
| 321 | #obsoletes QuietMode and FascistLogging | ||
| 322 | |||
| 323 | RhostsAuthentication no | ||
| 324 | # | ||
| 325 | # For this to work you will also need host keys in /etc/ssh_known_hosts | ||
| 326 | RhostsRSAAuthentication no | ||
| 327 | |||
| 328 | # To install for logon to different user accounts change to "no" here | ||
| 329 | RSAAuthentication yes | ||
| 330 | |||
| 331 | # To install for logon to different user accounts change to "yes" here | ||
| 332 | PasswordAuthentication no | ||
| 333 | |||
| 334 | PermitEmptyPasswords no | ||
| 335 | |||
| 336 | CheckMail no | ||
| 337 | UseLogin no | ||
| 338 | |||
| 339 | #Uncomment if you want to enable sftp | ||
| 340 | #Subsystem sftp /usr/sbin/sftp-server | ||
| 341 | #MaxStartups 10:30:60 | ||
| 342 | EOF | ||
| 343 | fi | ||
| 344 | |||
| 345 | # Care for services file | ||
| 346 | _sys="`uname -a`" | ||
| 347 | _nt=`expr "$_sys" : "CYGWIN_NT"` | ||
| 348 | if [ $_nt -gt 0 ] | ||
| 349 | then | ||
| 350 | _wservices="${SYSTEMROOT}\\system32\\drivers\\etc\\services" | ||
| 351 | _wserv_tmp="${SYSTEMROOT}\\system32\\drivers\\etc\\srv.out.$$" | ||
| 352 | else | ||
| 353 | _wservices="${WINDIR}\\SERVICES" | ||
| 354 | _wserv_tmp="${WINDIR}\\SERV.$$" | ||
| 355 | fi | ||
| 356 | _services=`cygpath -u "${_wservices}"` | ||
| 357 | _serv_tmp=`cygpath -u "${_wserv_tmp}"` | ||
| 358 | |||
| 359 | mount -t -f "${_wservices}" "${_services}" | ||
| 360 | mount -t -f "${_wserv_tmp}" "${_serv_tmp}" | ||
| 361 | |||
| 362 | # Remove sshd 22/port from services | ||
| 363 | if [ `grep -q 'sshd[ \t][ \t]*22' "${_services}"; echo $?` -eq 0 ] | ||
| 364 | then | ||
| 365 | grep -v 'sshd[ \t][ \t]*22' "${_services}" > "${_serv_tmp}" | ||
| 366 | if [ -f "${_serv_tmp}" ] | ||
| 367 | then | ||
| 368 | if mv "${_serv_tmp}" "${_services}" | ||
| 369 | then | ||
| 370 | echo "Removing sshd from ${_services}" | ||
| 371 | else | ||
| 372 | echo "Removing sshd from ${_services} failed\!" | ||
| 373 | fi | ||
| 374 | rm -f "${_serv_tmp}" | ||
| 375 | else | ||
| 376 | echo "Removing sshd from ${_services} failed\!" | ||
| 377 | fi | ||
| 378 | fi | ||
| 379 | |||
| 380 | # Add ssh 22/tcp and ssh 22/udp to services | ||
| 381 | if [ `grep -q 'ssh[ \t][ \t]*22' "${_services}"; echo $?` -ne 0 ] | ||
| 382 | then | ||
| 383 | awk '{ if ( $2 ~ /^23\/tcp/ ) print "ssh 22/tcp #SSH Remote Login Protocol\nssh 22/udp #SSH Remote Login Protocol"; print $0; }' < "${_services}" > "${_serv_tmp}" | ||
| 384 | if [ -f "${_serv_tmp}" ] | ||
| 385 | then | ||
| 386 | if mv "${_serv_tmp}" "${_services}" | ||
| 387 | then | ||
| 388 | echo "Added ssh to ${_services}" | ||
| 389 | else | ||
| 390 | echo "Adding ssh to ${_services} failed\!" | ||
| 391 | fi | ||
| 392 | rm -f "${_serv_tmp}" | ||
| 393 | else | ||
| 394 | echo "Adding ssh to ${_services} failed\!" | ||
| 395 | fi | ||
| 396 | fi | ||
| 397 | |||
| 398 | umount "${_services}" | ||
| 399 | umount "${_serv_tmp}" | ||
| 400 | |||
| 401 | # Care for inetd.conf file | ||
| 402 | _inetcnf="/etc/inetd.conf" | ||
| 403 | _inetcnf_tmp="/etc/inetd.conf.$$" | ||
| 404 | |||
| 405 | if [ -f "${_inetcnf}" ] | ||
| 406 | then | ||
| 407 | # Check if ssh service is already in use as sshd | ||
| 408 | with_comment=1 | ||
| 409 | grep -q '^[ \t]*sshd' "${_inetcnf}" && with_comment=0 | ||
| 410 | # Remove sshd line from inetd.conf | ||
| 411 | if [ `grep -q '^[# \t]*sshd' "${_inetcnf}"; echo $?` -eq 0 ] | ||
| 412 | then | ||
| 413 | grep -v '^[# \t]*sshd' "${_inetcnf}" >> "${_inetcnf_tmp}" | ||
| 414 | if [ -f "${_inetcnf_tmp}" ] | ||
| 415 | then | ||
| 416 | if mv "${_inetcnf_tmp}" "${_inetcnf}" | ||
| 417 | then | ||
| 418 | echo "Removed sshd from ${_inetcnf}" | ||
| 419 | else | ||
| 420 | echo "Removing sshd from ${_inetcnf} failed\!" | ||
| 421 | fi | ||
| 422 | rm -f "${_inetcnf_tmp}" | ||
| 423 | else | ||
| 424 | echo "Removing sshd from ${_inetcnf} failed\!" | ||
| 425 | fi | ||
| 426 | fi | ||
| 427 | |||
| 428 | # Add ssh line to inetd.conf | ||
| 429 | if [ `grep -q '^[# \t]*ssh' "${_inetcnf}"; echo $?` -ne 0 ] | ||
| 430 | then | ||
| 431 | if [ "${with_comment}" -eq 0 ] | ||
| 432 | then | ||
| 433 | echo 'ssh stream tcp nowait root /usr/sbin/sshd -i' >> "${_inetcnf}" | ||
| 434 | else | ||
| 435 | echo '# ssh stream tcp nowait root /usr/sbin/sshd -i' >> "${_inetcnf}" | ||
| 436 | fi | ||
| 437 | echo "Added ssh to ${_inetcnf}" | ||
| 438 | fi | ||
| 439 | fi | ||
| 440 | |||
| 441 | if [ "${old_install}" = "1" ] | ||
| 442 | then | ||
| 443 | echo | ||
| 444 | echo "Note: If you have used sshd as service or from inetd, don't forget to" | ||
| 445 | echo " change the path to sshd.exe in the service entry or in inetd.conf." | ||
| 446 | fi | ||
| 447 | |||
| 448 | echo | ||
| 449 | echo "Host configuration finished. Have fun!" | ||
diff --git a/other/ssharp/contrib/cygwin/ssh-user-config b/other/ssharp/contrib/cygwin/ssh-user-config new file mode 100644 index 0000000..5a76adb --- /dev/null +++ b/other/ssharp/contrib/cygwin/ssh-user-config | |||
| @@ -0,0 +1,200 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | # ssh-user-config, Copyright 2000, Red Hat Inc. | ||
| 4 | # | ||
| 5 | # This file is part of the Cygwin port of OpenSSH. | ||
| 6 | |||
| 7 | progname=$0 | ||
| 8 | auto_answer="" | ||
| 9 | auto_passphrase="no" | ||
| 10 | passphrase="" | ||
| 11 | |||
| 12 | request() | ||
| 13 | { | ||
| 14 | if [ "${auto_answer}" = "yes" ] | ||
| 15 | then | ||
| 16 | return 0 | ||
| 17 | elif [ "${auto_answer}" = "no" ] | ||
| 18 | then | ||
| 19 | return 1 | ||
| 20 | fi | ||
| 21 | |||
| 22 | answer="" | ||
| 23 | while [ "X${answer}" != "Xyes" -a "X${answer}" != "Xno" ] | ||
| 24 | do | ||
| 25 | echo -n "$1 (yes/no) " | ||
| 26 | read answer | ||
| 27 | done | ||
| 28 | if [ "X${answer}" = "Xyes" ] | ||
| 29 | then | ||
| 30 | return 0 | ||
| 31 | else | ||
| 32 | return 1 | ||
| 33 | fi | ||
| 34 | } | ||
| 35 | |||
| 36 | # Check options | ||
| 37 | |||
| 38 | while : | ||
| 39 | do | ||
| 40 | case $# in | ||
| 41 | 0) | ||
| 42 | break | ||
| 43 | ;; | ||
| 44 | esac | ||
| 45 | |||
| 46 | option=$1 | ||
| 47 | shift | ||
| 48 | |||
| 49 | case "$option" in | ||
| 50 | -d | --debug ) | ||
| 51 | set -x | ||
| 52 | ;; | ||
| 53 | |||
| 54 | -y | --yes ) | ||
| 55 | auto_answer=yes | ||
| 56 | ;; | ||
| 57 | |||
| 58 | -n | --no ) | ||
| 59 | auto_answer=no | ||
| 60 | ;; | ||
| 61 | |||
| 62 | -p | --passphrase ) | ||
| 63 | with_passphrase="yes" | ||
| 64 | passphrase=$1 | ||
| 65 | shift | ||
| 66 | ;; | ||
| 67 | |||
| 68 | *) | ||
| 69 | echo "usage: ${progname} [OPTION]..." | ||
| 70 | echo | ||
| 71 | echo "This script creates an OpenSSH user configuration." | ||
| 72 | echo | ||
| 73 | echo "Options:" | ||
| 74 | echo " --debug -d Enable shell's debug output." | ||
| 75 | echo " --yes -y Answer all questions with \"yes\" automatically." | ||
| 76 | echo " --no -n Answer all questions with \"no\" automatically." | ||
| 77 | echo " --passphrase -p word Use \"word\" as passphrase automatically." | ||
| 78 | echo | ||
| 79 | exit 1 | ||
| 80 | ;; | ||
| 81 | |||
| 82 | esac | ||
| 83 | done | ||
| 84 | |||
| 85 | # Ask user if user identity should be generated | ||
| 86 | |||
| 87 | if [ ! -f /etc/passwd ] | ||
| 88 | then | ||
| 89 | echo '/etc/passwd is nonexistant. Please generate an /etc/passwd file' | ||
| 90 | echo 'first using mkpasswd. Check if it contains an entry for you and' | ||
| 91 | echo 'please care for the home directory in your entry as well.' | ||
| 92 | exit 1 | ||
| 93 | fi | ||
| 94 | |||
| 95 | uid=`id -u` | ||
| 96 | pwdhome=`awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < /etc/passwd` | ||
| 97 | |||
| 98 | if [ "X${pwdhome}" = "X" ] | ||
| 99 | then | ||
| 100 | echo 'There is no home directory set for you in /etc/passwd.' | ||
| 101 | echo 'Setting $HOME is not sufficient!' | ||
| 102 | exit 1 | ||
| 103 | fi | ||
| 104 | |||
| 105 | if [ ! -d "${pwdhome}" ] | ||
| 106 | then | ||
| 107 | echo "${pwdhome} is set in /etc/passwd as your home directory" | ||
| 108 | echo 'but it is not a valid directory. Cannot create user identity files.' | ||
| 109 | exit 1 | ||
| 110 | fi | ||
| 111 | |||
| 112 | # If home is the root dir, set home to empty string to avoid error messages | ||
| 113 | # in subsequent parts of that script. | ||
| 114 | if [ "X${pwdhome}" = "X/" ] | ||
| 115 | then | ||
| 116 | # But first raise a warning! | ||
| 117 | echo 'Your home directory in /etc/passwd is set to root (/). This is not recommended!' | ||
| 118 | if request "Would you like to proceed anyway?" | ||
| 119 | then | ||
| 120 | pwdhome='' | ||
| 121 | else | ||
| 122 | exit 1 | ||
| 123 | fi | ||
| 124 | fi | ||
| 125 | |||
| 126 | if [ -e "${pwdhome}/.ssh" -a ! -d "${pwdhome}/.ssh" ] | ||
| 127 | then | ||
| 128 | echo "${pwdhome}/.ssh is existant but not a directory. Cannot create user identity files." | ||
| 129 | exit 1 | ||
| 130 | fi | ||
| 131 | |||
| 132 | if [ ! -e "${pwdhome}/.ssh" ] | ||
| 133 | then | ||
| 134 | mkdir "${pwdhome}/.ssh" | ||
| 135 | if [ ! -e "${pwdhome}/.ssh" ] | ||
| 136 | then | ||
| 137 | echo "Creating users ${pwdhome}/.ssh directory failed" | ||
| 138 | exit 1 | ||
| 139 | fi | ||
| 140 | fi | ||
| 141 | |||
| 142 | if [ ! -f "${pwdhome}/.ssh/identity" ] | ||
| 143 | then | ||
| 144 | if request "Shall I create an SSH1 RSA identity file for you?" | ||
| 145 | then | ||
| 146 | echo "Generating ${pwdhome}/.ssh/identity" | ||
| 147 | if [ "${with_passphrase}" = "yes" ] | ||
| 148 | then | ||
| 149 | ssh-keygen -t rsa1 -N "${passphrase}" -f "${pwdhome}/.ssh/identity" > /dev/null | ||
| 150 | else | ||
| 151 | ssh-keygen -t rsa1 -f "${pwdhome}/.ssh/identity" > /dev/null | ||
| 152 | fi | ||
| 153 | if request "Do you want to use this identity to login to this machine?" | ||
| 154 | then | ||
| 155 | echo "Adding to ${pwdhome}/.ssh/authorized_keys" | ||
| 156 | cat "${pwdhome}/.ssh/identity.pub" >> "${pwdhome}/.ssh/authorized_keys" | ||
| 157 | fi | ||
| 158 | fi | ||
| 159 | fi | ||
| 160 | |||
| 161 | if [ ! -f "${pwdhome}/.ssh/id_rsa" ] | ||
| 162 | then | ||
| 163 | if request "Shall I create an SSH2 RSA identity file for you? (yes/no) " | ||
| 164 | then | ||
| 165 | echo "Generating ${pwdhome}/.ssh/id_rsa" | ||
| 166 | if [ "${with_passphrase}" = "yes" ] | ||
| 167 | then | ||
| 168 | ssh-keygen -t rsa -N "${passphrase}" -f "${pwdhome}/.ssh/id_rsa" > /dev/null | ||
| 169 | else | ||
| 170 | ssh-keygen -t rsa -f "${pwdhome}/.ssh/id_rsa" > /dev/null | ||
| 171 | fi | ||
| 172 | if request "Do you want to use this identity to login to this machine?" | ||
| 173 | then | ||
| 174 | echo "Adding to ${pwdhome}/.ssh/authorized_keys2" | ||
| 175 | cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" | ||
| 176 | fi | ||
| 177 | fi | ||
| 178 | fi | ||
| 179 | |||
| 180 | if [ ! -f "${pwdhome}/.ssh/id_dsa" ] | ||
| 181 | then | ||
| 182 | if request "Shall I create an SSH2 DSA identity file for you? (yes/no) " | ||
| 183 | then | ||
| 184 | echo "Generating ${pwdhome}/.ssh/id_dsa" | ||
| 185 | if [ "${with_passphrase}" = "yes" ] | ||
| 186 | then | ||
| 187 | ssh-keygen -t dsa -N "${passphrase}" -f "${pwdhome}/.ssh/id_dsa" > /dev/null | ||
| 188 | else | ||
| 189 | ssh-keygen -t dsa -f "${pwdhome}/.ssh/id_dsa" > /dev/null | ||
| 190 | fi | ||
| 191 | if request "Do you want to use this identity to login to this machine?" | ||
| 192 | then | ||
| 193 | echo "Adding to ${pwdhome}/.ssh/authorized_keys2" | ||
| 194 | cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" | ||
| 195 | fi | ||
| 196 | fi | ||
| 197 | fi | ||
| 198 | |||
| 199 | echo | ||
| 200 | echo "Configuration finished. Have fun!" | ||
diff --git a/other/ssharp/contrib/gnome-ssh-askpass.c b/other/ssharp/contrib/gnome-ssh-askpass.c new file mode 100644 index 0000000..27e5cca --- /dev/null +++ b/other/ssharp/contrib/gnome-ssh-askpass.c | |||
| @@ -0,0 +1,150 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2000 Damien Miller. All rights reserved. | ||
| 3 | * | ||
| 4 | * Redistribution and use in source and binary forms, with or without | ||
| 5 | * modification, are permitted provided that the following conditions | ||
| 6 | * are met: | ||
| 7 | * 1. Redistributions of source code must retain the above copyright | ||
| 8 | * notice, this list of conditions and the following disclaimer. | ||
| 9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer in the | ||
| 11 | * documentation and/or other materials provided with the distribution. | ||
| 12 | * | ||
| 13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| 14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| 15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| 16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| 19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| 20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 23 | */ | ||
| 24 | |||
| 25 | /* | ||
| 26 | * Compile with: | ||
| 27 | * | ||
| 28 | * cc `gnome-config --cflags gnome gnomeui` \ | ||
| 29 | * gnome-ssh-askpass.c -o gnome-ssh-askpass \ | ||
| 30 | * `gnome-config --libs gnome gnomeui` | ||
| 31 | * | ||
| 32 | */ | ||
| 33 | |||
| 34 | #include <stdlib.h> | ||
| 35 | #include <stdio.h> | ||
| 36 | #include <string.h> | ||
| 37 | #include <gnome.h> | ||
| 38 | #include <X11/Xlib.h> | ||
| 39 | #include <gdk/gdkx.h> | ||
| 40 | |||
| 41 | void | ||
| 42 | report_failed_grab (void) | ||
| 43 | { | ||
| 44 | GtkWidget *err; | ||
| 45 | |||
| 46 | err = gnome_message_box_new("Could not grab keyboard or mouse.\n" | ||
| 47 | "A malicious client may be eavesdropping on your session.", | ||
| 48 | GNOME_MESSAGE_BOX_ERROR, "EXIT", NULL); | ||
| 49 | gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER); | ||
| 50 | gtk_object_set(GTK_OBJECT(err), "type", GTK_WINDOW_POPUP, NULL); | ||
| 51 | |||
| 52 | gnome_dialog_run_and_close(GNOME_DIALOG(err)); | ||
| 53 | } | ||
| 54 | |||
| 55 | void | ||
| 56 | passphrase_dialog(char *message) | ||
| 57 | { | ||
| 58 | char *passphrase; | ||
| 59 | char **messages; | ||
| 60 | int result, i; | ||
| 61 | |||
| 62 | GtkWidget *dialog, *entry, *label; | ||
| 63 | |||
| 64 | dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, | ||
| 65 | GNOME_STOCK_BUTTON_CANCEL, NULL); | ||
| 66 | |||
| 67 | messages = g_strsplit(message, "\\n", 0); | ||
| 68 | if (messages) | ||
| 69 | for(i = 0; messages[i]; i++) { | ||
| 70 | label = gtk_label_new(messages[i]); | ||
| 71 | gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), | ||
| 72 | label, FALSE, FALSE, 0); | ||
| 73 | } | ||
| 74 | |||
| 75 | entry = gtk_entry_new(); | ||
| 76 | gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), entry, FALSE, | ||
| 77 | FALSE, 0); | ||
| 78 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); | ||
| 79 | gtk_widget_grab_focus(entry); | ||
| 80 | |||
| 81 | /* Center window and prepare for grab */ | ||
| 82 | gtk_object_set(GTK_OBJECT(dialog), "type", GTK_WINDOW_POPUP, NULL); | ||
| 83 | gnome_dialog_set_default(GNOME_DIALOG(dialog), 0); | ||
| 84 | gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); | ||
| 85 | gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE); | ||
| 86 | gnome_dialog_close_hides(GNOME_DIALOG(dialog), TRUE); | ||
| 87 | gtk_container_set_border_width(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox), | ||
| 88 | GNOME_PAD); | ||
| 89 | gtk_widget_show_all(dialog); | ||
| 90 | |||
| 91 | /* Grab focus */ | ||
| 92 | XGrabServer(GDK_DISPLAY()); | ||
| 93 | if (gdk_pointer_grab(dialog->window, TRUE, 0, NULL, NULL, | ||
| 94 | GDK_CURRENT_TIME)) | ||
| 95 | goto nograb; | ||
| 96 | if (gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME)) | ||
| 97 | goto nograbkb; | ||
| 98 | |||
| 99 | /* Make <enter> close dialog */ | ||
| 100 | gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); | ||
| 101 | |||
| 102 | /* Run dialog */ | ||
| 103 | result = gnome_dialog_run(GNOME_DIALOG(dialog)); | ||
| 104 | |||
| 105 | /* Ungrab */ | ||
| 106 | XUngrabServer(GDK_DISPLAY()); | ||
| 107 | gdk_pointer_ungrab(GDK_CURRENT_TIME); | ||
| 108 | gdk_keyboard_ungrab(GDK_CURRENT_TIME); | ||
| 109 | gdk_flush(); | ||
| 110 | |||
| 111 | /* Report passphrase if user selected OK */ | ||
| 112 | passphrase = gtk_entry_get_text(GTK_ENTRY(entry)); | ||
| 113 | if (result == 0) | ||
| 114 | puts(passphrase); | ||
| 115 | |||
| 116 | /* Zero passphrase in memory */ | ||
| 117 | memset(passphrase, '\0', strlen(passphrase)); | ||
| 118 | gtk_entry_set_text(GTK_ENTRY(entry), passphrase); | ||
| 119 | |||
| 120 | gnome_dialog_close(GNOME_DIALOG(dialog)); | ||
| 121 | return; | ||
| 122 | |||
| 123 | /* At least one grab failed - ungrab what we got, and report | ||
| 124 | the failure to the user. Note that XGrabServer() cannot | ||
| 125 | fail. */ | ||
| 126 | nograbkb: | ||
| 127 | gdk_pointer_ungrab(GDK_CURRENT_TIME); | ||
| 128 | nograb: | ||
| 129 | XUngrabServer(GDK_DISPLAY()); | ||
| 130 | gnome_dialog_close(GNOME_DIALOG(dialog)); | ||
| 131 | |||
| 132 | report_failed_grab(); | ||
| 133 | } | ||
| 134 | |||
| 135 | int | ||
| 136 | main(int argc, char **argv) | ||
| 137 | { | ||
| 138 | char *message; | ||
| 139 | |||
| 140 | gnome_init("GNOME ssh-askpass", "0.1", argc, argv); | ||
| 141 | |||
| 142 | if (argc == 2) | ||
| 143 | message = argv[1]; | ||
| 144 | else | ||
| 145 | message = "Enter your OpenSSH passphrase:"; | ||
| 146 | |||
| 147 | setvbuf(stdout, 0, _IONBF, 0); | ||
| 148 | passphrase_dialog(message); | ||
| 149 | return 0; | ||
| 150 | } | ||
diff --git a/other/ssharp/contrib/hpux/CVS/Entries b/other/ssharp/contrib/hpux/CVS/Entries new file mode 100644 index 0000000..d769d33 --- /dev/null +++ b/other/ssharp/contrib/hpux/CVS/Entries | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | /README/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /egd/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /egd.rc/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | /sshd/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 5 | /sshd.rc/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 6 | D | ||
diff --git a/other/ssharp/contrib/hpux/CVS/Repository b/other/ssharp/contrib/hpux/CVS/Repository new file mode 100644 index 0000000..d3223e2 --- /dev/null +++ b/other/ssharp/contrib/hpux/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/hpux | |||
diff --git a/other/ssharp/contrib/hpux/CVS/Root b/other/ssharp/contrib/hpux/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/hpux/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/hpux/CVS/Tag b/other/ssharp/contrib/hpux/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/hpux/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/hpux/README b/other/ssharp/contrib/hpux/README new file mode 100644 index 0000000..f8bfa84 --- /dev/null +++ b/other/ssharp/contrib/hpux/README | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | README for OpenSSH HP-UX contrib files | ||
| 2 | Kevin Steves <stevesk@pobox.com> | ||
| 3 | |||
| 4 | sshd: configuration file for sshd.rc | ||
| 5 | sshd.rc: SSH startup script | ||
| 6 | egd: configuration file for egd.rc | ||
| 7 | egd.rc: EGD (entropy gathering daemon) startup script | ||
| 8 | |||
| 9 | To install: | ||
| 10 | |||
| 11 | sshd.rc: | ||
| 12 | |||
| 13 | o Verify paths in sshd.rc match your local installation | ||
| 14 | (WHAT_PATH and WHAT_PID) | ||
| 15 | o Customize sshd if needed (SSHD_ARGS) | ||
| 16 | o Install: | ||
| 17 | |||
| 18 | # cp sshd /etc/rc.config.d | ||
| 19 | # chmod 444 /etc/rc.config.d/sshd | ||
| 20 | # cp sshd.rc /sbin/init.d | ||
| 21 | # chmod 555 /sbin/init.d/sshd.rc | ||
| 22 | # ln -s /sbin/init.d/sshd.rc /sbin/rc1.d/K100sshd | ||
| 23 | # ln -s /sbin/init.d/sshd.rc /sbin/rc2.d/S900sshd | ||
| 24 | |||
| 25 | egd.rc: | ||
| 26 | |||
| 27 | o Verify egd.pl path in egd.rc matches your local installation | ||
| 28 | (WHAT_PATH) | ||
| 29 | o Customize egd if needed (EGD_ARGS and EGD_LOG) | ||
| 30 | o Add pseudo account: | ||
| 31 | |||
| 32 | # groupadd egd | ||
| 33 | # useradd -g egd egd | ||
| 34 | # mkdir -p /etc/opt/egd | ||
| 35 | # chown egd:egd /etc/opt/egd | ||
| 36 | # chmod 711 /etc/opt/egd | ||
| 37 | |||
| 38 | o Install: | ||
| 39 | |||
| 40 | # cp egd /etc/rc.config.d | ||
| 41 | # chmod 444 /etc/rc.config.d/egd | ||
| 42 | # cp egd.rc /sbin/init.d | ||
| 43 | # chmod 555 /sbin/init.d/egd.rc | ||
| 44 | # ln -s /sbin/init.d/egd.rc /sbin/rc1.d/K600egd | ||
| 45 | # ln -s /sbin/init.d/egd.rc /sbin/rc2.d/S400egd | ||
diff --git a/other/ssharp/contrib/hpux/egd b/other/ssharp/contrib/hpux/egd new file mode 100644 index 0000000..21af0bd --- /dev/null +++ b/other/ssharp/contrib/hpux/egd | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # EGD_START: Set to 1 to start entropy gathering daemon | ||
| 2 | # EGD_ARGS: Command line arguments to pass to egd | ||
| 3 | # EGD_LOG: EGD stdout and stderr log file (default /etc/opt/egd/egd.log) | ||
| 4 | # | ||
| 5 | # To configure the egd environment: | ||
| 6 | |||
| 7 | # groupadd egd | ||
| 8 | # useradd -g egd egd | ||
| 9 | # mkdir -p /etc/opt/egd | ||
| 10 | # chown egd:egd /etc/opt/egd | ||
| 11 | # chmod 711 /etc/opt/egd | ||
| 12 | |||
| 13 | EGD_START=1 | ||
| 14 | EGD_ARGS='/etc/opt/egd/entropy' | ||
| 15 | EGD_LOG= | ||
diff --git a/other/ssharp/contrib/hpux/egd.rc b/other/ssharp/contrib/hpux/egd.rc new file mode 100755 index 0000000..919dea7 --- /dev/null +++ b/other/ssharp/contrib/hpux/egd.rc | |||
| @@ -0,0 +1,98 @@ | |||
| 1 | #!/sbin/sh | ||
| 2 | |||
| 3 | # | ||
| 4 | # egd.rc: EGD start-up and shutdown script | ||
| 5 | # | ||
| 6 | |||
| 7 | # Allowed exit values: | ||
| 8 | # 0 = success; causes "OK" to show up in checklist. | ||
| 9 | # 1 = failure; causes "FAIL" to show up in checklist. | ||
| 10 | # 2 = skip; causes "N/A" to show up in the checklist. | ||
| 11 | # Use this value if execution of this script is overridden | ||
| 12 | # by the use of a control variable, or if this script is not | ||
| 13 | # appropriate to execute for some other reason. | ||
| 14 | # 3 = reboot; causes the system to be rebooted after execution. | ||
| 15 | |||
| 16 | # Input and output: | ||
| 17 | # stdin is redirected from /dev/null | ||
| 18 | # | ||
| 19 | # stdout and stderr are redirected to the /etc/rc.log file | ||
| 20 | # during checklist mode, or to the console in raw mode. | ||
| 21 | |||
| 22 | umask 022 | ||
| 23 | |||
| 24 | PATH=/usr/sbin:/usr/bin:/sbin | ||
| 25 | export PATH | ||
| 26 | |||
| 27 | WHAT='EGD (entropy gathering daemon)' | ||
| 28 | WHAT_PATH=/opt/perl/bin/egd.pl | ||
| 29 | WHAT_CONFIG=/etc/rc.config.d/egd | ||
| 30 | WHAT_LOG=/etc/opt/egd/egd.log | ||
| 31 | |||
| 32 | # NOTE: If your script executes in run state 0 or state 1, then /usr might | ||
| 33 | # not be available. Do not attempt to access commands or files in | ||
| 34 | # /usr unless your script executes in run state 2 or greater. Other | ||
| 35 | # file systems typically not mounted until run state 2 include /var | ||
| 36 | # and /opt. | ||
| 37 | |||
| 38 | rval=0 | ||
| 39 | |||
| 40 | # Check the exit value of a command run by this script. If non-zero, the | ||
| 41 | # exit code is echoed to the log file and the return value of this script | ||
| 42 | # is set to indicate failure. | ||
| 43 | |||
| 44 | set_return() { | ||
| 45 | x=$? | ||
| 46 | if [ $x -ne 0 ]; then | ||
| 47 | echo "EXIT CODE: $x" | ||
| 48 | rval=1 # script FAILed | ||
| 49 | fi | ||
| 50 | } | ||
| 51 | |||
| 52 | case $1 in | ||
| 53 | 'start_msg') | ||
| 54 | echo "Starting $WHAT" | ||
| 55 | ;; | ||
| 56 | |||
| 57 | 'stop_msg') | ||
| 58 | echo "Stopping $WHAT" | ||
| 59 | ;; | ||
| 60 | |||
| 61 | 'start') | ||
| 62 | if [ -f $WHAT_CONFIG ] ; then | ||
| 63 | . $WHAT_CONFIG | ||
| 64 | else | ||
| 65 | echo "ERROR: $WHAT_CONFIG defaults file MISSING" | ||
| 66 | fi | ||
| 67 | |||
| 68 | |||
| 69 | if [ "$EGD_START" -eq 1 -a -x $WHAT_PATH ]; then | ||
| 70 | EGD_LOG=${EGD_LOG:-$WHAT_LOG} | ||
| 71 | su egd -c "nohup $WHAT_PATH $EGD_ARGS >$EGD_LOG 2>&1" && | ||
| 72 | echo $WHAT started | ||
| 73 | set_return | ||
| 74 | else | ||
| 75 | rval=2 | ||
| 76 | fi | ||
| 77 | ;; | ||
| 78 | |||
| 79 | 'stop') | ||
| 80 | pid=`ps -fuegd | awk '$1 == "egd" { print $2 }'` | ||
| 81 | if [ "X$pid" != "X" ]; then | ||
| 82 | if kill "$pid"; then | ||
| 83 | echo "$WHAT stopped" | ||
| 84 | else | ||
| 85 | rval=1 | ||
| 86 | echo "Unable to stop $WHAT" | ||
| 87 | fi | ||
| 88 | fi | ||
| 89 | set_return | ||
| 90 | ;; | ||
| 91 | |||
| 92 | *) | ||
| 93 | echo "usage: $0 {start|stop|start_msg|stop_msg}" | ||
| 94 | rval=1 | ||
| 95 | ;; | ||
| 96 | esac | ||
| 97 | |||
| 98 | exit $rval | ||
diff --git a/other/ssharp/contrib/hpux/sshd b/other/ssharp/contrib/hpux/sshd new file mode 100644 index 0000000..8eb5e92 --- /dev/null +++ b/other/ssharp/contrib/hpux/sshd | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # SSHD_START: Set to 1 to start SSH daemon | ||
| 2 | # SSHD_ARGS: Command line arguments to pass to sshd | ||
| 3 | # | ||
| 4 | SSHD_START=1 | ||
| 5 | SSHD_ARGS= | ||
diff --git a/other/ssharp/contrib/hpux/sshd.rc b/other/ssharp/contrib/hpux/sshd.rc new file mode 100755 index 0000000..f9a1099 --- /dev/null +++ b/other/ssharp/contrib/hpux/sshd.rc | |||
| @@ -0,0 +1,90 @@ | |||
| 1 | #!/sbin/sh | ||
| 2 | |||
| 3 | # | ||
| 4 | # sshd.rc: SSH daemon start-up and shutdown script | ||
| 5 | # | ||
| 6 | |||
| 7 | # Allowed exit values: | ||
| 8 | # 0 = success; causes "OK" to show up in checklist. | ||
| 9 | # 1 = failure; causes "FAIL" to show up in checklist. | ||
| 10 | # 2 = skip; causes "N/A" to show up in the checklist. | ||
| 11 | # Use this value if execution of this script is overridden | ||
| 12 | # by the use of a control variable, or if this script is not | ||
| 13 | # appropriate to execute for some other reason. | ||
| 14 | # 3 = reboot; causes the system to be rebooted after execution. | ||
| 15 | |||
| 16 | # Input and output: | ||
| 17 | # stdin is redirected from /dev/null | ||
| 18 | # | ||
| 19 | # stdout and stderr are redirected to the /etc/rc.log file | ||
| 20 | # during checklist mode, or to the console in raw mode. | ||
| 21 | |||
| 22 | PATH=/usr/sbin:/usr/bin:/sbin | ||
| 23 | export PATH | ||
| 24 | |||
| 25 | WHAT='OpenSSH' | ||
| 26 | WHAT_PATH=/opt/openssh/sbin/sshd | ||
| 27 | WHAT_PID=/var/run/sshd.pid | ||
| 28 | WHAT_CONFIG=/etc/rc.config.d/sshd | ||
| 29 | |||
| 30 | # NOTE: If your script executes in run state 0 or state 1, then /usr might | ||
| 31 | # not be available. Do not attempt to access commands or files in | ||
| 32 | # /usr unless your script executes in run state 2 or greater. Other | ||
| 33 | # file systems typically not mounted until run state 2 include /var | ||
| 34 | # and /opt. | ||
| 35 | |||
| 36 | rval=0 | ||
| 37 | |||
| 38 | # Check the exit value of a command run by this script. If non-zero, the | ||
| 39 | # exit code is echoed to the log file and the return value of this script | ||
| 40 | # is set to indicate failure. | ||
| 41 | |||
| 42 | set_return() { | ||
| 43 | x=$? | ||
| 44 | if [ $x -ne 0 ]; then | ||
| 45 | echo "EXIT CODE: $x" | ||
| 46 | rval=1 # script FAILed | ||
| 47 | fi | ||
| 48 | } | ||
| 49 | |||
| 50 | case $1 in | ||
| 51 | 'start_msg') | ||
| 52 | echo "Starting $WHAT" | ||
| 53 | ;; | ||
| 54 | |||
| 55 | 'stop_msg') | ||
| 56 | echo "Stopping $WHAT" | ||
| 57 | ;; | ||
| 58 | |||
| 59 | 'start') | ||
| 60 | if [ -f $WHAT_CONFIG ] ; then | ||
| 61 | . $WHAT_CONFIG | ||
| 62 | else | ||
| 63 | echo "ERROR: $WHAT_CONFIG defaults file MISSING" | ||
| 64 | fi | ||
| 65 | |||
| 66 | if [ "$SSHD_START" -eq 1 -a -x "$WHAT_PATH" ]; then | ||
| 67 | $WHAT_PATH $SSHD_ARGS && echo "$WHAT started" | ||
| 68 | set_return | ||
| 69 | else | ||
| 70 | rval=2 | ||
| 71 | fi | ||
| 72 | ;; | ||
| 73 | |||
| 74 | 'stop') | ||
| 75 | if kill `cat $WHAT_PID`; then | ||
| 76 | echo "$WHAT stopped" | ||
| 77 | else | ||
| 78 | rval=1 | ||
| 79 | echo "Unable to stop $WHAT" | ||
| 80 | fi | ||
| 81 | set_return | ||
| 82 | ;; | ||
| 83 | |||
| 84 | *) | ||
| 85 | echo "usage: $0 {start|stop|start_msg|stop_msg}" | ||
| 86 | rval=1 | ||
| 87 | ;; | ||
| 88 | esac | ||
| 89 | |||
| 90 | exit $rval | ||
diff --git a/other/ssharp/contrib/redhat/CVS/Entries b/other/ssharp/contrib/redhat/CVS/Entries new file mode 100644 index 0000000..2dde2bc --- /dev/null +++ b/other/ssharp/contrib/redhat/CVS/Entries | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | /openssh.spec/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /sshd.init/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /sshd.pam/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | /sshd.pam-7.x/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 5 | D | ||
diff --git a/other/ssharp/contrib/redhat/CVS/Repository b/other/ssharp/contrib/redhat/CVS/Repository new file mode 100644 index 0000000..3e46aaf --- /dev/null +++ b/other/ssharp/contrib/redhat/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/redhat | |||
diff --git a/other/ssharp/contrib/redhat/CVS/Root b/other/ssharp/contrib/redhat/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/redhat/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/redhat/CVS/Tag b/other/ssharp/contrib/redhat/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/redhat/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/redhat/openssh.spec b/other/ssharp/contrib/redhat/openssh.spec new file mode 100644 index 0000000..09c42a0 --- /dev/null +++ b/other/ssharp/contrib/redhat/openssh.spec | |||
| @@ -0,0 +1,337 @@ | |||
| 1 | # Version of OpenSSH | ||
| 2 | %define oversion 2.9p1 | ||
| 3 | |||
| 4 | # Version of ssh-askpass | ||
| 5 | %define aversion 1.2.0 | ||
| 6 | |||
| 7 | # Do we want to disable building of x11-askpass? (1=yes 0=no) | ||
| 8 | %define no_x11_askpass 0 | ||
| 9 | |||
| 10 | # Do we want to disable building of gnome-askpass? (1=yes 0=no) | ||
| 11 | %define no_gnome_askpass 0 | ||
| 12 | |||
| 13 | # Do we want to link against a static libcrypto? (1=yes 0=no) | ||
| 14 | %define static_libcrypto 0 | ||
| 15 | |||
| 16 | # Use Redhat 7.0 pam control file | ||
| 17 | %define redhat7 0 | ||
| 18 | |||
| 19 | # Reserve options to override askpass settings with: | ||
| 20 | # rpm -ba|--rebuild --define 'skip_xxx 1' | ||
| 21 | %{?skip_x11_askpass:%define no_x11_askpass 1} | ||
| 22 | %{?skip_gnome_askpass:%define no_gnome_askpass 1} | ||
| 23 | |||
| 24 | # Options for Redhat version: | ||
| 25 | # rpm -ba|--rebuild --define "rh7 1" | ||
| 26 | %{?rh7:%define redhat7 1} | ||
| 27 | |||
| 28 | # Options for static OpenSSL link: | ||
| 29 | # rpm -ba|--rebuild --define "static_openssl 1" | ||
| 30 | %{?static_openssl:%define static_libcrypto 1} | ||
| 31 | |||
| 32 | %define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) | ||
| 33 | |||
| 34 | Summary: OpenSSH free Secure Shell (SSH) implementation | ||
| 35 | Name: openssh | ||
| 36 | Version: %{oversion} | ||
| 37 | Release: 1 | ||
| 38 | Packager: Damien Miller <djm@mindrot.org> | ||
| 39 | URL: http://www.openssh.com/ | ||
| 40 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz | ||
| 41 | %if ! %{no_x11_askpass} | ||
| 42 | Source1: http://www.jmknoble.cx/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz | ||
| 43 | %endif | ||
| 44 | Copyright: BSD | ||
| 45 | Group: Applications/Internet | ||
| 46 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot | ||
| 47 | Obsoletes: ssh | ||
| 48 | BuildPreReq: perl, openssl-devel, tcp_wrappers | ||
| 49 | BuildPreReq: /bin/login, /usr/include/security/pam_appl.h | ||
| 50 | BuildPreReq: rpm >= 3.0.5 | ||
| 51 | %if ! %{no_gnome_askpass} | ||
| 52 | BuildPreReq: gnome-libs-devel | ||
| 53 | %endif | ||
| 54 | %if ! %{static_libcrypto} | ||
| 55 | PreReq: openssl >= 0.9.5a | ||
| 56 | PreReq: openssl = %{exact_openssl_version} | ||
| 57 | Requires: openssl >= 0.9.5a | ||
| 58 | %endif | ||
| 59 | Requires: rpm >= 3.0.5 | ||
| 60 | |||
| 61 | %package clients | ||
| 62 | Summary: OpenSSH Secure Shell protocol clients | ||
| 63 | Requires: openssh = %{version}-%{release} | ||
| 64 | Group: Applications/Internet | ||
| 65 | Obsoletes: ssh-clients | ||
| 66 | |||
| 67 | %package server | ||
| 68 | Summary: OpenSSH Secure Shell protocol server (sshd) | ||
| 69 | Group: System Environment/Daemons | ||
| 70 | Obsoletes: ssh-server | ||
| 71 | PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 | ||
| 72 | %if %{redhat7} | ||
| 73 | Requires: /etc/pam.d/system-auth | ||
| 74 | %endif | ||
| 75 | |||
| 76 | %package askpass | ||
| 77 | Summary: OpenSSH X11 passphrase dialog | ||
| 78 | Group: Applications/Internet | ||
| 79 | Requires: openssh = %{version}-%{release} | ||
| 80 | Obsoletes: ssh-extras | ||
| 81 | |||
| 82 | %package askpass-gnome | ||
| 83 | Summary: OpenSSH GNOME passphrase dialog | ||
| 84 | Group: Applications/Internet | ||
| 85 | Requires: openssh = %{version}-%{release} | ||
| 86 | Obsoletes: ssh-extras | ||
| 87 | |||
| 88 | %description | ||
| 89 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 90 | executing commands in a remote machine. It is intended to replace | ||
| 91 | rlogin and rsh, and provide secure encrypted communications between | ||
| 92 | two untrusted hosts over an insecure network. X11 connections and | ||
| 93 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 94 | |||
| 95 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 96 | up to date in terms of security and features, as well as removing all | ||
| 97 | patented algorithms to separate libraries (OpenSSL). | ||
| 98 | |||
| 99 | This package includes the core files necessary for both the OpenSSH | ||
| 100 | client and server. To make this package useful, you should also | ||
| 101 | install openssh-clients, openssh-server, or both. | ||
| 102 | |||
| 103 | %description clients | ||
| 104 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 105 | executing commands in a remote machine. It is intended to replace | ||
| 106 | rlogin and rsh, and provide secure encrypted communications between | ||
| 107 | two untrusted hosts over an insecure network. X11 connections and | ||
| 108 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 109 | |||
| 110 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 111 | up to date in terms of security and features, as well as removing all | ||
| 112 | patented algorithms to separate libraries (OpenSSL). | ||
| 113 | |||
| 114 | This package includes the clients necessary to make encrypted connections | ||
| 115 | to SSH servers. | ||
| 116 | |||
| 117 | %description server | ||
| 118 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 119 | executing commands in a remote machine. It is intended to replace | ||
| 120 | rlogin and rsh, and provide secure encrypted communications between | ||
| 121 | two untrusted hosts over an insecure network. X11 connections and | ||
| 122 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 123 | |||
| 124 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 125 | up to date in terms of security and features, as well as removing all | ||
| 126 | patented algorithms to separate libraries (OpenSSL). | ||
| 127 | |||
| 128 | This package contains the secure shell daemon. The sshd is the server | ||
| 129 | part of the secure shell protocol and allows ssh clients to connect to | ||
| 130 | your host. | ||
| 131 | |||
| 132 | %description askpass | ||
| 133 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 134 | executing commands in a remote machine. It is intended to replace | ||
| 135 | rlogin and rsh, and provide secure encrypted communications between | ||
| 136 | two untrusted hosts over an insecure network. X11 connections and | ||
| 137 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 138 | |||
| 139 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 140 | up to date in terms of security and features, as well as removing all | ||
| 141 | patented algorithms to separate libraries (OpenSSL). | ||
| 142 | |||
| 143 | This package contains Jim Knoble's <jmknoble@jmknoble.cx> X11 passphrase | ||
| 144 | dialog. | ||
| 145 | |||
| 146 | %description askpass-gnome | ||
| 147 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 148 | executing commands in a remote machine. It is intended to replace | ||
| 149 | rlogin and rsh, and provide secure encrypted communications between | ||
| 150 | two untrusted hosts over an insecure network. X11 connections and | ||
| 151 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 152 | |||
| 153 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 154 | up to date in terms of security and features, as well as removing all | ||
| 155 | patented algorithms to separate libraries (OpenSSL). | ||
| 156 | |||
| 157 | This package contains the GNOME passphrase dialog. | ||
| 158 | |||
| 159 | %prep | ||
| 160 | |||
| 161 | %if ! %{no_x11_askpass} | ||
| 162 | %setup -q -a 1 | ||
| 163 | %else | ||
| 164 | %setup -q | ||
| 165 | %endif | ||
| 166 | |||
| 167 | %build | ||
| 168 | |||
| 169 | %define _sysconfdir /etc/ssh | ||
| 170 | |||
| 171 | %configure \ | ||
| 172 | --libexecdir=%{_libexecdir}/openssh \ | ||
| 173 | --with-pam \ | ||
| 174 | --with-tcp-wrappers \ | ||
| 175 | --with-ipv4-default \ | ||
| 176 | --with-rsh=/usr/bin/rsh \ | ||
| 177 | --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin | ||
| 178 | |||
| 179 | %if %{static_libcrypto} | ||
| 180 | perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile | ||
| 181 | %endif | ||
| 182 | |||
| 183 | make | ||
| 184 | |||
| 185 | %if ! %{no_x11_askpass} | ||
| 186 | pushd x11-ssh-askpass-%{aversion} | ||
| 187 | xmkmf -a | ||
| 188 | make | ||
| 189 | popd | ||
| 190 | %endif | ||
| 191 | |||
| 192 | %if ! %{no_gnome_askpass} | ||
| 193 | pushd contrib | ||
| 194 | gcc -O -g `gnome-config --cflags gnome gnomeui` \ | ||
| 195 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | ||
| 196 | `gnome-config --libs gnome gnomeui` | ||
| 197 | popd | ||
| 198 | %endif | ||
| 199 | |||
| 200 | %install | ||
| 201 | rm -rf $RPM_BUILD_ROOT | ||
| 202 | %{makeinstall} \ | ||
| 203 | libexecdir=$RPM_BUILD_ROOT%{_libexecdir}/openssh \ | ||
| 204 | DESTDIR=/ # Hack to disable key generation | ||
| 205 | |||
| 206 | |||
| 207 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | ||
| 208 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d | ||
| 209 | install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh | ||
| 210 | %if %{redhat7} | ||
| 211 | install -m644 contrib/redhat/sshd.pam-7.x $RPM_BUILD_ROOT/etc/pam.d/sshd | ||
| 212 | %else | ||
| 213 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd | ||
| 214 | %endif | ||
| 215 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd | ||
| 216 | |||
| 217 | %if ! %{no_x11_askpass} | ||
| 218 | install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass | ||
| 219 | ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass | ||
| 220 | %endif | ||
| 221 | |||
| 222 | %if ! %{no_gnome_askpass} | ||
| 223 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass | ||
| 224 | %endif | ||
| 225 | |||
| 226 | perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* | ||
| 227 | |||
| 228 | %clean | ||
| 229 | rm -rf $RPM_BUILD_ROOT | ||
| 230 | |||
| 231 | %post server | ||
| 232 | /sbin/chkconfig --add sshd | ||
| 233 | if test -r /var/run/sshd.pid ; then | ||
| 234 | /etc/rc.d/init.d/sshd restart >&2 | ||
| 235 | fi | ||
| 236 | |||
| 237 | %preun server | ||
| 238 | if [ "$1" = 0 ] ; then | ||
| 239 | /etc/rc.d/init.d/sshd stop >&2 | ||
| 240 | /sbin/chkconfig --del sshd | ||
| 241 | fi | ||
| 242 | |||
| 243 | %files | ||
| 244 | %defattr(-,root,root) | ||
| 245 | %doc ChangeLog OVERVIEW README* INSTALL | ||
| 246 | %doc CREDITS LICENCE | ||
| 247 | %attr(0755,root,root) %{_bindir}/ssh-keygen | ||
| 248 | %attr(0755,root,root) %{_bindir}/scp | ||
| 249 | %attr(0755,root,root) %{_bindir}/ssh-keyscan | ||
| 250 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* | ||
| 251 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* | ||
| 252 | %attr(0644,root,root) %{_mandir}/man1/scp.1* | ||
| 253 | %attr(0755,root,root) %dir %{_sysconfdir} | ||
| 254 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes | ||
| 255 | %attr(0755,root,root) %dir %{_libexecdir}/openssh | ||
| 256 | |||
| 257 | %files clients | ||
| 258 | %defattr(-,root,root) | ||
| 259 | %attr(4755,root,root) %{_bindir}/ssh | ||
| 260 | %attr(0755,root,root) %{_bindir}/ssh-agent | ||
| 261 | %attr(0755,root,root) %{_bindir}/ssh-add | ||
| 262 | %attr(0755,root,root) %{_bindir}/ssh-keyscan | ||
| 263 | %attr(0755,root,root) %{_bindir}/sftp | ||
| 264 | %attr(0644,root,root) %{_mandir}/man1/ssh.1* | ||
| 265 | %attr(0644,root,root) %{_mandir}/man1/ssh-agent.1* | ||
| 266 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* | ||
| 267 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* | ||
| 268 | %attr(0644,root,root) %{_mandir}/man1/sftp.1* | ||
| 269 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config | ||
| 270 | %attr(-,root,root) %{_bindir}/slogin | ||
| 271 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | ||
| 272 | |||
| 273 | %files server | ||
| 274 | %defattr(-,root,root) | ||
| 275 | %attr(0755,root,root) %{_sbindir}/sshd | ||
| 276 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | ||
| 277 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | ||
| 278 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | ||
| 279 | #%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config | ||
| 280 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config | ||
| 281 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | ||
| 282 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | ||
| 283 | |||
| 284 | %if ! %{no_x11_askpass} | ||
| 285 | %files askpass | ||
| 286 | %defattr(-,root,root) | ||
| 287 | %doc x11-ssh-askpass-%{aversion}/README | ||
| 288 | %doc x11-ssh-askpass-%{aversion}/ChangeLog | ||
| 289 | %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad | ||
| 290 | %attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass | ||
| 291 | %attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass | ||
| 292 | %endif | ||
| 293 | |||
| 294 | %if ! %{no_gnome_askpass} | ||
| 295 | %files askpass-gnome | ||
| 296 | %defattr(-,root,root) | ||
| 297 | %attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass | ||
| 298 | %endif | ||
| 299 | |||
| 300 | %changelog | ||
| 301 | * Mon Oct 18 2000 Damien Miller <djm@mindrot.org> | ||
| 302 | - Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the | ||
| 303 | Redhat 7.0 spec file | ||
| 304 | * Tue Sep 05 2000 Damien Miller <djm@mindrot.org> | ||
| 305 | - Use RPM configure macro | ||
| 306 | * Tue Aug 08 2000 Damien Miller <djm@mindrot.org> | ||
| 307 | - Some surgery to sshd.init (generate keys at runtime) | ||
| 308 | - Cleanup of groups and removal of keygen calls | ||
| 309 | * Wed Jul 12 2000 Damien Miller <djm@mindrot.org> | ||
| 310 | - Make building of X11-askpass and gnome-askpass optional | ||
| 311 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
| 312 | - Glob manpages to catch compressed files | ||
| 313 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | ||
| 314 | - Updated for new location | ||
| 315 | - Updated for new gnome-ssh-askpass build | ||
| 316 | * Sun Dec 26 1999 Damien Miller <djm@mindrot.org> | ||
| 317 | - Added Jim Knoble's <jmknoble@pobox.com> askpass | ||
| 318 | * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> | ||
| 319 | - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> | ||
| 320 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> | ||
| 321 | - Added 'Obsoletes' directives | ||
| 322 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> | ||
| 323 | - Use make install | ||
| 324 | - Subpackages | ||
| 325 | * Mon Nov 08 1999 Damien Miller <djm@ibs.com.au> | ||
| 326 | - Added links for slogin | ||
| 327 | - Fixed perms on manpages | ||
| 328 | * Sat Oct 30 1999 Damien Miller <djm@ibs.com.au> | ||
| 329 | - Renamed init script | ||
| 330 | * Fri Oct 29 1999 Damien Miller <djm@ibs.com.au> | ||
| 331 | - Back to old binary names | ||
| 332 | * Thu Oct 28 1999 Damien Miller <djm@ibs.com.au> | ||
| 333 | - Use autoconf | ||
| 334 | - New binary names | ||
| 335 | * Wed Oct 27 1999 Damien Miller <djm@ibs.com.au> | ||
| 336 | - Initial RPMification, based on Jan "Yenya" Kasprzak's <kas@fi.muni.cz> spec. | ||
| 337 | |||
diff --git a/other/ssharp/contrib/redhat/sshd.init b/other/ssharp/contrib/redhat/sshd.init new file mode 100755 index 0000000..efedbfb --- /dev/null +++ b/other/ssharp/contrib/redhat/sshd.init | |||
| @@ -0,0 +1,151 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | |||
| 3 | # Init file for OpenSSH server daemon | ||
| 4 | # | ||
| 5 | # chkconfig: 2345 55 25 | ||
| 6 | # description: OpenSSH server daemon | ||
| 7 | # | ||
| 8 | # processname: sshd | ||
| 9 | # config: /etc/ssh/ssh_host_key | ||
| 10 | # config: /etc/ssh/ssh_host_key.pub | ||
| 11 | # config: /etc/ssh/ssh_random_seed | ||
| 12 | # config: /etc/ssh/sshd_config | ||
| 13 | # pidfile: /var/run/sshd.pid | ||
| 14 | |||
| 15 | # source function library | ||
| 16 | . /etc/rc.d/init.d/functions | ||
| 17 | |||
| 18 | [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd | ||
| 19 | |||
| 20 | RETVAL=0 | ||
| 21 | |||
| 22 | # Some functions to make the below more readable | ||
| 23 | KEYGEN=/usr/bin/ssh-keygen | ||
| 24 | RSA1_KEY=/etc/ssh/ssh_host_key | ||
| 25 | RSA_KEY=/etc/ssh/ssh_host_rsa_key | ||
| 26 | DSA_KEY=/etc/ssh/ssh_host_dsa_key | ||
| 27 | PID_FILE=/var/run/sshd.pid | ||
| 28 | my_success() { | ||
| 29 | local msg | ||
| 30 | if [ $# -gt 1 ]; then | ||
| 31 | msg="$2" | ||
| 32 | else | ||
| 33 | msg="done" | ||
| 34 | fi | ||
| 35 | case "`type -type success`" in | ||
| 36 | function) | ||
| 37 | success "$1" | ||
| 38 | ;; | ||
| 39 | *) | ||
| 40 | echo -n "${msg}" | ||
| 41 | ;; | ||
| 42 | esac | ||
| 43 | } | ||
| 44 | my_failure() { | ||
| 45 | local msg | ||
| 46 | if [ $# -gt 1 ]; then | ||
| 47 | msg="$2" | ||
| 48 | else | ||
| 49 | msg="FAILED" | ||
| 50 | fi | ||
| 51 | case "`type -type failure`" in | ||
| 52 | function) | ||
| 53 | failure "$1" | ||
| 54 | ;; | ||
| 55 | *) | ||
| 56 | echo -n "${msg}" | ||
| 57 | ;; | ||
| 58 | esac | ||
| 59 | } | ||
| 60 | do_rsa1_keygen() { | ||
| 61 | if ! test -f $RSA1_KEY ; then | ||
| 62 | echo -n "Generating SSH1 RSA host key: " | ||
| 63 | if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then | ||
| 64 | my_success "RSA1 key generation" | ||
| 65 | echo | ||
| 66 | else | ||
| 67 | my_failure "RSA1 key generation" | ||
| 68 | echo | ||
| 69 | exit 1 | ||
| 70 | fi | ||
| 71 | fi | ||
| 72 | } | ||
| 73 | do_rsa_keygen() { | ||
| 74 | if ! test -f $RSA_KEY ; then | ||
| 75 | echo -n "Generating SSH2 RSA host key: " | ||
| 76 | if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then | ||
| 77 | my_success "RSA key generation" | ||
| 78 | echo | ||
| 79 | else | ||
| 80 | my_failure "RSA key generation" | ||
| 81 | echo | ||
| 82 | exit 1 | ||
| 83 | fi | ||
| 84 | fi | ||
| 85 | } | ||
| 86 | do_dsa_keygen() { | ||
| 87 | if ! test -f $DSA_KEY ; then | ||
| 88 | echo -n "Generating SSH2 DSA host key: " | ||
| 89 | if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then | ||
| 90 | my_success "DSA key generation" | ||
| 91 | echo | ||
| 92 | else | ||
| 93 | my_failure "DSA key generation" | ||
| 94 | echo | ||
| 95 | exit 1 | ||
| 96 | fi | ||
| 97 | fi | ||
| 98 | } | ||
| 99 | |||
| 100 | case "$1" in | ||
| 101 | start) | ||
| 102 | # Create keys if necessary | ||
| 103 | do_rsa1_keygen; | ||
| 104 | do_rsa_keygen; | ||
| 105 | do_dsa_keygen; | ||
| 106 | |||
| 107 | echo -n "Starting sshd: " | ||
| 108 | if [ ! -f $PID_FILE ] ; then | ||
| 109 | sshd $OPTIONS | ||
| 110 | RETVAL=$? | ||
| 111 | if [ "$RETVAL" = "0" ] ; then | ||
| 112 | my_success "sshd startup" "sshd" | ||
| 113 | touch /var/lock/subsys/sshd | ||
| 114 | else | ||
| 115 | my_failure "sshd startup" "" | ||
| 116 | fi | ||
| 117 | fi | ||
| 118 | echo | ||
| 119 | ;; | ||
| 120 | stop) | ||
| 121 | echo -n "Shutting down sshd: " | ||
| 122 | if [ -f $PID_FILE ] ; then | ||
| 123 | killproc sshd | ||
| 124 | RETVAL=$? | ||
| 125 | [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd | ||
| 126 | fi | ||
| 127 | echo | ||
| 128 | ;; | ||
| 129 | restart) | ||
| 130 | $0 stop | ||
| 131 | $0 start | ||
| 132 | RETVAL=$? | ||
| 133 | ;; | ||
| 134 | condrestart) | ||
| 135 | if [ -f /var/lock/subsys/sshd ] ; then | ||
| 136 | $0 stop | ||
| 137 | $0 start | ||
| 138 | RETVAL=$? | ||
| 139 | fi | ||
| 140 | ;; | ||
| 141 | status) | ||
| 142 | status sshd | ||
| 143 | RETVAL=$? | ||
| 144 | ;; | ||
| 145 | *) | ||
| 146 | echo "Usage: sshd {start|stop|restart|status|condrestart}" | ||
| 147 | exit 1 | ||
| 148 | ;; | ||
| 149 | esac | ||
| 150 | |||
| 151 | exit $RETVAL | ||
diff --git a/other/ssharp/contrib/redhat/sshd.pam b/other/ssharp/contrib/redhat/sshd.pam new file mode 100644 index 0000000..26dcb34 --- /dev/null +++ b/other/ssharp/contrib/redhat/sshd.pam | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #%PAM-1.0 | ||
| 2 | auth required /lib/security/pam_pwdb.so shadow nodelay | ||
| 3 | auth required /lib/security/pam_nologin.so | ||
| 4 | account required /lib/security/pam_pwdb.so | ||
| 5 | password required /lib/security/pam_cracklib.so | ||
| 6 | password required /lib/security/pam_pwdb.so shadow nullok use_authtok | ||
| 7 | session required /lib/security/pam_pwdb.so | ||
| 8 | session required /lib/security/pam_limits.so | ||
diff --git a/other/ssharp/contrib/redhat/sshd.pam-7.x b/other/ssharp/contrib/redhat/sshd.pam-7.x new file mode 100644 index 0000000..d2ab073 --- /dev/null +++ b/other/ssharp/contrib/redhat/sshd.pam-7.x | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #%PAM-1.0 | ||
| 2 | auth required /lib/security/pam_stack.so service=system-auth | ||
| 3 | auth required /lib/security/pam_nologin.so | ||
| 4 | account required /lib/security/pam_stack.so service=system-auth | ||
| 5 | password required /lib/security/pam_stack.so service=system-auth | ||
| 6 | session required /lib/security/pam_stack.so service=system-auth | ||
| 7 | session required /lib/security/pam_limits.so | ||
| 8 | session optional /lib/security/pam_console.so | ||
diff --git a/other/ssharp/contrib/solaris/CVS/Entries b/other/ssharp/contrib/solaris/CVS/Entries new file mode 100644 index 0000000..6b2465e --- /dev/null +++ b/other/ssharp/contrib/solaris/CVS/Entries | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | /README/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /build-pkg/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /checkinstall.in/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | /pkginfo.in/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 5 | /postinstall.in/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 6 | /preremove/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 7 | /prototype/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 8 | /sshd-initscript.in/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 9 | D | ||
diff --git a/other/ssharp/contrib/solaris/CVS/Repository b/other/ssharp/contrib/solaris/CVS/Repository new file mode 100644 index 0000000..23534f9 --- /dev/null +++ b/other/ssharp/contrib/solaris/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/solaris | |||
diff --git a/other/ssharp/contrib/solaris/CVS/Root b/other/ssharp/contrib/solaris/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/solaris/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/solaris/CVS/Tag b/other/ssharp/contrib/solaris/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/solaris/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/solaris/README b/other/ssharp/contrib/solaris/README new file mode 100755 index 0000000..e5445c3 --- /dev/null +++ b/other/ssharp/contrib/solaris/README | |||
| @@ -0,0 +1,82 @@ | |||
| 1 | README for OpenSSH Solaris packaging scripts | ||
| 2 | Rip Loomis <loomisg@saic.com> - 2000-08-02 | ||
| 3 | |||
| 4 | To use, simply expand this tarball under your main | ||
| 5 | OpenSSH source directory--it will create a | ||
| 6 | contrib/solaris subdirectory. Run configure and | ||
| 7 | make in OpenSSH as before. Then, from either | ||
| 8 | that directory or the main OpenSSH source directory, | ||
| 9 | run the command "build-pkg" (specifying the | ||
| 10 | appropriate path of course.) A subdirectory | ||
| 11 | will be created as contrib/solaris/build-SSH-package, | ||
| 12 | and after the build is done the package will be | ||
| 13 | present in that build-SSH-package directory | ||
| 14 | with a name of the form | ||
| 15 | OPENssh-$SSHversion-$arch-$OSversion[-$installLocation] | ||
| 16 | |||
| 17 | The build and install scripts should take into account | ||
| 18 | most possible situations (existing SSH installation, | ||
| 19 | differences in Solaris version between build and | ||
| 20 | target systems, changes you have made to the default | ||
| 21 | configuration, etc.) I would appreciate any feedback | ||
| 22 | or comments. | ||
| 23 | |||
| 24 | Copyright information is included below, followed by the known issue list. | ||
| 25 | Both are taken verbatim from the "build-pkg" script. | ||
| 26 | |||
| 27 | # OpenSSH solaris build script and supporting data files | ||
| 28 | # Copyright (c) 2000 Rip Loomis and | ||
| 29 | # Science Applications International Corporation (SAIC) | ||
| 30 | # (http://www.cist-east.saic.com). All rights reserved. | ||
| 31 | # | ||
| 32 | # Redistribution and use in source and binary forms, with or without | ||
| 33 | # modification, are permitted provided that the following conditions | ||
| 34 | # are met: | ||
| 35 | # 1. Redistributions of source code must retain the above copyright | ||
| 36 | # notice, this list of conditions and the following disclaimer. | ||
| 37 | # 2. Redistributions in binary form must reproduce the above copyright | ||
| 38 | # notice, this list of conditions and the following disclaimer in the | ||
| 39 | # documentation and/or other materials provided with the distribution. | ||
| 40 | # 3. The name of the author may not be used to endorse or promote products | ||
| 41 | # derived from this software without specific prior written permission. | ||
| 42 | # | ||
| 43 | # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| 44 | # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| 45 | # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| 46 | # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 47 | # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 48 | # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| 49 | # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| 50 | # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 51 | # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 52 | # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 53 | |||
| 54 | # Obviously, without all the hard work of the OpenBSD OpenSSH developers | ||
| 55 | # and the OpenSSH Portability Team, these scripts would be pointless... | ||
| 56 | # so thanks again folks! | ||
| 57 | #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ||
| 58 | |||
| 59 | #### Known issues | ||
| 60 | # These methods are generally based on a "default" compilation of | ||
| 61 | # OpenSSH on Solaris--so the more things that you change from the default, | ||
| 62 | # the greater the chance that something in the script won't be able to | ||
| 63 | # handle the changes. In general, though, most things should be determined | ||
| 64 | # from your compile environment--the architecture, SSH version, and | ||
| 65 | # other related data should all get picked up by this script. The script | ||
| 66 | # and data files were last updated to match OpenSSH 2.1.1p4. | ||
| 67 | # | ||
| 68 | # All building and packaging is done under a temporary directory that is | ||
| 69 | # itself created under the contrib/solaris directory--so there shouldn't | ||
| 70 | # be any special security issues (or need for root access during the | ||
| 71 | # packaging process). The temporary directory is defined below as | ||
| 72 | # ${BUILDDIR}. | ||
| 73 | # | ||
| 74 | # The permissions on the installed files are based on how we prefer to | ||
| 75 | # do things here--so nothing is installed SetUID to root. | ||
| 76 | # | ||
| 77 | # The post-install script makes a good-faith attempt to install a | ||
| 78 | # functional configuration on your system. I would be interested in hearing | ||
| 79 | # of any failure modes that are found, as I tried to compensate for all | ||
| 80 | # the ones that showed up here when we started replacing all the | ||
| 81 | # different installed versions of SSH. | ||
| 82 | |||
diff --git a/other/ssharp/contrib/solaris/build-pkg b/other/ssharp/contrib/solaris/build-pkg new file mode 100755 index 0000000..76529ed --- /dev/null +++ b/other/ssharp/contrib/solaris/build-pkg | |||
| @@ -0,0 +1,208 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | # OpenSSH solaris build script and supporting data files | ||
| 4 | # Copyright (c) 2000 Rip Loomis and | ||
| 5 | # Science Applications International Corporation (SAIC) | ||
| 6 | # (http://www.cist-east.saic.com). All rights reserved. | ||
| 7 | # | ||
| 8 | # Redistribution and use in source and binary forms, with or without | ||
| 9 | # modification, are permitted provided that the following conditions | ||
| 10 | # are met: | ||
| 11 | # 1. Redistributions of source code must retain the above copyright | ||
| 12 | # notice, this list of conditions and the following disclaimer. | ||
| 13 | # 2. Redistributions in binary form must reproduce the above copyright | ||
| 14 | # notice, this list of conditions and the following disclaimer in the | ||
| 15 | # documentation and/or other materials provided with the distribution. | ||
| 16 | # 3. The name of the author may not be used to endorse or promote products | ||
| 17 | # derived from this software without specific prior written permission. | ||
| 18 | # | ||
| 19 | # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| 20 | # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| 21 | # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| 22 | # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 23 | # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 24 | # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| 25 | # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| 26 | # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 27 | # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 28 | # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 29 | |||
| 30 | # Obviously, without all the hard work of the OpenBSD OpenSSH developers | ||
| 31 | # and the OpenSSH Portability Team, these scripts would be pointless... | ||
| 32 | # so thanks again folks! | ||
| 33 | #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ||
| 34 | |||
| 35 | #### Known issues | ||
| 36 | # These methods are generally based on a "default" compilation of | ||
| 37 | # OpenSSH on Solaris--so the more things that you change from the default, | ||
| 38 | # the greater the chance that something in the script won't be able to | ||
| 39 | # handle the changes. In general, though, most things should be determined | ||
| 40 | # from your compile environment--the architecture, SSH version, and | ||
| 41 | # other related data should all get picked up by this script. The script | ||
| 42 | # and data files were last updated to match OpenSSH 2.1.1p4. | ||
| 43 | # | ||
| 44 | # All building and packaging is done under a temporary directory that is | ||
| 45 | # itself created under the contrib/solaris directory--so there shouldn't | ||
| 46 | # be any special security issues (or need for root access during the | ||
| 47 | # packaging process). The temporary directory is defined below as | ||
| 48 | # ${BUILDDIR}. | ||
| 49 | # | ||
| 50 | # The permissions on the installed files are based on how we prefer to | ||
| 51 | # do things here--so nothing is installed SetUID to root. | ||
| 52 | # | ||
| 53 | # The post-install script makes a good-faith attempt to install a | ||
| 54 | # functional configuration on your system. I would be interested in hearing | ||
| 55 | # of any failure modes that are found, as I tried to compensate for all | ||
| 56 | # the ones that showed up here when we started replacing all the | ||
| 57 | # different installed versions of SSH. | ||
| 58 | |||
| 59 | #### Body of the script (finally!) | ||
| 60 | # We expect to be building the solaris package under the contrib/solaris | ||
| 61 | # directory--but the build-package script might be run with a relative | ||
| 62 | # path by a user in the main SSH directory...so we try to handle this | ||
| 63 | # case. Note that this is still a quick and dirty solution, not robust. | ||
| 64 | |||
| 65 | if [ -f sshd.c ]; then | ||
| 66 | cd contrib/solaris >/dev/null | ||
| 67 | fi | ||
| 68 | |||
| 69 | # Locations of standard binaries | ||
| 70 | UNAME=/usr/bin/uname | ||
| 71 | SED=/usr/bin/sed | ||
| 72 | PWD=/usr/bin/pwd | ||
| 73 | CUT=/usr/bin/cut | ||
| 74 | STRIP=/usr/ccs/bin/strip | ||
| 75 | PKGMK=/usr/bin/pkgmk | ||
| 76 | PKGTRANS=/usr/bin/pkgtrans | ||
| 77 | GREP=/usr/bin/grep | ||
| 78 | DATE=/usr/bin/date | ||
| 79 | |||
| 80 | CURRDIR=`${PWD}` | ||
| 81 | BUILDDIR=${CURRDIR}/build-SSH-package | ||
| 82 | # If you really want to name the package "ssh" then go ahead, but the | ||
| 83 | # Sun convention is that the first 2-4 characters are supposed to be | ||
| 84 | # uppercase representing the company or organization that produced the | ||
| 85 | # software, and the next 3-5 characters are supposed to be lowercase | ||
| 86 | # identifying the specific software. The best package names I could | ||
| 87 | # come up with were "OBSDssh" or "OPENssh", given those constraints. | ||
| 88 | PKGNAME="OPENssh" | ||
| 89 | # PSTAMP is a standard setting in the 'pkginfo' file that helps to identify | ||
| 90 | # the time and location that the packaging was done. | ||
| 91 | PSTAMP="`${UNAME} -n`-`${DATE} +%Y-%m-%d-%H%M`" | ||
| 92 | # The several lines below are designed to pull the relevant information | ||
| 93 | # out of the Makefile. It may be simpler to hard-code this if you have | ||
| 94 | # made changes and these lines don't find them. | ||
| 95 | prefix=`${GREP} "^prefix=" ../../Makefile | ${CUT} -d = -f 2` | ||
| 96 | execprefix=`${GREP} "^execprefix=" ../../Makefile | ${CUT} -d = -f 2` | ||
| 97 | INSTROOT=${prefix:=/usr/local} | ||
| 98 | ETCDIR=`${GREP} "^ETCDIR=" ../../Makefile | ${CUT} -d = -f 2` | ||
| 99 | PIDDIR=`${GREP} "^piddir=" ../../Makefile | ${CUT} -d = -f 2` | ||
| 100 | |||
| 101 | if [ ! -f ../../sshd ]; then | ||
| 102 | echo "Unable to locate sshd binary where I expected, and can't continue." | ||
| 103 | echo "Verify that the SSH configure/make has been completed, and that" | ||
| 104 | echo " this script is being run from within the SSH source tree." | ||
| 105 | exit 1 | ||
| 106 | fi | ||
| 107 | |||
| 108 | |||
| 109 | VERSION=`${GREP} "SSH_VERSION" ../../version.h | ${CUT} -f 2 | sed -e 's/"//g' -e 's/OpenSSH_//g'` | ||
| 110 | # Extra shenanigans to compensate for Sun marketeer tricks with Solaris | ||
| 111 | # version numbering... | ||
| 112 | OSMINOR=`${UNAME} -r | ${CUT} -f 2 -d .` | ||
| 113 | if [ $OSMINOR -gt 6 ]; then | ||
| 114 | OSVERSION=$OSMINOR | ||
| 115 | else | ||
| 116 | OSVERSION=`${UNAME} -r | ${SED} 's/5/2/'` | ||
| 117 | fi | ||
| 118 | ARCH=`$UNAME -p` | ||
| 119 | SHORTINSTROOT="" | ||
| 120 | if [ "$INSTROOT" = "/usr/local" ]; then | ||
| 121 | SHORTINSTROOT="-local" | ||
| 122 | else | ||
| 123 | if [ "$INSTROOT" = "/opt" ]; then | ||
| 124 | SHORTINSTROOT="-opt" | ||
| 125 | fi | ||
| 126 | fi | ||
| 127 | |||
| 128 | DESTFILE="${PKGNAME}-${VERSION}-sol${OSVERSION}-${ARCH}${SHORTINSTROOT}" | ||
| 129 | |||
| 130 | echo "Building Solaris package of OpenSSH ${VERSION} in\n\t${BUILDDIR}." | ||
| 131 | echo "Binaries were compiled for Solaris ${OSVERSION} (${ARCH})" | ||
| 132 | echo "The installable package will be named ${DESTFILE}." | ||
| 133 | echo "When installed, the package will be located under ${INSTROOT}." | ||
| 134 | echo "" | ||
| 135 | |||
| 136 | echo "Cleaning up old build files..." | ||
| 137 | rm -rf $BUILDDIR | ||
| 138 | mkdir $BUILDDIR | ||
| 139 | cd $BUILDDIR | ||
| 140 | |||
| 141 | echo "Setting up build directories..." | ||
| 142 | mkdir -p ${BUILDDIR}/man/man1 | ||
| 143 | # Need manpages for sshd_config(5) and ssh_config(5), but we don't yet have. | ||
| 144 | #mkdir -p ${BUILDDIR}/man/man5 | ||
| 145 | mkdir -p ${BUILDDIR}/man/man8 | ||
| 146 | mkdir -p ${BUILDDIR}/etc | ||
| 147 | mkdir -p ${BUILDDIR}/bin | ||
| 148 | mkdir -p ${BUILDDIR}/sbin | ||
| 149 | |||
| 150 | echo "Populating build directories..." | ||
| 151 | cp -p ../../../sshd sbin | ||
| 152 | cp -p ../../../ssh-keygen bin | ||
| 153 | cp -p ../../../ssh bin | ||
| 154 | cp -p ../../../ssh-add bin | ||
| 155 | cp -p ../../../ssh-agent bin | ||
| 156 | cp -p ../../../scp bin | ||
| 157 | cp -p ../../../scp.1 man/man1/scp.1 | ||
| 158 | cp -p ../../../ssh-add.1 man/man1/ssh-add.1 | ||
| 159 | cp -p ../../../ssh-agent.1 man/man1/ssh-agent.1 | ||
| 160 | cp -p ../../../ssh-keygen.1 man/man1/ssh-keygen.1 | ||
| 161 | cp -p ../../../ssh.1 man/man1/ssh.1 | ||
| 162 | cp -p ../../../sshd.8 man/man8/sshd.8 | ||
| 163 | cp -p ../../../sshd_config.out etc/sshd_config.default | ||
| 164 | cp -p ../../../ssh_config.out etc/ssh_config.default | ||
| 165 | cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default | ||
| 166 | cp -p ../../../primes etc/primes.default | ||
| 167 | |||
| 168 | # One of the annoying things about the Solaris packaging process is that | ||
| 169 | # there's no simple way to prototype on the fly--so make sure you edit | ||
| 170 | # the prototype file if you add/subtract files from the mix. | ||
| 171 | cp -p ../prototype . | ||
| 172 | cp -p ../preremove . | ||
| 173 | |||
| 174 | echo "Creating compile-dependent files from their prototypes" | ||
| 175 | $SED -e "s/%%PKGNAME%%/${PKGNAME}/g" -e "s|%%BASEDIR%%|${INSTROOT}|g" -e "s/%%VERSION%%/${VERSION}/g" -e "s/%%ARCH%%/${ARCH}/g" -e "s/%%OSVERSION%%/${OSVERSION}/g" <../pkginfo.in >./pkginfo | ||
| 176 | $SED -e "s/%%PKGNAME%%/${PKGNAME}/g" -e "s/%%OSMINOR%%/${OSMINOR}/g" -e "s/%%OSVERSION%%/${OSVERSION}/g" <../checkinstall.in >./checkinstall | ||
| 177 | $SED -e "s|%%PIDDIR%%|${PIDDIR}|g" <../postinstall.in >./postinstall | ||
| 178 | $SED -e "s|%%PIDDIR%%|${PIDDIR}|g" <../sshd-initscript.in > etc/sshd-initscript | ||
| 179 | |||
| 180 | echo "Stripping binaries" | ||
| 181 | ${STRIP} bin/ssh | ||
| 182 | ${STRIP} bin/ssh-add | ||
| 183 | ${STRIP} bin/ssh-agent | ||
| 184 | ${STRIP} bin/ssh-keygen | ||
| 185 | ${STRIP} sbin/sshd | ||
| 186 | ${STRIP} bin/scp | ||
| 187 | |||
| 188 | echo "" | ||
| 189 | echo "Building Package" | ||
| 190 | |||
| 191 | cd ${BUILDDIR} | ||
| 192 | $PKGMK -o -r . -p ${PSTAMP} -d ${BUILDDIR} | ||
| 193 | |||
| 194 | if [ $? -gt 0 ]; then | ||
| 195 | echo "Error performing pkgmk--cannot continue." | ||
| 196 | exit 1 | ||
| 197 | fi | ||
| 198 | |||
| 199 | echo "" | ||
| 200 | echo "Translating Package Tree into Installable Image" | ||
| 201 | $PKGTRANS -s ${BUILDDIR} ${BUILDDIR}/${DESTFILE} OPENssh | ||
| 202 | |||
| 203 | if [ $? -gt 0 ]; then | ||
| 204 | echo "Error performing pkgtrans--cannot continue." | ||
| 205 | exit 1 | ||
| 206 | fi | ||
| 207 | |||
| 208 | echo "Done. Package is in ${BUILDDIR}/${DESTFILE} !" | ||
diff --git a/other/ssharp/contrib/solaris/checkinstall.in b/other/ssharp/contrib/solaris/checkinstall.in new file mode 100644 index 0000000..3757193 --- /dev/null +++ b/other/ssharp/contrib/solaris/checkinstall.in | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | echo "Checking SunOS revision..." | ||
| 3 | MINOR=`/bin/uname -r | /bin/cut -d "." -f 2` | ||
| 4 | if [ ${MINOR} -lt %%OSMINOR%% ]; then | ||
| 5 | echo "This package was created on Solaris %%OSVERSION%%, and will probably" | ||
| 6 | echo " not function correctly on older versions of Solaris." | ||
| 7 | echo "** Unable to continue. **" | ||
| 8 | exit 3 | ||
| 9 | fi | ||
| 10 | echo "\t...revision okay." | ||
| 11 | |||
| 12 | echo "Checking for existing SSH installation..." | ||
| 13 | if [ -f /etc/sshd_config -o -f /usr/local/etc/sshd_config ]; then | ||
| 14 | UPDATE=1 | ||
| 15 | fi | ||
| 16 | if [ -f /etc/ssh_host_key -o -f /usr/local/etc/ssh_host_key ]; then | ||
| 17 | UPDATE=1 | ||
| 18 | fi | ||
| 19 | |||
| 20 | if [ ${UPDATE} -eq 1 ]; then | ||
| 21 | echo "Performing an \"update\" installation of %%PKGNAME%%" | ||
| 22 | else | ||
| 23 | echo "Performing a \"fresh\" installation of %%PKGNAME%%" | ||
| 24 | fi | ||
| 25 | echo "" | ||
| 26 | |||
| 27 | # We derive these at install time in case the package is relocated. | ||
| 28 | CONFDIR="${BASEDIR}/etc" | ||
| 29 | DESTBIN="${BASEDIR}/bin" | ||
| 30 | |||
| 31 | # make parameters available to installation service, and | ||
| 32 | # so to any other packaging scripts | ||
| 33 | cat >$1 <<! | ||
| 34 | CONFDIR='$CONFDIR' | ||
| 35 | DESTBIN='$DESTBIN' | ||
| 36 | UPDATE='$UPDATE' | ||
| 37 | ! | ||
diff --git a/other/ssharp/contrib/solaris/pkginfo.in b/other/ssharp/contrib/solaris/pkginfo.in new file mode 100644 index 0000000..4953d7d --- /dev/null +++ b/other/ssharp/contrib/solaris/pkginfo.in | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | CLASSES=none | ||
| 2 | BASEDIR="%%BASEDIR%%" | ||
| 3 | PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin | ||
| 4 | OAMBASE=/usr/sadm/sysadm | ||
| 5 | PKG=%%PKGNAME%% | ||
| 6 | NAME="OpenSSH %%VERSION%% %%ARCH%%" | ||
| 7 | DESC="Secure Shell remote access utility; replaces telnet and rlogin/rsh. OpenBSD version ported to Solaris. Compiled on Solaris %%OSVERSION%%" | ||
| 8 | ARCH="%%ARCH%%" | ||
| 9 | VERSION="%%VERSION%%" | ||
| 10 | CATEGORY=utility,application | ||
| 11 | VENDOR="Software produced by OpenSSH Portability Team, http://www.openssh.com/portable.html" | ||
| 12 | EMAIL="OpenSSH Development List <openssh-unix-dev@mindrot.org>" | ||
| 13 | PKGINST=%%PKGNAME%% | ||
| 14 | PKGSAV=/var/sadm/pkg/%%PKGNAME%%/save | ||
| 15 | ISTATES="S s 1 2 3" | ||
| 16 | RSTATES="S s 1 2 3" | ||
| 17 | UPDATE=0 | ||
diff --git a/other/ssharp/contrib/solaris/postinstall.in b/other/ssharp/contrib/solaris/postinstall.in new file mode 100644 index 0000000..6f2c9b3 --- /dev/null +++ b/other/ssharp/contrib/solaris/postinstall.in | |||
| @@ -0,0 +1,203 @@ | |||
| 1 | # PostInstall script for OPENssh | ||
| 2 | INSTALLF="/usr/sbin/installf" | ||
| 3 | |||
| 4 | instbackup() { | ||
| 5 | _DIRECTORY=$1 | ||
| 6 | _FILEBASE=$2 | ||
| 7 | $INSTALLF $PKGINST ${_DIRECTORY}/${_FILEBASE} | ||
| 8 | _SUFFIX=`/usr/bin/date +%Y-%m-%d-%H%M` | ||
| 9 | if [ -f ${_DIRECTORY}/${_FILEBASE} ]; then | ||
| 10 | echo " Backing up file ${_FILEBASE}..." | ||
| 11 | if [ -f ${_DIRECTORY}/${_FILEBASE}.orig ]; then | ||
| 12 | $INSTALLF $PKGINST ${_DIRECTORY}/${_FILEBASE}.orig.${_SUFFIX} | ||
| 13 | cp -p ${_DIRECTORY}/${_FILEBASE} ${_DIRECTORY}/${_FILEBASE}.orig.${_SUFFIX} | ||
| 14 | echo " Saved as ${_DIRECTORY}/${_FILEBASE}.orig.${_SUFFIX}." | ||
| 15 | else | ||
| 16 | $INSTALLF $PKGINST ${_DIRECTORY}/${_FILEBASE}.orig | ||
| 17 | cp -p ${_DIRECTORY}/${_FILEBASE} ${_DIRECTORY}/${_FILEBASE}.orig | ||
| 18 | echo " Saved as ${_DIRECTORY}/${_FILEBASE}.orig." | ||
| 19 | fi | ||
| 20 | fi | ||
| 21 | cp -p ${_DIRECTORY}/${_FILEBASE}.default ${_DIRECTORY}/${_FILEBASE} | ||
| 22 | echo "Installed new ${_DIRECTORY}/${_FILEBASE} configuration file." | ||
| 23 | } | ||
| 24 | |||
| 25 | ### Main body of script | ||
| 26 | |||
| 27 | echo "" | ||
| 28 | echo "Beginning postinstall script--this script should leave you with a" | ||
| 29 | echo "functional and operational configuration of OpenSSH." | ||
| 30 | echo "" | ||
| 31 | |||
| 32 | if [ ! "${UPDATE}" = "1" ]; then | ||
| 33 | echo "Performing a \"fresh\" installation of OpenSSH." | ||
| 34 | ### Install init script and create symlinks | ||
| 35 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/init.d/sshd f 0500 root sys || exit 2 | ||
| 36 | cp -p ${CONFDIR}/sshd-initscript ${PKG_INSTALL_ROOT}/etc/init.d/sshd | ||
| 37 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/rc2.d/S72local_sshd=/etc/init.d/sshd s || exit 2 | ||
| 38 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/rc1.d/K30local_sshd=/etc/init.d/sshd s || exit 2 | ||
| 39 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/rc0.d/K30local_sshd=/etc/init.d/sshd s || exit 2 | ||
| 40 | |||
| 41 | ### The initial package installation leaves default versions of | ||
| 42 | ### ssh_prng_cmds, ssh_config, and sshd_config in ${CONFDIR}. Now | ||
| 43 | ### we need to decide whether to install them. Since this is *not* | ||
| 44 | ### an update install, we don't ask, but simply back up the old ones | ||
| 45 | ### and put the new ones in their place. | ||
| 46 | instbackup ${CONFDIR} ssh_prng_cmds | ||
| 47 | instbackup ${CONFDIR} ssh_config | ||
| 48 | instbackup ${CONFDIR} sshd_config | ||
| 49 | instbackup ${CONFDIR} primes | ||
| 50 | |||
| 51 | ### If no existing sshd_config and host key, then create | ||
| 52 | if [ ! -f "${CONFDIR}/ssh_host_key" ]; then | ||
| 53 | echo "Creating new RSA public/private host key pair for SSH-1." | ||
| 54 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_key | ||
| 55 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_key.pub | ||
| 56 | ### If there is *anything* there then leave it, otherwise look | ||
| 57 | ### in some reasonable alternate locations before giving up. | ||
| 58 | ### It's worth spending some extra time looking for the old one | ||
| 59 | ### to avoid a bunch of "host identification has changed" warnings. | ||
| 60 | ### Note that some old keys from the commercial SSH might not | ||
| 61 | ### be compatible, but we don't test for that. | ||
| 62 | if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_key" ]; then | ||
| 63 | mv ${PKG_INSTALL_ROOT}/etc/ssh_host_key ${CONFDIR} | ||
| 64 | elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_key" ]; then | ||
| 65 | mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_key ${CONFDIR} | ||
| 66 | else | ||
| 67 | ${DESTBIN}/ssh-keygen -b 1024 -f ${CONFDIR}/ssh_host_key -N '' | ||
| 68 | fi | ||
| 69 | else | ||
| 70 | echo "Using existing RSA public/private host key pair for SSH-1." | ||
| 71 | fi | ||
| 72 | if [ ! -f "${CONFDIR}/ssh_host_dsa_key" ]; then | ||
| 73 | echo "Creating new DSA public/private host key pair for SSH-2." | ||
| 74 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_dsa_key | ||
| 75 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_dsa_key.pub | ||
| 76 | ### If there is *anything* there then leave it, otherwise look | ||
| 77 | ### in some reasonable alternate locations before giving up. | ||
| 78 | ### It's worth spending some extra time looking for the old one | ||
| 79 | ### to avoid a bunch of "host identification has changed" warnings. | ||
| 80 | ### Note that some old keys from the commercial SSH2 might not | ||
| 81 | ### be compatible, but we don't test for that. | ||
| 82 | if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_dsa_key" ]; then | ||
| 83 | mv ${PKG_INSTALL_ROOT}/etc/ssh_host_dsa_key ${CONFDIR} | ||
| 84 | elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_dsa_key" ]; then | ||
| 85 | mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_dsa_key ${CONFDIR} | ||
| 86 | else | ||
| 87 | ${DESTBIN}/ssh-keygen -d -f ${CONFDIR}/ssh_host_dsa_key -N '' | ||
| 88 | fi | ||
| 89 | else | ||
| 90 | echo "Using existing DSA public/private host key pair for SSH-2." | ||
| 91 | fi | ||
| 92 | else | ||
| 93 | echo "Performing an \"update\" installation of OpenSSH." | ||
| 94 | ### Okay, this part *is* an update install...so we need to ensure | ||
| 95 | ### we don't overwrite any of the existing files. | ||
| 96 | |||
| 97 | ### Install init script and create symlinks | ||
| 98 | if [ ! -f ${PKG_INSTALL_ROOT}/etc/init.d/sshd ]; then | ||
| 99 | echo "Installing init script in ${PKG_INSTALL_ROOT}/etc/init.d/sshd" | ||
| 100 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/init.d/sshd || exit 2 | ||
| 101 | cp -p ${CONFDIR}/sshd-initscript ${PKG_INSTALL_ROOT}/etc/init.d/sshd | ||
| 102 | chown root:root ${PKG_INSTALL_ROOT}/etc/init.d/sshd | ||
| 103 | chmod 500 ${PKG_INSTALL_ROOT}/etc/init.d/sshd | ||
| 104 | fi | ||
| 105 | if [ ! -r ${PKG_INSTALL_ROOT}/etc/rc2.d/S72local_sshd ]; then | ||
| 106 | $INSTALLF $PKGINST ${PKG_INSTALL_ROOT}/etc/rc2.d/S72local_sshd=/etc/init.d/sshd s || exit 2 | ||
| 107 | fi | ||
| 108 | if [ ! -r ${PKG_INSTALL_ROOT}/etc/rc2.d/K30local_sshd ]; then | ||
| 109 | $INSTALLF $PKGINST /etc/rc0.d/K30local_sshd=/etc/init.d/sshd s || exit 2 | ||
| 110 | fi | ||
| 111 | |||
| 112 | ### The initial package installation leaves default versions of | ||
| 113 | ### ssh_prng_cmds, ssh_config, and sshd_config in ${CONFDIR}. Now | ||
| 114 | ### we need to decide whether to install them. Since this is | ||
| 115 | ### an update install, we only install the new files if the old | ||
| 116 | ### files somehow don't exist. | ||
| 117 | NEWCONF=0 | ||
| 118 | if [ ! -r "${CONFDIR}/ssh_prng_cmds" ]; then | ||
| 119 | instbackup ${CONFDIR} ssh_prng_cmds | ||
| 120 | NEWCONF=1 | ||
| 121 | fi | ||
| 122 | if [ ! -r "${CONFDIR}/ssh_config" ]; then | ||
| 123 | instbackup ${CONFDIR} ssh_config | ||
| 124 | NEWCONF=1 | ||
| 125 | fi | ||
| 126 | if [ ! -r "${CONFDIR}/sshd_config" ]; then | ||
| 127 | instbackup ${CONFDIR} sshd_config | ||
| 128 | NEWCONF=1 | ||
| 129 | fi | ||
| 130 | if [ ! -r "${CONFDIR}/primes" ]; then | ||
| 131 | instbackup ${CONFDIR} primes | ||
| 132 | NEWCONF=1 | ||
| 133 | fi | ||
| 134 | if [ $NEWCONF -eq 0 ]; then | ||
| 135 | echo "Your existing SSH configuration files have not been altered." | ||
| 136 | else | ||
| 137 | echo "Your other existing SSH configuration files have not been altered." | ||
| 138 | fi | ||
| 139 | |||
| 140 | ### If no existing sshd_config and host key, then create | ||
| 141 | if [ ! -f "${CONFDIR}/ssh_host_key" ]; then | ||
| 142 | echo "Creating new RSA public/private host key pair for SSH-1." | ||
| 143 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_key | ||
| 144 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_key.pub | ||
| 145 | ### If there is *anything* there then leave it, otherwise look | ||
| 146 | ### in some reasonable alternate locations before giving up. | ||
| 147 | ### It's worth spending some extra time looking for the old one | ||
| 148 | ### to avoid a bunch of "host identification has changed" warnings. | ||
| 149 | ### Note that some old keys from the commercial SSH might not | ||
| 150 | ### be compatible, but we don't test for that. | ||
| 151 | if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_key" ]; then | ||
| 152 | mv ${PKG_INSTALL_ROOT}/etc/ssh_host_key ${CONFDIR} | ||
| 153 | elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_key" ]; then | ||
| 154 | mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_key ${CONFDIR} | ||
| 155 | else | ||
| 156 | ${DESTBIN}/ssh-keygen -b 1024 -f ${CONFDIR}/ssh_host_key -N '' | ||
| 157 | fi | ||
| 158 | else | ||
| 159 | echo "Using existing RSA public/private host key pair for SSH-1." | ||
| 160 | fi | ||
| 161 | if [ ! -f "${CONFDIR}/ssh_host_dsa_key" ]; then | ||
| 162 | echo "Creating new DSA public/private host key pair for SSH-2." | ||
| 163 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_dsa_key | ||
| 164 | $INSTALLF $PKGINST ${CONFDIR}/ssh_host_dsa_key.pub | ||
| 165 | ### If there is *anything* there then leave it, otherwise look | ||
| 166 | ### in some reasonable alternate locations before giving up. | ||
| 167 | ### It's worth spending some extra time looking for the old one | ||
| 168 | ### to avoid a bunch of "host identification has changed" warnings. | ||
| 169 | ### Note that some old keys from the commercial SSH2 might not | ||
| 170 | ### be compatible, but we don't test for that. | ||
| 171 | if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_dsa_key" ]; then | ||
| 172 | mv ${PKG_INSTALL_ROOT}/etc/ssh_host_dsa_key ${CONFDIR} | ||
| 173 | elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_dsa_key" ]; then | ||
| 174 | mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_dsa_key ${CONFDIR} | ||
| 175 | else | ||
| 176 | ${DESTBIN}/ssh-keygen -d -f ${CONFDIR}/ssh_host_dsa_key -N '' | ||
| 177 | fi | ||
| 178 | else | ||
| 179 | echo "Using existing DSA public/private host key pair for SSH-2." | ||
| 180 | fi | ||
| 181 | fi | ||
| 182 | |||
| 183 | if [ ! -d %%PIDDIR%% ]; then | ||
| 184 | $INSTALLF $PKGINST %%PIDDIR%% | ||
| 185 | mkdir -p %%PIDDIR%% | ||
| 186 | chown root:sys %%PIDDIR%% | ||
| 187 | chmod 755 %%PIDDIR%% | ||
| 188 | fi | ||
| 189 | |||
| 190 | $INSTALLF -f $PKGINST || exit 2 | ||
| 191 | |||
| 192 | if [ "X${PKG_INSTALL_ROOT}" = "X" ]; then | ||
| 193 | ### We're doing a local install, rather than an install for | ||
| 194 | ### old-style diskless clients. | ||
| 195 | echo "Stopping any current sshd process, and then starting the new sshd." | ||
| 196 | /etc/init.d/sshd stop | ||
| 197 | /etc/init.d/sshd start | ||
| 198 | else | ||
| 199 | echo "Not restarting sshd, since this appears to be a remote install" | ||
| 200 | echo "for support of diskless clients." | ||
| 201 | fi | ||
| 202 | |||
| 203 | exit 0 | ||
diff --git a/other/ssharp/contrib/solaris/preremove b/other/ssharp/contrib/solaris/preremove new file mode 100644 index 0000000..701c8c5 --- /dev/null +++ b/other/ssharp/contrib/solaris/preremove | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | # pre-removal script for OPENssh | ||
| 2 | /etc/init.d/sshd stop | ||
diff --git a/other/ssharp/contrib/solaris/prototype b/other/ssharp/contrib/solaris/prototype new file mode 100644 index 0000000..422b4aa --- /dev/null +++ b/other/ssharp/contrib/solaris/prototype | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | i pkginfo | ||
| 2 | i checkinstall | ||
| 3 | i postinstall | ||
| 4 | i preremove | ||
| 5 | d none man 0755 root sys | ||
| 6 | d none man/man1 0755 root sys | ||
| 7 | f none man/man1/scp.1 0644 root sys | ||
| 8 | f none man/man1/ssh-add.1 0644 root sys | ||
| 9 | f none man/man1/ssh-agent.1 0644 root sys | ||
| 10 | f none man/man1/ssh-keygen.1 0644 root sys | ||
| 11 | f none man/man1/ssh.1 0644 root sys | ||
| 12 | d none man/man8 0755 root sys | ||
| 13 | f none man/man8/sshd.8 0644 root sys | ||
| 14 | d none etc 0755 root sys | ||
| 15 | f none etc/sshd_config.default 0644 root sys | ||
| 16 | f none etc/ssh_config.default 0644 root sys | ||
| 17 | f none etc/ssh_prng_cmds.default 0644 root sys | ||
| 18 | f none etc/primes.default 0644 root sys | ||
| 19 | f none etc/sshd-initscript 0755 root sys | ||
| 20 | d none bin 0755 root sys | ||
| 21 | f none bin/ssh-keygen 0755 root sys | ||
| 22 | f none bin/ssh 0755 root sys | ||
| 23 | f none bin/ssh-add 0755 root sys | ||
| 24 | f none bin/ssh-agent 0755 root sys | ||
| 25 | f none bin/scp 0755 root sys | ||
| 26 | d none sbin 0755 root sys | ||
| 27 | f none sbin/sshd 0755 root sys | ||
diff --git a/other/ssharp/contrib/solaris/sshd-initscript.in b/other/ssharp/contrib/solaris/sshd-initscript.in new file mode 100755 index 0000000..886a51f --- /dev/null +++ b/other/ssharp/contrib/solaris/sshd-initscript.in | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | #! /sbin/sh | ||
| 2 | |||
| 3 | # SSHd startup/shutdown script, based on uucp script. | ||
| 4 | |||
| 5 | PIDFILE="%%PIDDIR%%/sshd.pid" | ||
| 6 | PGREP="/usr/bin/pgrep" | ||
| 7 | HEAD="/usr/bin/head" | ||
| 8 | XARGS="/usr/bin/xargs" | ||
| 9 | KILL="/usr/bin/kill" | ||
| 10 | |||
| 11 | killproc() { | ||
| 12 | _procname=$1 | ||
| 13 | _signal=$2 | ||
| 14 | ${PGREP} ${_procname} | ${HEAD} -1 | ${XARGS} -t -I {} ${KILL} -${_signal} {} | ||
| 15 | } | ||
| 16 | |||
| 17 | case $1 in | ||
| 18 | 'start') | ||
| 19 | /usr/local/sbin/sshd | ||
| 20 | ;; | ||
| 21 | |||
| 22 | 'stop') | ||
| 23 | if [ -r $PIDFILE -a ! -z ${PIDFILE} ]; then | ||
| 24 | PID=`cat ${PIDFILE}` | ||
| 25 | fi | ||
| 26 | if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then | ||
| 27 | /usr/bin/kill $PID | ||
| 28 | else | ||
| 29 | echo "Unable to read PID file, killing using alternate method" | ||
| 30 | killproc sshd TERM | ||
| 31 | fi | ||
| 32 | ;; | ||
| 33 | |||
| 34 | 'restart') | ||
| 35 | if [ -r $PIDFILE -a ! -z ${PIDFILE} ]; then | ||
| 36 | PID=`cat ${PIDFILE}` | ||
| 37 | fi | ||
| 38 | if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then | ||
| 39 | /usr/bin/kill -HUP $PID | ||
| 40 | else | ||
| 41 | echo "Unable to read PID file, trying alternate method" | ||
| 42 | killproc sshd HUP | ||
| 43 | /usr/local/sbin/sshd | ||
| 44 | fi | ||
| 45 | ;; | ||
| 46 | |||
| 47 | *) | ||
| 48 | echo "usage: /etc/init.d/sshd {start|stop|restart}" | ||
| 49 | ;; | ||
| 50 | esac | ||
diff --git a/other/ssharp/contrib/ssh-copy-id b/other/ssharp/contrib/ssh-copy-id new file mode 100644 index 0000000..0ab37ca --- /dev/null +++ b/other/ssharp/contrib/ssh-copy-id | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | # Shell script to install your identity.pub on a remote machine | ||
| 4 | # Takes the remote machine name as an argument. | ||
| 5 | # Obviously, the remote machine must accept password authentication, | ||
| 6 | # or one of the other keys in your ssh-agent, for this to work. | ||
| 7 | |||
| 8 | ID_FILE="${HOME}/.ssh/identity.pub" | ||
| 9 | |||
| 10 | if [ "-i" = "$1" ]; then | ||
| 11 | shift | ||
| 12 | # check if we have 2 parameters left, if so the first is the new ID file | ||
| 13 | if [ -n "$2" ]; then | ||
| 14 | if expr "$1" : ".*\.pub" ; then | ||
| 15 | ID_FILE="$1" | ||
| 16 | else | ||
| 17 | ID_FILE="$1.pub" | ||
| 18 | fi | ||
| 19 | shift # and this should leave $1 as the target name | ||
| 20 | fi | ||
| 21 | else | ||
| 22 | if [ x$SSH_AUTH_SOCK != x ] ; then | ||
| 23 | GET_ID="$GET_ID ssh-add -L" | ||
| 24 | fi | ||
| 25 | fi | ||
| 26 | |||
| 27 | if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then | ||
| 28 | GET_ID="cat ${ID_FILE}" | ||
| 29 | fi | ||
| 30 | |||
| 31 | if [ -z "`eval $GET_ID`" ]; then | ||
| 32 | echo "$0: ERROR: No identities found" | ||
| 33 | exit 1 | ||
| 34 | fi | ||
| 35 | |||
| 36 | { eval "$GET_ID" ; } | ssh $1 "test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys ; chmod g-w . .ssh .ssh/authorized_keys" | ||
| 37 | |||
| 38 | cat <<EOF | ||
| 39 | Now try logging into the machine, with "ssh '$1'", and check in: | ||
| 40 | |||
| 41 | .ssh/authorized_keys | ||
| 42 | |||
| 43 | to make sure we haven't added extra keys that you weren't expecting. | ||
| 44 | |||
| 45 | EOF | ||
diff --git a/other/ssharp/contrib/ssh-copy-id.1 b/other/ssharp/contrib/ssh-copy-id.1 new file mode 100644 index 0000000..b331fa1 --- /dev/null +++ b/other/ssharp/contrib/ssh-copy-id.1 | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | .ig \" -*- nroff -*- | ||
| 2 | Copyright (c) 1999 Philip Hands Computing <http://www.hands.com/> | ||
| 3 | |||
| 4 | Permission is granted to make and distribute verbatim copies of | ||
| 5 | this manual provided the copyright notice and this permission notice | ||
| 6 | are preserved on all copies. | ||
| 7 | |||
| 8 | Permission is granted to copy and distribute modified versions of this | ||
| 9 | manual under the conditions for verbatim copying, provided that the | ||
| 10 | entire resulting derived work is distributed under the terms of a | ||
| 11 | permission notice identical to this one. | ||
| 12 | |||
| 13 | Permission is granted to copy and distribute translations of this | ||
| 14 | manual into another language, under the above conditions for modified | ||
| 15 | versions, except that this permission notice may be included in | ||
| 16 | translations approved by the Free Software Foundation instead of in | ||
| 17 | the original English. | ||
| 18 | .. | ||
| 19 | .TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" | ||
| 20 | .SH NAME | ||
| 21 | ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys | ||
| 22 | .SH SYNOPSIS | ||
| 23 | .B ssh-copy-id [-i [identity_file]] | ||
| 24 | .I "[user@]machine" | ||
| 25 | .br | ||
| 26 | .SH DESCRIPTION | ||
| 27 | .BR ssh-copy-id | ||
| 28 | is a script that uses ssh to log into a remote machine (presumably | ||
| 29 | using a login password, so password authentication should be enabled, | ||
| 30 | unless you've done some clever use of multiple identities) | ||
| 31 | .PP | ||
| 32 | It also changes the permissions of the remote user's home, | ||
| 33 | .BR ~/.ssh , | ||
| 34 | and | ||
| 35 | .B ~/.ssh/authorized_keys | ||
| 36 | to remove group writability (which would otherwise prevent you from logging in, if the remote | ||
| 37 | .B sshd | ||
| 38 | has | ||
| 39 | .B StrictModes | ||
| 40 | set in its configuration). | ||
| 41 | .PP | ||
| 42 | If the | ||
| 43 | .B -i | ||
| 44 | option is given then the identity file (defaults to | ||
| 45 | .BR ~/.ssh/identity.pub ) | ||
| 46 | is used, regardless of whether there are any keys in your | ||
| 47 | .BR ssh-agent . | ||
| 48 | Otherwise, if this: | ||
| 49 | .PP | ||
| 50 | .B " ssh-add -L" | ||
| 51 | .PP | ||
| 52 | provides any output, it uses that in preference to the identity file. | ||
| 53 | .PP | ||
| 54 | If the | ||
| 55 | .B -i | ||
| 56 | option is used, or the | ||
| 57 | .B ssh-add | ||
| 58 | produced no output, then it uses the contents of the identity | ||
| 59 | file. Once it has one or more fingerprints (by whatever means) it | ||
| 60 | uses ssh to append them to | ||
| 61 | .B ~/.ssh/authorized_keys | ||
| 62 | on the remote machine (creating the file, and directory, if necessary) | ||
| 63 | |||
| 64 | .SH "SEE ALSO" | ||
| 65 | .BR ssh (1), | ||
| 66 | .BR ssh-agent (1), | ||
| 67 | .BR sshd (8) | ||
diff --git a/other/ssharp/contrib/sshd.pam.freebsd b/other/ssharp/contrib/sshd.pam.freebsd new file mode 100644 index 0000000..c0bc364 --- /dev/null +++ b/other/ssharp/contrib/sshd.pam.freebsd | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | sshd auth required pam_unix.so try_first_pass | ||
| 2 | sshd account required pam_unix.so | ||
| 3 | sshd password required pam_permit.so | ||
| 4 | sshd session required pam_permit.so | ||
| 5 | |||
diff --git a/other/ssharp/contrib/sshd.pam.generic b/other/ssharp/contrib/sshd.pam.generic new file mode 100644 index 0000000..cf5af30 --- /dev/null +++ b/other/ssharp/contrib/sshd.pam.generic | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #%PAM-1.0 | ||
| 2 | auth required /lib/security/pam_unix.so shadow nodelay | ||
| 3 | auth required /lib/security/pam_nologin.so | ||
| 4 | account required /lib/security/pam_unix.so | ||
| 5 | password required /lib/security/pam_cracklib.so | ||
| 6 | password required /lib/security/pam_unix.so shadow nullok use_authtok | ||
| 7 | session required /lib/security/pam_unix.so | ||
| 8 | session required /lib/security/pam_limits.so | ||
diff --git a/other/ssharp/contrib/suse/CVS/Entries b/other/ssharp/contrib/suse/CVS/Entries new file mode 100644 index 0000000..dcaf44c --- /dev/null +++ b/other/ssharp/contrib/suse/CVS/Entries | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | /openssh.spec/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 2 | /rc.config.sshd/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 3 | /rc.sshd/1.1.1.1/Wed Sep 19 14:44:59 2001//Trel-0-51 | ||
| 4 | D | ||
diff --git a/other/ssharp/contrib/suse/CVS/Repository b/other/ssharp/contrib/suse/CVS/Repository new file mode 100644 index 0000000..81a757f --- /dev/null +++ b/other/ssharp/contrib/suse/CVS/Repository | |||
| @@ -0,0 +1 @@ | |||
| ssharp/contrib/suse | |||
diff --git a/other/ssharp/contrib/suse/CVS/Root b/other/ssharp/contrib/suse/CVS/Root new file mode 100644 index 0000000..3811072 --- /dev/null +++ b/other/ssharp/contrib/suse/CVS/Root | |||
| @@ -0,0 +1 @@ | |||
| /cvs | |||
diff --git a/other/ssharp/contrib/suse/CVS/Tag b/other/ssharp/contrib/suse/CVS/Tag new file mode 100644 index 0000000..00329bf --- /dev/null +++ b/other/ssharp/contrib/suse/CVS/Tag | |||
| @@ -0,0 +1 @@ | |||
| Nrel-0-51 | |||
diff --git a/other/ssharp/contrib/suse/openssh.spec b/other/ssharp/contrib/suse/openssh.spec new file mode 100644 index 0000000..4075d4f --- /dev/null +++ b/other/ssharp/contrib/suse/openssh.spec | |||
| @@ -0,0 +1,198 @@ | |||
| 1 | Summary: OpenSSH, a free Secure Shell (SSH) implementation | ||
| 2 | Name: openssh | ||
| 3 | Version: 2.9p1 | ||
| 4 | URL: http://www.openssh.com/ | ||
| 5 | Release: 1 | ||
| 6 | Source0: openssh-%{version}.tar.gz | ||
| 7 | Copyright: BSD | ||
| 8 | Group: Applications/Internet | ||
| 9 | BuildRoot: /tmp/openssh-%{version}-buildroot | ||
| 10 | PreReq: openssl | ||
| 11 | Obsoletes: ssh | ||
| 12 | # | ||
| 13 | # (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) | ||
| 14 | # building prerequisites -- stuff for | ||
| 15 | # OpenSSL (openssl-devel), | ||
| 16 | # TCP Wrappers (nkitb), | ||
| 17 | # and Gnome (glibdev, gtkdev, and gnlibsd) | ||
| 18 | # | ||
| 19 | BuildPrereq: openssl | ||
| 20 | BuildPrereq: nkitb | ||
| 21 | BuildPrereq: glibdev | ||
| 22 | BuildPrereq: gtkdev | ||
| 23 | BuildPrereq: gnlibsd | ||
| 24 | |||
| 25 | %description | ||
| 26 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
| 27 | executing commands in a remote machine. It is intended to replace | ||
| 28 | rlogin and rsh, and provide secure encrypted communications between | ||
| 29 | two untrusted hosts over an insecure network. X11 connections and | ||
| 30 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
| 31 | |||
| 32 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
| 33 | up to date in terms of security and features, as well as removing all | ||
| 34 | patented algorithms to seperate libraries (OpenSSL). | ||
| 35 | |||
| 36 | This package includes all files necessary for both the OpenSSH | ||
| 37 | client and server. Additionally, this package contains the GNOME | ||
| 38 | passphrase dialog. | ||
| 39 | |||
| 40 | %changelog | ||
| 41 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
| 42 | - Glob manpages to catch compressed files | ||
| 43 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | ||
| 44 | - Updated for new location | ||
| 45 | - Updated for new gnome-ssh-askpass build | ||
| 46 | * Sun Dec 26 1999 Chris Saia <csaia@wtower.com> | ||
| 47 | - Made symlink to gnome-ssh-askpass called ssh-askpass | ||
| 48 | * Wed Nov 24 1999 Chris Saia <csaia@wtower.com> | ||
| 49 | - Removed patches that included /etc/pam.d/sshd, /sbin/init.d/rc.sshd, and | ||
| 50 | /var/adm/fillup-templates/rc.config.sshd, since Damien merged these into | ||
| 51 | his released tarfile | ||
| 52 | - Changed permissions on ssh_config in the install procedure to 644 from 600 | ||
| 53 | even though it was correct in the %files section and thus right in the RPMs | ||
| 54 | - Postinstall script for the server now only prints "Generating SSH host | ||
| 55 | key..." if we need to actually do this, in order to eliminate a confusing | ||
| 56 | message if an SSH host key is already in place | ||
| 57 | - Marked all manual pages as %doc(umentation) | ||
| 58 | * Mon Nov 22 1999 Chris Saia <csaia@wtower.com> | ||
| 59 | - Added flag to configure daemon with TCP Wrappers support | ||
| 60 | - Added building prerequisites (works in RPM 3.0 and newer) | ||
| 61 | * Thu Nov 18 1999 Chris Saia <csaia@wtower.com> | ||
| 62 | - Made this package correct for SuSE. | ||
| 63 | - Changed instances of pam_pwdb.so to pam_unix.so, since it works more properly | ||
| 64 | with SuSE, and lib_pwdb.so isn't installed by default. | ||
| 65 | * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> | ||
| 66 | - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> | ||
| 67 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> | ||
| 68 | - Added 'Obsoletes' directives | ||
| 69 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> | ||
| 70 | - Use make install | ||
| 71 | - Subpackages | ||
| 72 | * Mon Nov 08 1999 Damien Miller <djm@ibs.com.au> | ||
| 73 | - Added links for slogin | ||
| 74 | - Fixed perms on manpages | ||
| 75 | * Sat Oct 30 1999 Damien Miller <djm@ibs.com.au> | ||
| 76 | - Renamed init script | ||
| 77 | * Fri Oct 29 1999 Damien Miller <djm@ibs.com.au> | ||
| 78 | - Back to old binary names | ||
| 79 | * Thu Oct 28 1999 Damien Miller <djm@ibs.com.au> | ||
| 80 | - Use autoconf | ||
| 81 | - New binary names | ||
| 82 | * Wed Oct 27 1999 Damien Miller <djm@ibs.com.au> | ||
| 83 | - Initial RPMification, based on Jan "Yenya" Kasprzak's <kas@fi.muni.cz> spec. | ||
| 84 | |||
| 85 | %prep | ||
| 86 | |||
| 87 | %setup -q | ||
| 88 | |||
| 89 | %build | ||
| 90 | CFLAGS="$RPM_OPT_FLAGS" \ | ||
| 91 | ./configure --prefix=/usr \ | ||
| 92 | --sysconfdir=/etc/ssh \ | ||
| 93 | --with-pam \ | ||
| 94 | --with-gnome-askpass \ | ||
| 95 | --with-tcp-wrappers \ | ||
| 96 | --with-ipv4-default \ | ||
| 97 | --libexecdir=/usr/lib/ssh | ||
| 98 | make | ||
| 99 | |||
| 100 | cd contrib | ||
| 101 | gcc -O -g `gnome-config --cflags gnome gnomeui` \ | ||
| 102 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | ||
| 103 | `gnome-config --libs gnome gnomeui` | ||
| 104 | cd .. | ||
| 105 | |||
| 106 | %install | ||
| 107 | rm -rf $RPM_BUILD_ROOT | ||
| 108 | make install DESTDIR=$RPM_BUILD_ROOT/ | ||
| 109 | install -d $RPM_BUILD_ROOT/etc/ssh/ | ||
| 110 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | ||
| 111 | install -d $RPM_BUILD_ROOT/sbin/init.d/ | ||
| 112 | install -d $RPM_BUILD_ROOT/var/adm/fillup-templates | ||
| 113 | install -d $RPM_BUILD_ROOT/usr/lib/ssh | ||
| 114 | install -m644 contrib/sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd | ||
| 115 | install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd | ||
| 116 | ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd | ||
| 117 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/lib/ssh/gnome-ssh-askpass | ||
| 118 | ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/lib/ssh/ssh-askpass | ||
| 119 | install -m744 contrib/suse/rc.config.sshd \ | ||
| 120 | $RPM_BUILD_ROOT/var/adm/fillup-templates | ||
| 121 | |||
| 122 | %clean | ||
| 123 | rm -rf $RPM_BUILD_ROOT | ||
| 124 | |||
| 125 | %post | ||
| 126 | if [ "$1" = 1 ]; then | ||
| 127 | echo "Creating SSH stop/start scripts in the rc directories..." | ||
| 128 | ln -s ../sshd /sbin/init.d/rc2.d/K20sshd | ||
| 129 | ln -s ../sshd /sbin/init.d/rc2.d/S20sshd | ||
| 130 | ln -s ../sshd /sbin/init.d/rc3.d/K20sshd | ||
| 131 | ln -s ../sshd /sbin/init.d/rc3.d/S20sshd | ||
| 132 | fi | ||
| 133 | echo "Updating /etc/rc.config..." | ||
| 134 | if [ -x /bin/fillup ] ; then | ||
| 135 | /bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.sshd | ||
| 136 | else | ||
| 137 | echo "ERROR: fillup not found. This should NOT happen in SuSE Linux." | ||
| 138 | echo "Update /etc/rc.config by hand from the following template file:" | ||
| 139 | echo " /var/adm/fillup-templates/rc.config.sshd" | ||
| 140 | fi | ||
| 141 | if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then | ||
| 142 | echo "Generating SSH host key..." | ||
| 143 | /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 | ||
| 144 | fi | ||
| 145 | if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then | ||
| 146 | echo "Generating SSH DSA host key..." | ||
| 147 | /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2 | ||
| 148 | fi | ||
| 149 | if test -r /var/run/sshd.pid | ||
| 150 | then | ||
| 151 | echo "Restarting the running SSH daemon..." | ||
| 152 | /usr/sbin/rcsshd restart >&2 | ||
| 153 | fi | ||
| 154 | |||
| 155 | %preun | ||
| 156 | if [ "$1" = 0 ] | ||
| 157 | then | ||
| 158 | echo "Stopping the SSH daemon..." | ||
| 159 | /usr/sbin/rcsshd stop >&2 | ||
| 160 | echo "Removing SSH stop/start scripts from the rc directories..." | ||
| 161 | rm /sbin/init.d/rc2.d/K20sshd | ||
| 162 | rm /sbin/init.d/rc2.d/S20sshd | ||
| 163 | rm /sbin/init.d/rc3.d/K20sshd | ||
| 164 | rm /sbin/init.d/rc3.d/S20sshd | ||
| 165 | fi | ||
| 166 | |||
| 167 | %files | ||
| 168 | %defattr(-,root,root) | ||
| 169 | %doc ChangeLog OVERVIEW README* | ||
| 170 | %doc RFC.nroff TODO CREDITS LICENSE | ||
| 171 | %attr(0755,root,root) %dir /etc/ssh | ||
| 172 | %attr(0644,root,root) %config /etc/ssh/ssh_config | ||
| 173 | %attr(0600,root,root) %config /etc/ssh/sshd_config | ||
| 174 | %attr(0600,root,root) %config /etc/ssh/primes | ||
| 175 | %attr(0644,root,root) %config /etc/pam.d/sshd | ||
| 176 | %attr(0755,root,root) %config /sbin/init.d/sshd | ||
| 177 | %attr(0755,root,root) /usr/bin/ssh-keygen | ||
| 178 | %attr(0755,root,root) /usr/bin/scp | ||
| 179 | %attr(4755,root,root) /usr/bin/ssh | ||
| 180 | %attr(-,root,root) /usr/bin/slogin | ||
| 181 | %attr(0755,root,root) /usr/bin/ssh-agent | ||
| 182 | %attr(0755,root,root) /usr/bin/ssh-add | ||
| 183 | %attr(0755,root,root) /usr/bin/ssh-keyscan | ||
| 184 | %attr(0755,root,root) /usr/bin/sftp | ||
| 185 | %attr(0755,root,root) /usr/sbin/sshd | ||
| 186 | %attr(-,root,root) /usr/sbin/rcsshd | ||
| 187 | %attr(0755,root,root) %dir /usr/lib/ssh | ||
| 188 | %attr(0755,root,root) /usr/lib/ssh/ssh-askpass | ||
| 189 | %attr(0755,root,root) /usr/lib/ssh/gnome-ssh-askpass | ||
| 190 | %attr(0644,root,root) %doc /usr/man/man1/scp.1* | ||
| 191 | %attr(0644,root,root) %doc /usr/man/man1/ssh.1* | ||
| 192 | %attr(-,root,root) %doc /usr/man/man1/slogin.1* | ||
| 193 | %attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1* | ||
| 194 | %attr(0644,root,root) %doc /usr/man/man1/ssh-add.1* | ||
| 195 | %attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* | ||
| 196 | %attr(0644,root,root) %doc /usr/man/man8/sshd.8* | ||
| 197 | %attr(0644,root,root) /var/adm/fillup-templates/rc.config.sshd | ||
| 198 | |||
diff --git a/other/ssharp/contrib/suse/rc.config.sshd b/other/ssharp/contrib/suse/rc.config.sshd new file mode 100644 index 0000000..baaa7a5 --- /dev/null +++ b/other/ssharp/contrib/suse/rc.config.sshd | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # | ||
| 2 | # Start the Secure Shell (SSH) Daemon? | ||
| 3 | # | ||
| 4 | START_SSHD="yes" | ||
| 5 | |||
diff --git a/other/ssharp/contrib/suse/rc.sshd b/other/ssharp/contrib/suse/rc.sshd new file mode 100644 index 0000000..f7d431e --- /dev/null +++ b/other/ssharp/contrib/suse/rc.sshd | |||
| @@ -0,0 +1,80 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | # Copyright (c) 1995-1998 SuSE GmbH Nuernberg, Germany. | ||
| 3 | # | ||
| 4 | # Author: Chris Saia <csaia@wtower.com> | ||
| 5 | # | ||
| 6 | # /sbin/init.d/sshd | ||
| 7 | # | ||
| 8 | # and symbolic its link | ||
| 9 | # | ||
| 10 | # /sbin/rcsshd | ||
| 11 | # | ||
| 12 | |||
| 13 | . /etc/rc.config | ||
| 14 | |||
| 15 | # Determine the base and follow a runlevel link name. | ||
| 16 | base=${0##*/} | ||
| 17 | link=${base#*[SK][0-9][0-9]} | ||
| 18 | |||
| 19 | # Force execution if not called by a runlevel directory. | ||
| 20 | test $link = $base && START_SSHD=yes | ||
| 21 | test "$START_SSHD" = yes || exit 0 | ||
| 22 | |||
| 23 | # The echo return value for success (defined in /etc/rc.config). | ||
| 24 | return=$rc_done | ||
| 25 | case "$1" in | ||
| 26 | start) | ||
| 27 | echo -n "Starting service sshd" | ||
| 28 | ## Start daemon with startproc(8). If this fails | ||
| 29 | ## the echo return value is set appropriate. | ||
| 30 | |||
| 31 | startproc /usr/sbin/sshd || return=$rc_failed | ||
| 32 | |||
| 33 | echo -e "$return" | ||
| 34 | ;; | ||
| 35 | stop) | ||
| 36 | echo -n "Stopping service sshd" | ||
| 37 | ## Stop daemon with killproc(8) and if this fails | ||
| 38 | ## set echo the echo return value. | ||
| 39 | |||
| 40 | killproc -TERM /usr/sbin/sshd || return=$rc_failed | ||
| 41 | |||
| 42 | echo -e "$return" | ||
| 43 | ;; | ||
| 44 | restart) | ||
| 45 | ## If first returns OK call the second, if first or | ||
| 46 | ## second command fails, set echo return value. | ||
| 47 | $0 stop && $0 start || return=$rc_failed | ||
| 48 | ;; | ||
| 49 | reload) | ||
| 50 | ## Choose ONE of the following two cases: | ||
| 51 | |||
| 52 | ## First possibility: A few services accepts a signal | ||
| 53 | ## to reread the (changed) configuration. | ||
| 54 | |||
| 55 | echo -n "Reload service sshd" | ||
| 56 | killproc -HUP /usr/sbin/sshd || return=$rc_failed | ||
| 57 | echo -e "$return" | ||
| 58 | ;; | ||
| 59 | status) | ||
| 60 | echo -n "Checking for service sshd" | ||
| 61 | ## Check status with checkproc(8), if process is running | ||
| 62 | ## checkproc will return with exit status 0. | ||
| 63 | |||
| 64 | checkproc /usr/sbin/sshd && echo OK || echo No process | ||
| 65 | ;; | ||
| 66 | probe) | ||
| 67 | ## Optional: Probe for the necessity of a reload, | ||
| 68 | ## give out the argument which is required for a reload. | ||
| 69 | |||
| 70 | test /etc/ssh/sshd_config -nt /var/run/sshd.pid && echo reload | ||
| 71 | ;; | ||
| 72 | *) | ||
| 73 | echo "Usage: $0 {start|stop|status|restart|reload[|probe]}" | ||
| 74 | exit 1 | ||
| 75 | ;; | ||
| 76 | esac | ||
| 77 | |||
| 78 | # Inform the caller not only verbosely and set an exit status. | ||
| 79 | test "$return" = "$rc_done" || exit 1 | ||
| 80 | exit 0 | ||
