diff options
| author | Garrett D'Amore <garrett@damore.org> | 2012-06-09 17:38:51 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2012-06-09 17:38:51 -0700 |
| commit | 0c0855db3275acd1c398a13e8c056eae7672e682 (patch) | |
| tree | 1110e536740b482c0846d5fcb143842552e877fd /usr/src/lib/librestart/common/librestart.c | |
| parent | 3fb330b78c0911247d5eee86f7997a64a9a743e5 (diff) | |
| download | illumos-joyent-0c0855db3275acd1c398a13e8c056eae7672e682.tar.gz | |
Backed out changeset 33bb96bf701a (missing bugid)
Diffstat (limited to 'usr/src/lib/librestart/common/librestart.c')
| -rw-r--r-- | usr/src/lib/librestart/common/librestart.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr/src/lib/librestart/common/librestart.c b/usr/src/lib/librestart/common/librestart.c index 54fcafd6ce..7cf1d30e04 100644 --- a/usr/src/lib/librestart/common/librestart.c +++ b/usr/src/lib/librestart/common/librestart.c @@ -21,7 +21,6 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ #include <libintl.h> @@ -3334,10 +3333,6 @@ restarter_get_method_context(uint_t version, scf_instance_t *inst, * defaults that provide historic init behavior. */ if (mc_used == 0) { - free(cip->pwbuf); - free(cip->vbuf); - free(cip->working_dir); - (void) memset(cip, 0, sizeof (*cip)); cip->uid = 0; cip->gid = 0; @@ -3353,11 +3348,8 @@ out: scf_pg_destroy(instpg); scf_pg_destroy(methpg); - if (cip->pwbuf != NULL) { + if (cip->pwbuf != NULL) free(cip->pwbuf); - cip->pwbuf = NULL; - } - free(cip->vbuf); if (err->type != 0) { |