29ad08b8d0
the use of the non-standard format %as. (original patch changed for
style).
Merged patch from Todd Miller to fix memory leak in matchpathcon.c.
Fri Jan 19 2007 Dan Walsh <dwalsh@redhat.com> - 1.34.0-2
- Add context function to python to split context into 4 parts
189 lines
4.3 KiB
Diff
189 lines
4.3 KiB
Diff
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.34.0/src/selinuxswig.i
|
|
--- nsalibselinux/src/selinuxswig.i 2007-01-26 16:19:52.000000000 -0500
|
|
+++ libselinux-1.34.0/src/selinuxswig.i 2007-01-24 13:37:27.000000000 -0500
|
|
@@ -28,7 +28,7 @@
|
|
%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) {
|
|
$1 = &temp;
|
|
}
|
|
-%typemap(argout) security_context_t * (char *temp) {
|
|
+%typemap(argout) security_context_t * (char *temp=NULL) {
|
|
if (*$1)
|
|
temp = *$1;
|
|
else
|
|
@@ -126,7 +126,7 @@
|
|
extern int selinux_raw_to_trans_context(char *raw,
|
|
security_context_t *transp);
|
|
|
|
-%typemap(in, numinputs=0) char **(char *temp) {
|
|
+%typemap(in, numinputs=0) char **(char *temp=NULL) {
|
|
$1 = &temp;
|
|
}
|
|
|
|
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.34.0/src/selinuxswig_wrap.c
|
|
--- nsalibselinux/src/selinuxswig_wrap.c 2007-01-26 16:19:52.000000000 -0500
|
|
+++ libselinux-1.34.0/src/selinuxswig_wrap.c 2007-01-24 13:38:47.000000000 -0500
|
|
@@ -2832,7 +2832,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -2879,7 +2879,7 @@
|
|
int val1 ;
|
|
int ecode1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -2911,7 +2911,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -2937,7 +2937,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -2981,7 +2981,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -3025,7 +3025,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -3069,7 +3069,7 @@
|
|
security_context_t *arg1 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp1 = NULL ;
|
|
- char *temp10 ;
|
|
+ char *temp10 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -3117,7 +3117,7 @@
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -3155,7 +3155,7 @@
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -3192,7 +3192,7 @@
|
|
int val1 ;
|
|
int ecode1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -3314,7 +3314,7 @@
|
|
int val1 ;
|
|
int ecode1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -3475,7 +3475,7 @@
|
|
security_context_t *arg2 = (security_context_t *) 0 ;
|
|
int result;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -3735,7 +3735,7 @@
|
|
unsigned int val2 ;
|
|
int ecode2 = 0 ;
|
|
security_context_t temp3 = NULL ;
|
|
- char *temp30 ;
|
|
+ char *temp30 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
PyObject * obj1 = 0 ;
|
|
|
|
@@ -3779,7 +3779,7 @@
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -4213,7 +4213,7 @@
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -4251,7 +4251,7 @@
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
security_context_t temp2 = NULL ;
|
|
- char *temp20 ;
|
|
+ char *temp20 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|
|
@@ -4284,7 +4284,7 @@
|
|
PyObject *resultobj = 0;
|
|
char **arg1 = (char **) 0 ;
|
|
int result;
|
|
- char *temp1 ;
|
|
+ char *temp1 = NULL ;
|
|
|
|
{
|
|
arg1 = &temp1;
|
|
@@ -4310,8 +4310,8 @@
|
|
int res1 ;
|
|
char *buf1 = 0 ;
|
|
int alloc1 = 0 ;
|
|
- char *temp2 ;
|
|
- char *temp3 ;
|
|
+ char *temp2 = NULL ;
|
|
+ char *temp3 = NULL ;
|
|
PyObject * obj0 = 0 ;
|
|
|
|
{
|