rpms/setools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Return None when no records match python setools.sesearch

Browse source
This commit is contained in:
Dan Walsh 2010-10-14 14:25:53 -04:00
commit 26a5d87ff2
2 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

55
setools-python.patch
View file

@ -1,6 +1,51 @@
diff -up setools-3.3.7/configure.ac.python setools-3.3.7/configure.ac
--- setools-3.3.7/configure.ac.python 2010-04-30 10:25:48.000000000 -0400
+++ setools-3.3.7/configure.ac 2010-07-30 15:02:10.000000000 -0400
@@ -194,7 +194,7 @@ AC_ARG_ENABLE(swig-java,
enable_jswig="$enableval")
if test "x${enable_jswig}" = xyes; then
if test ${do_swigify} = no; then
- AC_PROG_SWIG(1.3.28)
+ AC_PROG_SWIG(2.0.0)
fi
AC_JAVA_OPTIONS
if test "x$JAVAPREFIX" = x; then
@@ -216,21 +216,23 @@ if test "x${enable_jswig}" = xyes; then
do_swigify_java=yes
do_swigify=yes
fi
+
+AM_PATH_PYTHON(2.7)
+
AC_ARG_ENABLE(swig-python,
AC_HELP_STRING([--enable-swig-python],
[build SWIG interfaces for Python]),
enable_pyswig="$enableval")
if test "x${enable_pyswig}" = xyes; then
if test ${do_swigify} = no; then
- AC_PROG_SWIG(1.3.28)
+ AC_PROG_SWIG(2.0.0)
fi
- AM_PATH_PYTHON(2.3)
SWIG_PYTHON
do_swigify_python=yes
do_swigify=yes
fi
if test ${do_swigify} = "yes"; then
- AC_PROG_SWIG(1.3.28)
+ AC_PROG_SWIG(2.0.0)
fi
build_apol=yes
AC_ARG_ENABLE(swig-tcl,
@@ -239,7 +241,7 @@ AC_ARG_ENABLE(swig-tcl,
enable_tclswig="$enableval", enable_tclswig="yes")
if test "x${enable_tclswig}" = xyes; then
if test ${do_swigify} = no; then
- AC_PROG_SWIG(1.3.28)
+ AC_PROG_SWIG(2.0.0)
fi
TEA_INIT(3.5)
TEA_PATH_TCLCONFIG
@@ -888,6 +890,8 @@ AC_CONFIG_FILES([Makefile VERSION \
sediff/Makefile \
man/Makefile \
@ -2191,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 <tliu@redhat.com>
+
+/**
@ -2611,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);
@ -2626,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);