- Upgrade to latest from NSA

Merged patch to optionally reduce disk usage by removing the backup module
    store and linked policy from Karl MacMillan
Merged patch to correctly propagate return values in libsemanage
This commit is contained in:
Daniel J Walsh 2007-01-25 22:48:00 +00:00
parent b91d944b4b
commit 4f442a2b56
4 changed files with 845 additions and 61 deletions

View File

@ -76,3 +76,4 @@ libsemanage-1.6.17.tgz
libsemanage-1.8.tgz
libsemanage-1.9.1.tgz
libsemanage-1.9.2.tgz
libsemanage-1.10.0.tgz

View File

@ -1,70 +1,852 @@
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-1.9.1/src/direct_api.c
--- nsalibsemanage/src/direct_api.c 2006-11-16 17:14:02.000000000 -0500
+++ libsemanage-1.9.1/src/direct_api.c 2006-12-22 11:36:55.000000000 -0500
@@ -603,7 +603,8 @@
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_python.i libsemanage-1.10.0/src/semanageswig_python.i
--- nsalibsemanage/src/semanageswig_python.i 2006-11-16 17:14:02.000000000 -0500
+++ libsemanage-1.10.0/src/semanageswig_python.i 2007-01-24 13:33:28.000000000 -0500
@@ -99,7 +99,7 @@
%apply int *OUTPUT { size_t * };
%apply int *OUTPUT { unsigned int * };
/* Create new policy object, then attach to policy databases
* that work with a policydb */
- if (semanage_expand_sandbox(sh, base, &out) < 0)
+ retval = semanage_expand_sandbox(sh, base, &out);
+ if (retval < 0)
goto cleanup;
-%typemap(in, numinputs=0) char **(char *temp) {
+%typemap(in, numinputs=0) char **(char *temp=NULL) {
$1 = &temp;
}
dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +616,16 @@
@@ -108,7 +108,7 @@
free(*$1);
}
/* ============= Apply changes, and verify =============== */
-%typemap(in, numinputs=0) char ***(char **temp) {
+%typemap(in, numinputs=0) char ***(char **temp=NULL) {
$1 = &temp;
}
- if (semanage_base_merge_components(sh) < 0)
+ retval = semanage_base_merge_components(sh);
+ if (retval < 0)
goto cleanup;
-
- if (semanage_write_policydb(sh, out) < 0)
+
+ retval = semanage_write_policydb(sh, out);
+ if (retval < 0)
goto cleanup;
-
- if (semanage_verify_kernel(sh) != 0)
+
+ retval = semanage_verify_kernel(sh);
+ if (retval < 0)
goto cleanup;
@@ -136,7 +136,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_module_info_t ** parameter */
-%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp) {
+%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp=NULL) {
$1 = &temp;
}
@@ -148,7 +148,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_context_t ** parameter */
-%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp) {
+%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp=NULL) {
$1 = &temp;
}
@@ -160,7 +160,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_bool_t *** parameter */
-%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp) {
+%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp=NULL) {
$1 = &temp;
}
@@ -183,7 +183,7 @@
}
}
@@ -635,26 +639,30 @@
* merged into the main file_contexts. We won't check the
* large file_contexts - checked at compile time */
if (sh->do_rebuild || modified || fcontexts_modified) {
- if (semanage_fcontext_validate_local(sh, out) < 0)
+ retval = semanage_fcontext_validate_local(sh, out);
+ if (retval < 0)
goto cleanup;
-%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp) {
+%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp=NULL) {
$1 = &temp;
}
@@ -195,7 +195,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp) {
+%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp=NULL) {
$1 = &temp;
}
@@ -203,7 +203,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_fcontext_t *** parameter */
-%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp) {
+%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp=NULL) {
$1 = &temp;
}
@@ -226,7 +226,7 @@
}
}
/* Validate local seusers against policy */
if (sh->do_rebuild || modified || seusers_modified) {
- if (semanage_seuser_validate_local(sh, out) < 0)
+ retval = semanage_seuser_validate_local(sh, out);
+ if (retval < 0)
goto cleanup;
-%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp) {
+%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp=NULL) {
$1 = &temp;
}
@@ -238,7 +238,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp) {
+%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp=NULL) {
$1 = &temp;
}
@@ -246,7 +246,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_iface_t *** parameter */
-%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp) {
+%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp=NULL) {
$1 = &temp;
}
@@ -270,7 +270,7 @@
}
}
/* Validate local ports for overlap */
if (sh->do_rebuild || ports_modified) {
- if (semanage_port_validate_local(sh) < 0)
+ retval = semanage_port_validate_local(sh);
+ if (retval < 0)
goto cleanup;
-%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp) {
+%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp=NULL) {
$1 = &temp;
}
@@ -282,7 +282,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp) {
+%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp=NULL) {
$1 = &temp;
}
@@ -290,7 +290,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_seuser_t *** parameter */
-%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp) {
+%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp=NULL) {
$1 = &temp;
}
@@ -314,7 +314,7 @@
}
}
/* ================== Write non-policydb components ========= */
-%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp) {
+%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp=NULL) {
$1 = &temp;
}
/* Commit changes to components */
- if (semanage_commit_components(sh) < 0)
+ retval = semanage_commit_components(sh);
+ if (retval < 0)
goto cleanup;
@@ -326,7 +326,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
retval = semanage_install_sandbox(sh);
-%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp) {
+%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp=NULL) {
$1 = &temp;
}
@@ -334,7 +334,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_user_t *** parameter */
-%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp) {
+%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp=NULL) {
$1 = &temp;
}
@@ -357,7 +357,7 @@
}
}
-%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp) {
+%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp=NULL) {
$1 = &temp;
}
@@ -369,7 +369,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp) {
+%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp=NULL) {
$1 = &temp;
}
@@ -377,7 +377,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_port_t *** parameter */
-%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp) {
+%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp=NULL) {
$1 = &temp;
}
@@ -400,7 +400,7 @@
}
}
-%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp) {
+%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp=NULL) {
$1 = &temp;
}
@@ -412,7 +412,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp) {
+%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp=NULL) {
$1 = &temp;
}
@@ -420,7 +420,7 @@
/* the wrapper will setup this parameter for passing... the resulting python functions
will not take the semanage_node_t *** parameter */
-%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp) {
+%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp=NULL) {
$1 = &temp;
}
@@ -443,7 +443,7 @@
}
}
-%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp) {
+%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp=NULL) {
$1 = &temp;
}
@@ -456,7 +456,7 @@
$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
}
-%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp) {
+%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp=NULL) {
$1 = &temp;
}
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_wrap.c libsemanage-1.10.0/src/semanageswig_wrap.c
--- nsalibsemanage/src/semanageswig_wrap.c 2006-11-16 17:14:02.000000000 -0500
+++ libsemanage-1.10.0/src/semanageswig_wrap.c 2007-01-24 13:34:03.000000000 -0500
@@ -3528,7 +3528,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_module_info_t *temp2 ;
+ semanage_module_info_t *temp2 = NULL ;
int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -3923,7 +3923,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_context_t *temp2 ;
+ semanage_context_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -3956,7 +3956,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_context_t *temp3 ;
+ semanage_context_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4017,7 +4017,7 @@
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- semanage_context_t *temp3 ;
+ semanage_context_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4058,7 +4058,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4099,7 +4099,7 @@
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- semanage_bool_key_t *temp3 ;
+ semanage_bool_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4140,7 +4140,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_bool_key_t *temp3 ;
+ semanage_bool_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4376,7 +4376,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_bool_t *temp2 ;
+ semanage_bool_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -4409,7 +4409,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_bool_t *temp3 ;
+ semanage_bool_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4469,7 +4469,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_bool_t *temp3 ;
+ semanage_bool_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4616,7 +4616,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_bool_t **temp2 ;
+ semanage_bool_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -4734,7 +4734,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_bool_t *temp3 ;
+ semanage_bool_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -4881,7 +4881,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_bool_t **temp2 ;
+ semanage_bool_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -4968,7 +4968,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_bool_t *temp3 ;
+ semanage_bool_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5115,7 +5115,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_bool_t **temp2 ;
+ semanage_bool_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -5225,7 +5225,7 @@
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- semanage_iface_key_t *temp3 ;
+ semanage_iface_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5266,7 +5266,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_iface_key_t *temp3 ;
+ semanage_iface_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5512,7 +5512,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_iface_t *temp2 ;
+ semanage_iface_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -5545,7 +5545,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_iface_t *temp3 ;
+ semanage_iface_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5676,7 +5676,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_iface_t *temp3 ;
+ semanage_iface_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -5823,7 +5823,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_iface_t **temp2 ;
+ semanage_iface_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -5870,7 +5870,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_iface_t *temp3 ;
+ semanage_iface_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -6017,7 +6017,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_iface_t **temp2 ;
+ semanage_iface_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -6065,7 +6065,7 @@
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- semanage_user_key_t *temp3 ;
+ semanage_user_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -6106,7 +6106,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_user_key_t *temp3 ;
+ semanage_user_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -6621,7 +6621,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char **temp3 ;
+ char **temp3 = NULL ;
unsigned int temp4 ;
int res4 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -6675,7 +6675,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
unsigned int val4 ;
int ecode4 = 0 ;
PyObject * obj0 = 0 ;
@@ -6720,7 +6720,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_user_t *temp2 ;
+ semanage_user_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -6753,7 +6753,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_user_t *temp3 ;
+ semanage_user_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -6884,7 +6884,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_user_t *temp3 ;
+ semanage_user_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -7031,7 +7031,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_user_t **temp2 ;
+ semanage_user_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -7078,7 +7078,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_user_t *temp3 ;
+ semanage_user_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -7225,7 +7225,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_user_t **temp2 ;
+ semanage_user_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -7340,7 +7340,7 @@
int ecode3 = 0 ;
int val4 ;
int ecode4 = 0 ;
- semanage_port_key_t *temp5 ;
+ semanage_port_key_t *temp5 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -7391,7 +7391,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_port_key_t *temp3 ;
+ semanage_port_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -7697,7 +7697,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_port_t *temp2 ;
+ semanage_port_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -7730,7 +7730,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_port_t *temp3 ;
+ semanage_port_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -7861,7 +7861,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_port_t *temp3 ;
+ semanage_port_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8008,7 +8008,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_port_t **temp2 ;
+ semanage_port_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -8055,7 +8055,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_port_t *temp3 ;
+ semanage_port_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8202,7 +8202,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_port_t **temp2 ;
+ semanage_port_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -8315,7 +8315,7 @@
int alloc2 = 0 ;
int val3 ;
int ecode3 = 0 ;
- semanage_fcontext_key_t *temp4 ;
+ semanage_fcontext_key_t *temp4 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -8362,7 +8362,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_fcontext_key_t *temp3 ;
+ semanage_fcontext_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8620,7 +8620,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_fcontext_t *temp2 ;
+ semanage_fcontext_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -8653,7 +8653,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_fcontext_t *temp3 ;
+ semanage_fcontext_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8784,7 +8784,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_fcontext_t *temp3 ;
+ semanage_fcontext_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8931,7 +8931,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_fcontext_t **temp2 ;
+ semanage_fcontext_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -8978,7 +8978,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_fcontext_t *temp3 ;
+ semanage_fcontext_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9125,7 +9125,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_fcontext_t **temp2 ;
+ semanage_fcontext_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -9173,7 +9173,7 @@
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- semanage_seuser_key_t *temp3 ;
+ semanage_seuser_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9214,7 +9214,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_seuser_key_t *temp3 ;
+ semanage_seuser_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9528,7 +9528,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_seuser_t *temp2 ;
+ semanage_seuser_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -9561,7 +9561,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_seuser_t *temp3 ;
+ semanage_seuser_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9692,7 +9692,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_seuser_t *temp3 ;
+ semanage_seuser_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9839,7 +9839,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_seuser_t **temp2 ;
+ semanage_seuser_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -9886,7 +9886,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_seuser_t *temp3 ;
+ semanage_seuser_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10033,7 +10033,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_seuser_t **temp2 ;
+ semanage_seuser_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -10150,7 +10150,7 @@
int alloc3 = 0 ;
int val4 ;
int ecode4 = 0 ;
- semanage_node_key_t *temp5 ;
+ semanage_node_key_t *temp5 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -10205,7 +10205,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_node_key_t *temp3 ;
+ semanage_node_key_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10265,7 +10265,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10306,7 +10306,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
size_t temp4 ;
int res4 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -10459,7 +10459,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10500,7 +10500,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- char *temp3 ;
+ char *temp3 = NULL ;
size_t temp4 ;
int res4 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -10786,7 +10786,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_node_t *temp2 ;
+ semanage_node_t *temp2 = NULL ;
PyObject * obj0 = 0 ;
{
@@ -10819,7 +10819,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_node_t *temp3 ;
+ semanage_node_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -10950,7 +10950,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_node_t *temp3 ;
+ semanage_node_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -11097,7 +11097,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_node_t **temp2 ;
+ semanage_node_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;
@@ -11144,7 +11144,7 @@
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
- semanage_node_t *temp3 ;
+ semanage_node_t *temp3 = NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -11291,7 +11291,7 @@
int result;
void *argp1 = 0 ;
int res1 = 0 ;
- semanage_node_t **temp2 ;
+ semanage_node_t **temp2 = NULL ;
unsigned int temp3 ;
int res3 = SWIG_TMPOBJ ;
PyObject * obj0 = 0 ;

View File

@ -1,12 +1,13 @@
%define libsepolver 1.14-1
%define libselinuxver 1.32-1
%define libsepolver 1.16.0-1
%define libselinuxver 1.34-1
Summary: SELinux binary policy manipulation library
Name: libsemanage
Version: 1.9.2
Release: 1%{?dist}
Version: 1.10.0
Release: 2%{?dist}
License: GPL
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
Patch: libsemanage-rhat.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: libselinux-devel >= %{libselinuxver} swig

View File

@ -1 +1 @@
c5bf4a31d5b39958587cec079c93cfee libsemanage-1.9.2.tgz
10c452bcc81cba31f63270ffbec1835f libsemanage-1.10.0.tgz