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

unexpand

This commit is contained in:
Ben Lindstrom 2002-06-09 19:41:48 +00:00
parent 2ab1968da2
commit 5a6abdae0f
14 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth-krb5.c
View File

@ -323,7 +323,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user,
authctxt->pw->pw_name)) { authctxt->pw->pw_name)) {
problem = -1; problem = -1;
goto out; goto out;
} }

8
channels.c
View File

@ -707,8 +707,8 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset)
FD_SET(c->wfd, writeset); FD_SET(c->wfd, writeset);
} else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
if (CHANNEL_EFD_OUTPUT_ACTIVE(c)) if (CHANNEL_EFD_OUTPUT_ACTIVE(c))
debug2("channel %d: obuf_empty delayed efd %d/(%d)", debug2("channel %d: obuf_empty delayed efd %d/(%d)",
c->self, c->efd, buffer_len(&c->extended)); c->self, c->efd, buffer_len(&c->extended));
else else
chan_obuf_empty(c); chan_obuf_empty(c);
} }
@ -1641,8 +1641,8 @@ channel_output_poll(void)
* hack for extended data: delay EOF if EFD still in use. * hack for extended data: delay EOF if EFD still in use.
*/ */
if (CHANNEL_EFD_INPUT_ACTIVE(c)) if (CHANNEL_EFD_INPUT_ACTIVE(c))
debug2("channel %d: ibuf_empty delayed efd %d/(%d)", debug2("channel %d: ibuf_empty delayed efd %d/(%d)",
c->self, c->efd, buffer_len(&c->extended)); c->self, c->efd, buffer_len(&c->extended));
else else
chan_ibuf_empty(c); chan_ibuf_empty(c);
} }

2
clientloop.c
View File

@ -481,7 +481,7 @@ process_cmdline(void)
int local = 0; int local = 0;
leave_raw_mode(); leave_raw_mode();
handler = signal(SIGINT, SIG_IGN); handler = signal(SIGINT, SIG_IGN);
cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
if (s == NULL) if (s == NULL)
goto out; goto out;

4
entropy.c
View File

@ -45,7 +45,7 @@
* XXX: we should tell the child how many bytes we need. * XXX: we should tell the child how many bytes we need.
*/ */
RCSID("$Id: entropy.c,v 1.43 2002/04/21 18:26:10 tim Exp $"); RCSID("$Id: entropy.c,v 1.44 2002/06/09 19:41:48 mouring Exp $");
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
#define RANDOM_SEED_SIZE 48 #define RANDOM_SEED_SIZE 48
@ -115,7 +115,7 @@ seed_rng(void)
if (waitpid(pid, &ret, 0) == -1) if (waitpid(pid, &ret, 0) == -1)
fatal("Couldn't wait for ssh-rand-helper completion: %s", fatal("Couldn't wait for ssh-rand-helper completion: %s",
strerror(errno)); strerror(errno));
mysignal(SIGCHLD, old_sigchld); mysignal(SIGCHLD, old_sigchld);
/* We don't mind if the child exits upon a SIGPIPE */ /* We don't mind if the child exits upon a SIGPIPE */

4
nchan.c
View File

