diff --git a/setools-python.patch b/setools-python.patch index 31631f1..01cb56a 100644 --- a/setools-python.patch +++ b/setools-python.patch @@ -2236,8 +2236,8 @@ diff -up setools-3.3.7/python/setools/seinfo.c.python setools-3.3.7/python/setoo +} diff -up setools-3.3.7/python/setools/sesearch.c.python setools-3.3.7/python/setools/sesearch.c --- setools-3.3.7/python/setools/sesearch.c.python 2010-07-30 15:02:10.000000000 -0400 -+++ setools-3.3.7/python/setools/sesearch.c 2010-07-30 15:02:10.000000000 -0400 -@@ -0,0 +1,477 @@ ++++ setools-3.3.7/python/setools/sesearch.c 2010-10-14 11:04:53.000000000 -0400 +@@ -0,0 +1,479 @@ +// Author: Thomas Liu + +/** @@ -2656,6 +2656,7 @@ diff -up setools-3.3.7/python/setools/sesearch.c.python setools-3.3.7/python/set + goto cleanup; + } + if (v) { ++ printf("Dan 1\n"); + output = get_av_results(policy, &cmd_opts, v); + } + apol_vector_destroy(&v); @@ -2671,8 +2672,9 @@ diff -up setools-3.3.7/python/setools/sesearch.c.python setools-3.3.7/python/set + free(cmd_opts.tgt_role_name); + apol_vector_destroy(&cmd_opts.perm_vector); + apol_vector_destroy(&cmd_opts.class_vector); -+ -+ return output; ++ ++ if (output) return output; ++ return Py_None; +} +static int Dict_ContainsInt(PyObject *dict, const char *key){ + PyObject *item = PyDict_GetItemString(dict, key); diff --git a/setools.spec b/setools.spec index 92a9691..6d8e2b6 100644 --- a/setools.spec +++ b/setools.spec @@ -5,7 +5,7 @@ Name: setools Version: %{setools_maj_ver}.%{setools_min_ver} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 URL: http://oss.tresys.com/projects/setools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -353,6 +353,9 @@ rm -rf ${RPM_BUILD_ROOT} %postun libs-tcl -p /sbin/ldconfig %changelog +* Thu Oct 14 2010 Dan Walsh 3.3.6-8 +- Return None when no records match python setools.sesearch + * Thu Aug 19 2010 Dan Walsh 3.3.6-7 - Add range to ports in seinfo python