summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dns.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d192ae418..7396fe09d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,9 @@
92 - deraadt@cvs.openbsd.org 2006/03/20 18:35:12 92 - deraadt@cvs.openbsd.org 2006/03/20 18:35:12
93 [channels.c] 93 [channels.c]
94 x11_fake_data is only ever used as u_char * 94 x11_fake_data is only ever used as u_char *
95 - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
96 [dns.c]
97 cast xstrdup to propert u_char *
95 98
9620060325 9920060325
97 - OpenBSD CVS Sync 100 - OpenBSD CVS Sync
@@ -4349,4 +4352,4 @@
4349 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4352 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4350 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4353 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4351 4354
4352$Id: ChangeLog,v 1.4268 2006/03/26 03:08:10 djm Exp $ 4355$Id: ChangeLog,v 1.4269 2006/03/26 03:09:09 djm Exp $
diff --git a/dns.c b/dns.c
index ecb897703..83d4d895a 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.17 2006/03/19 18:51:18 deraadt Exp $ */ 1/* $OpenBSD: dns.c,v 1.18 2006/03/20 18:41:43 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.