summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdladm/common/libdliptun.c
diff options
context:
space:
mode:
authorCathy Zhou <Cathy.Zhou@Sun.COM>2010-07-14 15:39:08 -0400
committerCathy Zhou <Cathy.Zhou@Sun.COM>2010-07-14 15:39:08 -0400
commit327151705b7439cb7ab35c370f682cac7ef9523a (patch)
treedc70b1e9458066faef68e56f0be54073920c112c /usr/src/lib/libdladm/common/libdliptun.c
parent442384bb4f40e4893df0a79549264f04218e1d9f (diff)
downloadillumos-joyent-327151705b7439cb7ab35c370f682cac7ef9523a.tar.gz
6953249 memory leak in dlmgmtd
6949971 dlmgmtd keeps consuming memory 6826131 dlmgmtd's parse_linkprops() suffers from memory mismanagement 6846855 vlan rcm support could use a code review
Diffstat (limited to 'usr/src/lib/libdladm/common/libdliptun.c')
-rw-r--r--usr/src/lib/libdladm/common/libdliptun.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/lib/libdladm/common/libdliptun.c b/usr/src/lib/libdladm/common/libdliptun.c
index f73c0d1ecb..21c4f5dbd1 100644
--- a/usr/src/lib/libdladm/common/libdliptun.c
+++ b/usr/src/lib/libdladm/common/libdliptun.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <assert.h>
@@ -252,9 +251,10 @@ i_iptun_get_dbparams(dladm_handle_t handle, iptun_params_t *params)
if (class != DATALINK_CLASS_IPTUN)
return (DLADM_STATUS_LINKINVAL);
- status = dladm_read_conf(handle, params->iptun_param_linkid, &conf);
- if (status != DLADM_STATUS_OK)
+ if ((status = dladm_getsnap_conf(handle, params->iptun_param_linkid,
+ &conf)) != DLADM_STATUS_OK) {
return (status);
+ }
params->iptun_param_flags = 0;
@@ -374,7 +374,7 @@ i_iptun_modify_db(dladm_handle_t handle, const iptun_params_t *params)
if (params->iptun_param_flags & ~(IPTUN_PARAM_LADDR|IPTUN_PARAM_RADDR))
return (DLADM_STATUS_BADARG);
- status = dladm_read_conf(handle, params->iptun_param_linkid, &conf);
+ status = dladm_open_conf(handle, params->iptun_param_linkid, &conf);
if (status != DLADM_STATUS_OK)
return (status);