diff options
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.101 2013/02/06 00:22:21 dtucker Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.102 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -165,17 +165,17 @@ allowed_user(struct passwd * pw) | |||
165 | if (stat(shell, &st) != 0) { | 165 | if (stat(shell, &st) != 0) { |
166 | logit("User %.100s not allowed because shell %.100s " | 166 | logit("User %.100s not allowed because shell %.100s " |
167 | "does not exist", pw->pw_name, shell); | 167 | "does not exist", pw->pw_name, shell); |
168 | xfree(shell); | 168 | free(shell); |
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |
171 | if (S_ISREG(st.st_mode) == 0 || | 171 | if (S_ISREG(st.st_mode) == 0 || |
172 | (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { | 172 | (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { |
173 | logit("User %.100s not allowed because shell %.100s " | 173 | logit("User %.100s not allowed because shell %.100s " |
174 | "is not executable", pw->pw_name, shell); | 174 | "is not executable", pw->pw_name, shell); |
175 | xfree(shell); | 175 | free(shell); |
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | xfree(shell); | 178 | free(shell); |
179 | } | 179 | } |
180 | 180 | ||
181 | if (options.num_deny_users > 0 || options.num_allow_users > 0 || | 181 | if (options.num_deny_users > 0 || options.num_allow_users > 0 || |
@@ -355,7 +355,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
355 | i = snprintf(ret, sizeof(ret), "%s/%s", pw->pw_dir, file); | 355 | i = snprintf(ret, sizeof(ret), "%s/%s", pw->pw_dir, file); |
356 | if (i < 0 || (size_t)i >= sizeof(ret)) | 356 | if (i < 0 || (size_t)i >= sizeof(ret)) |
357 | fatal("expand_authorized_keys: path too long"); | 357 | fatal("expand_authorized_keys: path too long"); |
358 | xfree(file); | 358 | free(file); |
359 | return (xstrdup(ret)); | 359 | return (xstrdup(ret)); |
360 | } | 360 | } |
361 | 361 | ||
@@ -397,7 +397,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host, | |||
397 | load_hostkeys(hostkeys, host, user_hostfile); | 397 | load_hostkeys(hostkeys, host, user_hostfile); |
398 | restore_uid(); | 398 | restore_uid(); |
399 | } | 399 | } |
400 | xfree(user_hostfile); | 400 | free(user_hostfile); |
401 | } | 401 | } |
402 | host_status = check_key_in_hostkeys(hostkeys, key, &found); | 402 | host_status = check_key_in_hostkeys(hostkeys, key, &found); |
403 | if (host_status == HOST_REVOKED) | 403 | if (host_status == HOST_REVOKED) |
@@ -666,7 +666,7 @@ auth_key_is_revoked(Key *key) | |||
666 | key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 666 | key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
667 | error("WARNING: authentication attempt with a revoked " | 667 | error("WARNING: authentication attempt with a revoked " |
668 | "%s key %s ", key_type(key), key_fp); | 668 | "%s key %s ", key_type(key), key_fp); |
669 | xfree(key_fp); | 669 | free(key_fp); |
670 | return 1; | 670 | return 1; |
671 | } | 671 | } |
672 | fatal("key_in_file returned junk"); | 672 | fatal("key_in_file returned junk"); |
@@ -697,7 +697,7 @@ auth_debug_send(void) | |||
697 | while (buffer_len(&auth_debug)) { | 697 | while (buffer_len(&auth_debug)) { |
698 | msg = buffer_get_string(&auth_debug, NULL); | 698 | msg = buffer_get_string(&auth_debug, NULL); |
699 | packet_send_debug("%s", msg); | 699 | packet_send_debug("%s", msg); |
700 | xfree(msg); | 700 | free(msg); |
701 | } | 701 | } |
702 | } | 702 | } |
703 | 703 | ||