Author: jamie
Date: Wed Nov 3 15:54:50 2010
New Revision: 214747
URL: http://svn.freebsd.org/changeset/base/214747
Log:
MFC 214434:
Find a jail's type as part of jailparam_init rather than waiting until
it's absolutely necessary.
Modified:
stable/8/lib/libjail/jail.c
Directory Properties:
stable/8/lib/libjail/ (props changed)
Modified: stable/8/lib/libjail/jail.c
==============================================================================
--- stable/8/lib/libjail/jail.c Wed Nov 3 15:38:52 2010 (r214746)
+++ stable/8/lib/libjail/jail.c Wed Nov 3 15:54:50 2010 (r214747)
@@ -250,10 +250,6 @@ jailparam_all(struct jailparam **jpp)
}
if (jailparam_init(jp + njp, buf + sizeof(SJPARAM)) < 0)
goto error;
- if (jailparam_type(jp + njp) < 0) {
- njp++;
- goto error;
- }
mib1[1] = 2;
}
jp = realloc(jp, njp * sizeof(*jp));
@@ -279,6 +275,10 @@ jailparam_init(struct jailparam *jp, con
strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN);
return (-1);
}
+ if (jailparam_type(jp) < 0) {
+ jailparam_free(jp, 1);
+ return (-1);
+ }
return (0);
}
@@ -293,8 +293,6 @@ jailparam_import(struct jailparam *jp, c
const char *avalue;
int i, nval, fw;
- if (!jp->jp_ctltype && jailparam_type(jp) < 0)
- return (-1);
if (value == NULL)
return (0);
if ((jp->jp_ctltype & CTLTYPE) == CTLTYPE_STRING) {
@@ -563,8 +561,6 @@ jailparam_get(struct jailparam *jp, unsi
jp_lastjid = jp_jid = jp_name = NULL;
arrays = 0;
for (ai = j = 0; j < njp; j++) {
- if (!jp[j].jp_ctltype && jailparam_type(jp + j) < 0)
- return (-1);
if (!strcmp(jp[j].jp_name, "lastjid"))
jp_lastjid = jp + j;
else if (!strcmp(jp[j].jp_name, "jid"))
@@ -725,8 +721,6 @@ jailparam_export(struct jailparam *jp)
int i, nval, ival;
char valbuf[INET6_ADDRSTRLEN];
- if (!jp->jp_ctltype && jailparam_type(jp) < 0)
- return (NULL);
if ((jp->jp_ctltype & CTLTYPE) == CTLTYPE_STRING) {
value = strdup(jp->jp_value);
if (value == NULL)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
