Deleted Added
sdiff udiff text old ( 124208 ) new ( 137015 )
full compact
auth2-none.c (124208) auth2-none.c (137015)
1/*
2 * Copyright (c) 2000 Markus Friedl. 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 unchanged lines hidden (view full) ---

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#include "includes.h"
1/*
2 * Copyright (c) 2000 Markus Friedl. 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 unchanged lines hidden (view full) ---

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#include "includes.h"
26RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $");
26RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $");
27
28#include "auth.h"
29#include "xmalloc.h"
30#include "packet.h"
31#include "log.h"
32#include "servconf.h"
33#include "atomicio.h"
34#include "compat.h"

--- 6 unchanged lines hidden (view full) ---

41/* "none" is allowed only one time */
42static int none_enabled = 1;
43
44char *
45auth2_read_banner(void)
46{
47 struct stat st;
48 char *banner = NULL;
27
28#include "auth.h"
29#include "xmalloc.h"
30#include "packet.h"
31#include "log.h"
32#include "servconf.h"
33#include "atomicio.h"
34#include "compat.h"

--- 6 unchanged lines hidden (view full) ---

41/* "none" is allowed only one time */
42static int none_enabled = 1;
43
44char *
45auth2_read_banner(void)
46{
47 struct stat st;
48 char *banner = NULL;
49 off_t len, n;
49 size_t len, n;
50 int fd;
51
52 if ((fd = open(options.banner, O_RDONLY)) == -1)
53 return (NULL);
54 if (fstat(fd, &st) == -1) {
55 close(fd);
56 return (NULL);
57 }
50 int fd;
51
52 if ((fd = open(options.banner, O_RDONLY)) == -1)
53 return (NULL);
54 if (fstat(fd, &st) == -1) {
55 close(fd);
56 return (NULL);
57 }
58 len = st.st_size;
58 if (st.st_size > 1*1024*1024) {
59 close(fd);
60 return (NULL);
61 }
62
63 len = (size_t)st.st_size; /* truncate */
59 banner = xmalloc(len + 1);
60 n = atomicio(read, fd, banner, len);
61 close(fd);
62
63 if (n != len) {
64 xfree(banner);
65 return (NULL);
66 }

--- 46 unchanged lines hidden --- 		64 banner = xmalloc(len + 1);
65 n = atomicio(read, fd, banner, len);
66 close(fd);
67
68 if (n != len) {
69 xfree(banner);
70 return (NULL);
71 }

--- 46 unchanged lines hidden ---