2007-02-13 13:01:46 +00:00
|
|
|
--- setools-3.1/libqpol/src/policy_parse.y.rhat 2007-02-13 07:06:55.000000000 -0500
|
|
|
|
|
+++ setools-3.1/libqpol/src/policy_parse.y 2007-02-13 07:11:30.000000000 -0500
|
|
|
|
|
@@ -1098,11 +1098,11 @@
|
|
|
|
|
ret = hashtab_insert(policydbp->p_commons.table,
|
|
|
|
|
(hashtab_key_t) id, (hashtab_datum_t) comdatum);
|
2006-10-26 19:38:13 +00:00
|
|
|
|
2007-02-13 13:01:46 +00:00
|
|
|
- if (ret == HASHTAB_PRESENT) {
|
|
|
|
|
+ if (ret == SEPOL_EEXIST) {
|
|
|
|
|
yyerror("duplicate common definition");
|
|
|
|
|
goto bad;
|
|
|
|
|
}
|
|
|
|
|
- if (ret == HASHTAB_OVERFLOW) {
|
|
|
|
|
+ if (ret == SEPOL_ENOMEM) {
|
|
|
|
|
yyerror("hash table overflow");
|
|
|
|
|
goto bad;
|
|
|
|
|
}
|
|
|
|
|
@@ -1130,14 +1130,14 @@
|
|
|
|
|
(hashtab_key_t) perm,
|
|
|
|
|
(hashtab_datum_t) perdatum);
|
2006-10-26 19:38:13 +00:00
|
|
|
|
2007-02-13 13:01:46 +00:00
|
|
|
- if (ret == HASHTAB_PRESENT) {
|
|
|
|
|
+ if (ret == SEPOL_EEXIST) {
|
|
|
|
|
sprintf(errormsg,
|
|
|
|
|
"duplicate permission %s in common %s", perm,
|
|
|
|
|
id);
|
|
|
|
|
yyerror(errormsg);
|
|
|
|
|
goto bad_perm;
|
|
|
|
|
}
|
|
|
|
|
- if (ret == HASHTAB_OVERFLOW) {
|
|
|
|
|
+ if (ret == SEPOL_ENOMEM) {
|
|
|
|
|
yyerror("hash table overflow");
|
|
|
|
|
goto bad_perm;
|
|
|
|
|
}
|
|
|
|
|
@@ -1259,12 +1259,12 @@
|
|
|
|
|
(hashtab_key_t) id,
|
|
|
|
|
(hashtab_datum_t) perdatum);
|
|
|
|
|
|
|
|
|
|
- if (ret == HASHTAB_PRESENT) {
|
|
|
|
|
+ if (ret == SEPOL_EEXIST) {
|
|
|
|
|
sprintf(errormsg, "duplicate permission %s", id);
|
|
|
|
|
yyerror(errormsg);
|
|
|
|
|
goto bad;
|
|
|
|
|
}
|
|
|
|
|
- if (ret == HASHTAB_OVERFLOW) {
|
|
|
|
|
+ if (ret == SEPOL_ENOMEM) {
|
|
|
|
|
yyerror("hash table overflow");
|
|
|
|
|
goto bad;
|
|
|
|
|
}
|
|
|
|
|
--- setools-3.1/libqpol/src/policy_extend.c.rhat 2007-02-07 14:16:52.000000000 -0500
|
|
|
|
|
+++ setools-3.1/libqpol/src/policy_extend.c 2007-02-13 07:09:29.000000000 -0500
|
|
|
|
|
@@ -167,7 +167,7 @@
|
|
|
|
|
|
|
|
|
|
retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type);
|
|
|
|
|
if (retv) {
|
|
|
|
|
- if (retv == HASHTAB_OVERFLOW)
|
|
|
|
|
+ if (retv == SEPOL_ENOMEM)
|
|
|
|
|
error = db->p_types.table ? ENOMEM : EINVAL;
|
|
|
|
|
else
|
|
|
|
|
error = EEXIST;
|
|
|
|
|
@@ -243,7 +243,7 @@
|
|
|
|
|
|
|
|
|
|
retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type);
|
|
|
|
|
if (retv) {
|
|
|
|
|
- if (retv == HASHTAB_OVERFLOW)
|
|
|
|
|
+ if (retv == SEPOL_ENOMEM)
|
|
|
|
|
error = db->p_types.table ? ENOMEM : EINVAL;
|
|
|
|
|
else
|
|
|
|
|
error = EEXIST;
|
|
|
|
|
--- setools-3.1/configure.ac.rhat 2007-02-07 10:48:44.000000000 -0500
|
|
|
|
|
+++ setools-3.1/configure.ac 2007-02-13 07:00:41.000000000 -0500
|
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
|
libseaudit_version=4.0.0
|
|
|
|
|
libseaudit_soname=libseaudit.so.4
|
|
|
|
|
|
|
|
|
|
-setoolsdir='${prefix}/share/setools-3.1'
|
2006-10-26 19:38:13 +00:00
|
|
|
+setoolsdir='${prefix}/share/setools'
|
|
|
|
|
|
|
|
|
|
version_min_sepol_major=1
|
|
|
|
|
version_min_sepol_minor=12
|
2007-02-13 13:01:46 +00:00
|
|
|
@@ -88,6 +88,7 @@
|
2006-10-30 18:27:11 +00:00
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT(disabled)
|
|
|
|
|
fi
|
|
|
|
|
+AC_SUBST(YFLAGS)
|
|
|
|
|
AC_SUBST(DEBUGCFLAGS)
|
|
|
|
|
AC_SUBST(DEBUGLDFLAGS)
|
|
|
|
|
QPOL_CFLAGS='-I$(top_srcdir)/libqpol/include'
|
2007-02-13 13:01:46 +00:00
|
|
|
@@ -227,7 +228,10 @@
|
2006-10-26 20:28:43 +00:00
|
|
|
AC_SUBST(BWIDGET_DESTDIR)
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
- copy_bwidget=no
|
|
|
|
|
+
|
2006-10-26 20:56:02 +00:00
|
|
|
+ BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/"
|
2006-10-26 20:28:43 +00:00
|
|
|
+ AC_SUBST(BWIDGET_DESTDIR)
|
|
|
|
|
+ copy_bwidget=yes
|
|
|
|
|
bwidget_ver=1.8
|
|
|
|
|
fi
|
|
|
|
|
|
