summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
committerDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
commit9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch)
treef79317ab211f59181a61b526f566e9c8cfe70c73 /auth.c
parent89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff)
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
Diffstat (limited to 'auth.c')
-rw-r--r--auth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/auth.c b/auth.c
index a21ad414a..9541640ae 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth.c,v 1.30 2001/11/17 19:14:34 stevesk Exp $"); 26RCSID("$OpenBSD: auth.c,v 1.31 2001/12/19 07:18:56 deraadt Exp $");
27 27
28#ifdef HAVE_LOGIN_H 28#ifdef HAVE_LOGIN_H
29#include <login.h> 29#include <login.h>
@@ -272,7 +272,7 @@ expand_filename(const char *filename, struct passwd *pw)
272 } 272 }
273 if (cp[0] == '%' && cp[1] == 'u') { 273 if (cp[0] == '%' && cp[1] == 'u') {
274 buffer_append(&buffer, pw->pw_name, 274 buffer_append(&buffer, pw->pw_name,
275 strlen(pw->pw_name)); 275 strlen(pw->pw_name));
276 cp++; 276 cp++;
277 continue; 277 continue;
278 } 278 }
@@ -326,7 +326,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
326 if (options.strict_modes && 326 if (options.strict_modes &&
327 (stat(user_hostfile, &st) == 0) && 327 (stat(user_hostfile, &st) == 0) &&
328 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || 328 ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
329 (st.st_mode & 022) != 0)) { 329 (st.st_mode & 022) != 0)) {
330 log("Authentication refused for %.100s: " 330 log("Authentication refused for %.100s: "
331 "bad owner or modes for %.200s", 331 "bad owner or modes for %.200s",
332 pw->pw_name, user_hostfile); 332 pw->pw_name, user_hostfile);
@@ -399,7 +399,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
399 if (stat(buf, &st) < 0 || 399 if (stat(buf, &st) < 0 ||
400 (st.st_uid != 0 && st.st_uid != uid) || 400 (st.st_uid != 0 && st.st_uid != uid) ||
401 (st.st_mode & 022) != 0) { 401 (st.st_mode & 022) != 0) {
402 snprintf(err, errlen, 402 snprintf(err, errlen,
403 "bad ownership or modes for directory %s", buf); 403 "bad ownership or modes for directory %s", buf);
404 return -1; 404 return -1;
405 } 405 }