@ -411,8 +411,8 @@ chan_is_dead(Channel *c, int send)
c->extended_usage == CHAN_EXTENDED_WRITE && c->extended_usage == CHAN_EXTENDED_WRITE &&
c->efd != -1 && c->efd != -1 &&
buffer_len(&c->extended) > 0) { buffer_len(&c->extended) > 0) {
debug2("channel %d: active efd: %d len %d", debug2("channel %d: active efd: %d len %d",
c->self, c->efd, buffer_len(&c->extended)); c->self, c->efd, buffer_len(&c->extended));
return 0; return 0;
} }
if (!(c->flags & CHAN_CLOSE_SENT)) { if (!(c->flags & CHAN_CLOSE_SENT)) {

2
session.c
View File

@ -1120,7 +1120,7 @@ launch_login(struct passwd *pw, const char *hostname)
execl(LOGIN_PROGRAM, "login", "-h", hostname, execl(LOGIN_PROGRAM, "login", "-h", hostname,
#ifdef xxxLOGIN_NEEDS_TERM #ifdef xxxLOGIN_NEEDS_TERM
(s->term ? s->term : "unknown"), (s->term ? s->term : "unknown"),
#endif /* LOGIN_NEEDS_TERM */ #endif /* LOGIN_NEEDS_TERM */
#ifdef LOGIN_NO_ENDOPT #ifdef LOGIN_NO_ENDOPT
"-p", "-f", pw->pw_name, (char *)NULL); "-p", "-f", pw->pw_name, (char *)NULL);

2
sftp-client.c
View File

@ -1061,7 +1061,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
if (id == startid || len == 0 || if (id == startid || len == 0 ||
id - ackid >= conn->num_requests) { id - ackid >= conn->num_requests) {
u_int r_id; u_int r_id;
buffer_clear(&msg); buffer_clear(&msg);
get_msg(conn->fd_in, &msg); get_msg(conn->fd_in, &msg);

4
sftp.c
View File

@ -238,8 +238,8 @@ main(int argc, char **argv)
interactive_loop(in, out, file1, file2); interactive_loop(in, out, file1, file2);
#if !defined(USE_PIPES) #if !defined(USE_PIPES)
shutdown(in, SHUT_RDWR); shutdown(in, SHUT_RDWR);
shutdown(out, SHUT_RDWR); shutdown(out, SHUT_RDWR);
#endif #endif
close(in); close(in);

2
ssh-agent.c
View File

@ -617,7 +617,7 @@ process_remove_smartcard_key(SocketEntry *e)
version = k->type == KEY_RSA1 ? 1 : 2; version = k->type == KEY_RSA1 ? 1 : 2;
if ((id = lookup_identity(k, version)) != NULL) { if ((id = lookup_identity(k, version)) != NULL) {
tab = idtab_lookup(version); tab = idtab_lookup(version);
TAILQ_REMOVE(&tab->idlist, id, next); TAILQ_REMOVE(&tab->idlist, id, next);
tab->nentries--; tab->nentries--;
free_identity(id); free_identity(id);
success = 1; success = 1;

2
ssh-keygen.c
View File

@ -416,7 +416,7 @@ do_upload(struct passwd *pw, const char *sc_reader_id)
key_free(prv); key_free(prv);
if (ret < 0) if (ret < 0)
exit(1); exit(1);
log("loading key done"); log("loading key done");
exit(0); exit(0);
} }

6
ssh-keysign.c
View File

@ -143,9 +143,9 @@ main(int argc, char **argv)
seteuid(getuid()); seteuid(getuid());
setuid(getuid()); setuid(getuid());
init_rng(); init_rng();
seed_rng(); seed_rng();
arc4random_stir(); arc4random_stir();
#ifdef DEBUG_SSH_KEYSIGN #ifdef DEBUG_SSH_KEYSIGN
log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0); log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);

4
ssh-rand-helper.c
View File

@ -39,7 +39,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: ssh-rand-helper.c,v 1.6 2002/04/14 09:27:13 djm Exp $"); RCSID("$Id: ssh-rand-helper.c,v 1.7 2002/06/09 19:41:49 mouring Exp $");
/* Number of bytes we write out */ /* Number of bytes we write out */
#define OUTPUT_SEED_SIZE 48 #define OUTPUT_SEED_SIZE 48
@ -391,7 +391,7 @@ hash_command_output(entropy_cmd_t *src, char *hash)
if (waitpid(pid, &status, 0) == -1) { if (waitpid(pid, &status, 0) == -1) {
error("Couldn't wait for child '%s' completion: %s", error("Couldn't wait for child '%s' completion: %s",
src->cmdstring, strerror(errno)); src->cmdstring, strerror(errno));
return 0.0; return 0.0;
} }

6
sshconnect.h
View File

@ -28,9 +28,9 @@
typedef struct Sensitive Sensitive; typedef struct Sensitive Sensitive;
struct Sensitive { struct Sensitive {
Key **keys; Key **keys;
int nkeys; int nkeys;
int external_keysign; int external_keysign;
}; };
int int

6
sshpty.c
View File

@ -164,8 +164,8 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
#else /* HAVE_DEV_PTS_AND_PTC */ #else /* HAVE_DEV_PTS_AND_PTC */
#ifdef _CRAY #ifdef _CRAY
char buf[64]; char buf[64];
int i; int i;
int highpty; int highpty;
#ifdef _SC_CRAY_NPTY #ifdef _SC_CRAY_NPTY
highpty = sysconf(_SC_CRAY_NPTY); highpty = sysconf(_SC_CRAY_NPTY);
@ -289,7 +289,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
if (fd < 0) if (fd < 0)
error("%.100s: %.100s", ttyname, strerror(errno)); error("%.100s: %.100s", ttyname, strerror(errno));
close(*ttyfd); close(*ttyfd);
*ttyfd = fd; *ttyfd = fd;
#else /* _CRAY */ #else /* _CRAY */
/* First disconnect from the old controlling tty. */ /* First disconnect from the old controlling tty. */