summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--misc.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eceadff85..e75e39785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - markus@cvs.openbsd.org 2001/06/16 08:57:35 9 - markus@cvs.openbsd.org 2001/06/16 08:57:35
10 [scp.c] 10 [scp.c]
11 no stdio or exit() in signal handlers. 11 no stdio or exit() in signal handlers.
12 - markus@cvs.openbsd.org 2001/06/16 08:58:34
13 [misc.c]
14 copy pw_expire and pw_change, too.
12 15
1320010615 1620010615
14 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL 17 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
@@ -5661,4 +5664,4 @@
5661 - Wrote replacements for strlcpy and mkdtemp 5664 - Wrote replacements for strlcpy and mkdtemp
5662 - Released 1.0pre1 5665 - Released 1.0pre1
5663 5666
5664$Id: ChangeLog,v 1.1291 2001/06/21 03:08:58 mouring Exp $ 5667$Id: ChangeLog,v 1.1292 2001/06/21 03:11:27 mouring Exp $
diff --git a/misc.c b/misc.c
index aa9d775f4..283e17ec2 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $ */ 1/* $OpenBSD: misc.c,v 1.11 2001/06/16 08:58:34 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $"); 28RCSID("$OpenBSD: misc.c,v 1.11 2001/06/16 08:58:34 markus Exp $");
29 29
30#include "misc.h" 30#include "misc.h"
31#include "log.h" 31#include "log.h"
@@ -131,6 +131,8 @@ pwcopy(struct passwd *pw)
131 copy->pw_gecos = xstrdup(pw->pw_gecos); 131 copy->pw_gecos = xstrdup(pw->pw_gecos);
132 copy->pw_uid = pw->pw_uid; 132 copy->pw_uid = pw->pw_uid;
133 copy->pw_gid = pw->pw_gid; 133 copy->pw_gid = pw->pw_gid;
134 copy->pw_expire = pw->pw_expire;
135 copy->pw_change = pw->pw_change;
134#ifdef HAVE_PW_CLASS_IN_PASSWD 136#ifdef HAVE_PW_CLASS_IN_PASSWD
135 copy->pw_class = xstrdup(pw->pw_class); 137 copy->pw_class = xstrdup(pw->pw_class);
136#endif 138#endif