Menu
▾
▴
[Selinux-commits] SF.net SVN: selinux: [2834] branches/stable/1_0
|
From: <ssm...@us...> - 2008-03-04 18:34:16
|
Revision: 2834
http://selinux.svn.sourceforge.net/selinux/?rev=2834&view=rev
Author: ssmalley
Date: 2008-03-04 10:34:07 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
applied r2830:2831 from trunk
Modified Paths:
--------------
branches/stable/1_0/checkpolicy/checkmodule.c
branches/stable/1_0/checkpolicy/checkpolicy.c
branches/stable/1_0/checkpolicy/test/dismod.c
branches/stable/1_0/checkpolicy/test/dispol.c
branches/stable/1_0/libsepol/include/sepol/policydb/policydb.h
branches/stable/1_0/libsepol/src/genbools.c
branches/stable/1_0/libsepol/src/module.c
branches/stable/1_0/libsepol/src/policydb.c
branches/stable/1_0/libsepol/src/policydb_convert.c
branches/stable/1_0/libsepol/src/services.c
Modified: branches/stable/1_0/checkpolicy/checkmodule.c
===================================================================
--- branches/stable/1_0/checkpolicy/checkmodule.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/checkpolicy/checkmodule.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -71,6 +71,7 @@
fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno));
return -1;
}
+ policy_file_init(&f);
f.type = PF_USE_MEMORY;
f.data = map;
f.len = sb.st_size;
@@ -124,6 +125,7 @@
p->policyvers = policyvers;
p->handle_unknown = handle_unknown;
+ policy_file_init(&pf);
pf.type = PF_USE_STDIO;
pf.fp = outfp;
ret = policydb_write(p, &pf);
Modified: branches/stable/1_0/checkpolicy/checkpolicy.c
===================================================================
--- branches/stable/1_0/checkpolicy/checkpolicy.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/checkpolicy/checkpolicy.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -489,6 +489,7 @@
file, strerror(errno));
exit(1);
}
+ policy_file_init(&pf);
pf.type = PF_USE_MEMORY;
pf.data = map;
pf.len = sb.st_size;
@@ -577,6 +578,7 @@
policydb.policy_type = POLICY_KERN;
policydb.policyvers = policyvers;
+ policy_file_init(&pf);
pf.type = PF_USE_STDIO;
pf.fp = outfp;
ret = policydb_write(&policydb, &pf);
Modified: branches/stable/1_0/checkpolicy/test/dismod.c
===================================================================
--- branches/stable/1_0/checkpolicy/test/dismod.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/checkpolicy/test/dismod.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -688,6 +688,7 @@
filename, strerror(errno));
exit(1);
}
+ policy_file_init(&f);
f.type = PF_USE_STDIO;
f.fp = in_fp;
Modified: branches/stable/1_0/checkpolicy/test/dispol.c
===================================================================
--- branches/stable/1_0/checkpolicy/test/dispol.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/checkpolicy/test/dispol.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -351,6 +351,7 @@
/* read the binary policy */
fprintf(out_fp, "Reading policy...\n");
+ policy_file_init(&pf);
pf.type = PF_USE_MEMORY;
pf.data = map;
pf.len = sb.st_size;
Modified: branches/stable/1_0/libsepol/include/sepol/policydb/policydb.h
===================================================================
--- branches/stable/1_0/libsepol/include/sepol/policydb/policydb.h 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/include/sepol/policydb/policydb.h 2008-03-04 18:34:07 UTC (rev 2834)
@@ -566,6 +566,8 @@
struct policy_file pf;
};
+extern void policy_file_init(policy_file_t * x);
+
extern int policydb_read(policydb_t * p, struct policy_file *fp,
unsigned int verbose);
extern int avrule_read_list(policydb_t * p, avrule_t ** avrules,
Modified: branches/stable/1_0/libsepol/src/genbools.c
===================================================================
--- branches/stable/1_0/libsepol/src/genbools.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/src/genbools.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -154,6 +154,7 @@
goto err_destroy;
}
+ policy_file_init(&pf);
pf.type = PF_USE_MEMORY;
pf.data = data;
pf.len = len;
@@ -225,6 +226,7 @@
goto err_destroy;
}
+ policy_file_init(&pf);
pf.type = PF_USE_MEMORY;
pf.data = data;
pf.len = len;
Modified: branches/stable/1_0/libsepol/src/module.c
===================================================================
--- branches/stable/1_0/libsepol/src/module.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/src/module.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -851,9 +851,8 @@
if (p->policy) {
/* compute policy length */
+ policy_file_init(&polfile);
polfile.type = PF_LEN;
- polfile.data = NULL;
- polfile.len = 0;
polfile.handle = file->handle;
if (policydb_write(&p->policy->p, &polfile))
return -1;
Modified: branches/stable/1_0/libsepol/src/policydb.c
===================================================================
--- branches/stable/1_0/libsepol/src/policydb.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/src/policydb.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -3256,3 +3256,8 @@
return 0;
}
+
+void policy_file_init(policy_file_t *pf)
+{
+ memset(pf, 0, sizeof(policy_file_t));
+}
Modified: branches/stable/1_0/libsepol/src/policydb_convert.c
===================================================================
--- branches/stable/1_0/libsepol/src/policydb_convert.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/src/policydb_convert.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -13,6 +13,7 @@
policy_file_t pf;
+ policy_file_init(&pf);
pf.type = PF_USE_MEMORY;
pf.data = data;
pf.len = len;
@@ -39,9 +40,8 @@
struct policydb tmp_policydb;
/* Compute the length for the new policy image. */
+ policy_file_init(&pf);
pf.type = PF_LEN;
- pf.data = NULL;
- pf.len = 0;
pf.handle = handle;
if (policydb_write(policydb, &pf)) {
ERR(handle, "could not compute policy length");
Modified: branches/stable/1_0/libsepol/src/services.c
===================================================================
--- branches/stable/1_0/libsepol/src/services.c 2008-03-04 17:31:32 UTC (rev 2833)
+++ branches/stable/1_0/libsepol/src/services.c 2008-03-04 18:34:07 UTC (rev 2834)
@@ -85,6 +85,8 @@
int sepol_set_policydb_from_file(FILE * fp)
{
struct policy_file pf;
+
+ policy_file_init(&pf);
pf.fp = fp;
pf.type = PF_USE_STDIO;
if (mypolicydb.policy_type)
@@ -951,13 +953,14 @@
convert_context_args_t args;
uint32_t seqno;
int rc = 0;
- struct policy_file file = {
- .type = PF_USE_MEMORY,
- .data = data,
- .len = len,
- .fp = NULL
- }, *fp = &file;
+ struct policy_file file, *fp;
+ policy_file_init(&file);
+ file.type = PF_USE_MEMORY;
+ file.data = data;
+ file.len = len;
+ fp = &file;
+
if (policydb_init(&newpolicydb))
return -ENOMEM;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
