diff options
| author | obrien <obrien@FreeBSD.org> | 1999-06-23 23:40:02 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-06-23 23:40:02 +0000 |
| commit | 93376754d29dbc109941080b675b72b34ed55afc (patch) | |
| tree | 3515ac6c4cbd8565ea4c1e1d664479a9a13b4f12 /contrib/isc-dhcp/common/memory.c | |
| parent | 35d9b239158e4d5cc794b91f864d4851c9411ba5 (diff) | |
| parent | bb7cda744509ca00fdfaacff74526af8928253b4 (diff) | |
| download | FreeBSD-src-93376754d29dbc109941080b675b72b34ed55afc.zip FreeBSD-src-93376754d29dbc109941080b675b72b34ed55afc.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r48146,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/isc-dhcp/common/memory.c')
| -rw-r--r-- | contrib/isc-dhcp/common/memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/isc-dhcp/common/memory.c b/contrib/isc-dhcp/common/memory.c index 871fe07..c293217 100644 --- a/contrib/isc-dhcp/common/memory.c +++ b/contrib/isc-dhcp/common/memory.c @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: memory.c,v 1.35.2.3 1998/11/24 22:32:43 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; +"$Id: memory.c,v 1.35.2.4 1999/05/27 17:47:43 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -527,7 +527,6 @@ int supersede_lease (comp, lease, commit) /* Copy the data files, but not the linkages. */ comp -> starts = lease -> starts; - comp -> timestamp = lease -> timestamp; if (lease -> uid) { if (lease -> uid_len < sizeof (lease -> uid_buf)) { memcpy (comp -> uid_buf, |
