RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line

This commit is contained in:
Damien Miller 2005-07-17 17:18:49 +10:00
parent 94cf4c8448
commit 37294fb630
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,7 @@
- (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c]
[cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL
in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]")
- (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line
20050716 20050716
- (dtucker) [auth-pam.c] Ensure that only one side of the authentication - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
@ -2840,4 +2841,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3848 2005/07/17 07:04:47 djm Exp $ $Id: ChangeLog,v 1.3849 2005/07/17 07:18:49 djm Exp $

10
auth-pam.c
View File

@ -47,7 +47,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.125 2005/07/17 07:04:47 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.126 2005/07/17 07:18:50 djm Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -130,7 +130,7 @@ sshpam_sigchld_handler(int sig)
if (cleanup_ctxt == NULL) if (cleanup_ctxt == NULL)
return; /* handler called after PAM cleanup, shouldn't happen */ return; /* handler called after PAM cleanup, shouldn't happen */
if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG) if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG)
<= 0) { <= 0) {
/* PAM thread has not exitted, privsep slave must have */ /* PAM thread has not exitted, privsep slave must have */
kill(cleanup_ctxt->pam_thread, SIGTERM); kill(cleanup_ctxt->pam_thread, SIGTERM);
if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0) if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0)
@ -780,7 +780,7 @@ sshpam_respond(void *ctx, u_int num, char **resp)
buffer_init(&buffer); buffer_init(&buffer);
if (sshpam_authctxt->valid && if (sshpam_authctxt->valid &&
(sshpam_authctxt->pw->pw_uid != 0 || (sshpam_authctxt->pw->pw_uid != 0 ||
options.permit_root_login == PERMIT_YES)) options.permit_root_login == PERMIT_YES))
buffer_put_cstring(&buffer, *resp); buffer_put_cstring(&buffer, *resp);
else else
buffer_put_cstring(&buffer, badpw); buffer_put_cstring(&buffer, badpw);
@ -1144,7 +1144,7 @@ sshpam_auth_passwd(Authctxt *authctxt, const char *password)
* information via timing (eg if the PAM config has a delay on fail). * information via timing (eg if the PAM config has a delay on fail).
*/ */
if (!authctxt->valid || (authctxt->pw->pw_uid == 0 && if (!authctxt->valid || (authctxt->pw->pw_uid == 0 &&
options.permit_root_login != PERMIT_YES)) options.permit_root_login != PERMIT_YES))
sshpam_password = badpw; sshpam_password = badpw;
sshpam_err = pam_set_item(sshpam_handle, PAM_CONV, sshpam_err = pam_set_item(sshpam_handle, PAM_CONV,
@ -1158,7 +1158,7 @@ sshpam_auth_passwd(Authctxt *authctxt, const char *password)
if (sshpam_err == PAM_SUCCESS && authctxt->valid) { if (sshpam_err == PAM_SUCCESS && authctxt->valid) {
debug("PAM: password authentication accepted for %.100s", debug("PAM: password authentication accepted for %.100s",
authctxt->user); authctxt->user);
return 1; return 1;
} else { } else {
debug("PAM: password authentication failed for %.100s: %s", debug("PAM: password authentication failed for %.100s: %s",
authctxt->valid ? authctxt->user : "an illegal user", authctxt->valid ? authctxt->user : "an illegal user",

8
sftp.c
View File

@ -1299,8 +1299,8 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
setvbuf(infile, NULL, _IOLBF, 0); setvbuf(infile, NULL, _IOLBF, 0);
#else #else
setlinebuf(stdout); setlinebuf(stdout);
setlinebuf(infile); setlinebuf(infile);
#endif #endif
err = 0; err = 0;
@ -1562,8 +1562,8 @@ main(int argc, char **argv)
err = interactive_loop(in, out, file1, file2); err = 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);