- Return None when no records match python setools.sesearch

This commit is contained in:
Dan Walsh 2010-10-14 14:23:42 -04:00
commit fe565f16db
2 changed files with 10 additions and 5 deletions

View file

@ -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 <tliu@redhat.com>
+
+/**
@ -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);