2011-04-04 16:16:23

by andronicus.spiros

Subject: [refpolicy] [PATCH] trunk: remove unnecessary semicolons after interface/template calls everywhere

From: Elia Pinto <[email protected]>

Signed-off-by: Elia Pinto <[email protected]>
---
policy/modules/services/aisexec.te | 2 +-
policy/modules/services/cobbler.if | 2 +-
policy/modules/services/corosync.te | 2 +-
policy/modules/services/ftp.if | 4 ++--
policy/modules/services/hadoop.te | 2 +-
policy/modules/services/likewise.te | 2 +-
policy/modules/services/postgresql.te | 2 +-
policy/modules/services/rpc.te | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/policy/modules/services/aisexec.te b/policy/modules/services/aisexec.te
index 7a86bf6..64953f7 100644
--- a/policy/modules/services/aisexec.te
+++ b/policy/modules/services/aisexec.te
@@ -10,7 +10,7 @@ type aisexec_exec_t;
init_daemon_domain(aisexec_t, aisexec_exec_t)

type aisexec_initrc_exec_t;
-init_script_file(aisexec_initrc_exec_t);
+init_script_file(aisexec_initrc_exec_t)

type aisexec_tmp_t;
files_tmp_file(aisexec_tmp_t)
diff --git a/policy/modules/services/cobbler.if b/policy/modules/services/cobbler.if
index 293e08d..116d60f 100644
--- a/policy/modules/services/cobbler.if
+++ b/policy/modules/services/cobbler.if
@@ -61,7 +61,7 @@ interface(`cobbler_read_config',`
type cobbler_etc_t;
')

- read_files_pattern($1, cobbler_etc_t, cobbler_etc_t);
+ read_files_pattern($1, cobbler_etc_t, cobbler_etc_t)
files_search_etc($1)
')

diff --git a/policy/modules/services/corosync.te b/policy/modules/services/corosync.te
index 7d2cf85..04969e5 100644
--- a/policy/modules/services/corosync.te
+++ b/policy/modules/services/corosync.te
@@ -10,7 +10,7 @@ type corosync_exec_t;
init_daemon_domain(corosync_t, corosync_exec_t)

type corosync_initrc_exec_t;
-init_script_file(corosync_initrc_exec_t);
+init_script_file(corosync_initrc_exec_t)

type corosync_tmp_t;
files_tmp_file(corosync_tmp_t)
diff --git a/policy/modules/services/ftp.if b/policy/modules/services/ftp.if
index bc27421..9d3201b 100644
--- a/policy/modules/services/ftp.if
+++ b/policy/modules/services/ftp.if
@@ -15,7 +15,7 @@ interface(`ftp_dyntrans_anon_sftpd',`
type anon_sftpd_t;
')

- dyntrans_pattern($1, anon_sftpd_t);
+ dyntrans_pattern($1, anon_sftpd_t)
')

########################################
@@ -148,7 +148,7 @@ interface(`ftp_dyntrans_sftpd',`
type sftpd_t;
')

- dyntrans_pattern($1, sftpd_t);
+ dyntrans_pattern($1, sftpd_t)
')

########################################
diff --git a/policy/modules/services/hadoop.te b/policy/modules/services/hadoop.te
index 9821a88..7d3a469 100644
--- a/policy/modules/services/hadoop.te
+++ b/policy/modules/services/hadoop.te
@@ -257,7 +257,7 @@ hadoop_recvfrom_namenode(hadoop_secondarynamenode_t)

allow hadoop_tasktracker_t self:process signal;

-manage_dirs_pattern(hadoop_tasktracker_t, hadoop_tasktracker_log_t, hadoop_tasktracker_log_t);
+manage_dirs_pattern(hadoop_tasktracker_t, hadoop_tasktracker_log_t, hadoop_tasktracker_log_t)
setattr_dirs_pattern(hadoop_tasktracker_t, hadoop_log_t, hadoop_log_t)
filetrans_pattern(hadoop_tasktracker_t, hadoop_log_t, hadoop_tasktracker_log_t, dir)

diff --git a/policy/modules/services/likewise.te b/policy/modules/services/likewise.te
index 3acbf1d..cfe1897 100644
--- a/policy/modules/services/likewise.te
+++ b/policy/modules/services/likewise.te
@@ -98,7 +98,7 @@ allow lsassd_t netlogond_var_lib_t:file read_file_perms;

manage_files_pattern(lsassd_t, likewise_etc_t, likewise_etc_t)

-manage_files_pattern(lsassd_t, lsassd_tmp_t, lsassd_tmp_t);
+manage_files_pattern(lsassd_t, lsassd_tmp_t, lsassd_tmp_t)
files_tmp_filetrans(lsassd_t, lsassd_tmp_t, file)

stream_connect_pattern(lsassd_t, likewise_var_lib_t, dcerpcd_var_socket_t, dcerpcd_t)
diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te
index 8ed5067..aea7baa 100644
--- a/policy/modules/services/postgresql.te
+++ b/policy/modules/services/postgresql.te
@@ -141,7 +141,7 @@ type unpriv_sepgsql_proc_exec_t;
postgresql_procedure_object(unpriv_sepgsql_proc_exec_t)

type unpriv_sepgsql_schema_t;
-postgresql_schema_object(unpriv_sepgsql_schema_t);
+postgresql_schema_object(unpriv_sepgsql_schema_t)

type unpriv_sepgsql_seq_t;
postgresql_sequence_object(unpriv_sepgsql_seq_t)
diff --git a/policy/modules/services/rpc.te b/policy/modules/services/rpc.te
index 8e1ab72..b1468ed 100644
--- a/policy/modules/services/rpc.te
+++ b/policy/modules/services/rpc.te
@@ -37,12 +37,12 @@ files_pid_file(rpcd_var_run_t)
rpc_domain_template(rpcd)

type rpcd_initrc_exec_t;
-init_script_file(rpcd_initrc_exec_t);
+init_script_file(rpcd_initrc_exec_t)

rpc_domain_template(nfsd)

type nfsd_initrc_exec_t;
-init_script_file(nfsd_initrc_exec_t);
+init_script_file(nfsd_initrc_exec_t)

type nfsd_rw_t;
files_type(nfsd_rw_t)
--
1.7.2.1.44.g721e7

2011-04-04 20:13:58

by cpebenito

Subject: [refpolicy] [PATCH] trunk: remove unnecessary semicolons after interface/template calls everywhere

On 4/4/2011 12:16 PM, Elia Pinto wrote:
> From: Elia Pinto<[email protected]>

Merged.

> Signed-off-by: Elia Pinto<[email protected]>
> ---
> policy/modules/services/aisexec.te | 2 +-
> policy/modules/services/cobbler.if | 2 +-
> policy/modules/services/corosync.te | 2 +-
> policy/modules/services/ftp.if | 4 ++--
> policy/modules/services/hadoop.te | 2 +-
> policy/modules/services/likewise.te | 2 +-
> policy/modules/services/postgresql.te | 2 +-
> policy/modules/services/rpc.te | 4 ++--
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/policy/modules/services/aisexec.te b/policy/modules/services/aisexec.te
> index 7a86bf6..64953f7 100644
> --- a/policy/modules/services/aisexec.te
> +++ b/policy/modules/services/aisexec.te
> @@ -10,7 +10,7 @@ type aisexec_exec_t;
> init_daemon_domain(aisexec_t, aisexec_exec_t)
>
> type aisexec_initrc_exec_t;
> -init_script_file(aisexec_initrc_exec_t);
> +init_script_file(aisexec_initrc_exec_t)
>
> type aisexec_tmp_t;
> files_tmp_file(aisexec_tmp_t)
> diff --git a/policy/modules/services/cobbler.if b/policy/modules/services/cobbler.if
> index 293e08d..116d60f 100644
> --- a/policy/modules/services/cobbler.if
> +++ b/policy/modules/services/cobbler.if
> @@ -61,7 +61,7 @@ interface(`cobbler_read_config',`
> type cobbler_etc_t;
> ')
>
> - read_files_pattern($1, cobbler_etc_t, cobbler_etc_t);
> + read_files_pattern($1, cobbler_etc_t, cobbler_etc_t)
> files_search_etc($1)
> ')
>
> diff --git a/policy/modules/services/corosync.te b/policy/modules/services/corosync.te
> index 7d2cf85..04969e5 100644
> --- a/policy/modules/services/corosync.te
> +++ b/policy/modules/services/corosync.te
> @@ -10,7 +10,7 @@ type corosync_exec_t;
> init_daemon_domain(corosync_t, corosync_exec_t)
>
> type corosync_initrc_exec_t;
> -init_script_file(corosync_initrc_exec_t);
> +init_script_file(corosync_initrc_exec_t)
>
> type corosync_tmp_t;
> files_tmp_file(corosync_tmp_t)
> diff --git a/policy/modules/services/ftp.if b/policy/modules/services/ftp.if
> index bc27421..9d3201b 100644
> --- a/policy/modules/services/ftp.if
> +++ b/policy/modules/services/ftp.if
> @@ -15,7 +15,7 @@ interface(`ftp_dyntrans_anon_sftpd',`
> type anon_sftpd_t;
> ')
>
> - dyntrans_pattern($1, anon_sftpd_t);
> + dyntrans_pattern($1, anon_sftpd_t)
> ')
>
> ########################################
> @@ -148,7 +148,7 @@ interface(`ftp_dyntrans_sftpd',`
> type sftpd_t;
> ')
>
> - dyntrans_pattern($1, sftpd_t);
> + dyntrans_pattern($1, sftpd_t)
> ')
>
> ########################################
> diff --git a/policy/modules/services/hadoop.te b/policy/modules/services/hadoop.te
> index 9821a88..7d3a469 100644
> --- a/policy/modules/services/hadoop.te
> +++ b/policy/modules/services/hadoop.te
> @@ -257,7 +257,7 @@ hadoop_recvfrom_namenode(hadoop_secondarynamenode_t)
>
> allow hadoop_tasktracker_t self:process signal;
>
> -manage_dirs_pattern(hadoop_tasktracker_t, hadoop_tasktracker_log_t, hadoop_tasktracker_log_t);
> +manage_dirs_pattern(hadoop_tasktracker_t, hadoop_tasktracker_log_t, hadoop_tasktracker_log_t)
> setattr_dirs_pattern(hadoop_tasktracker_t, hadoop_log_t, hadoop_log_t)
> filetrans_pattern(hadoop_tasktracker_t, hadoop_log_t, hadoop_tasktracker_log_t, dir)
>
> diff --git a/policy/modules/services/likewise.te b/policy/modules/services/likewise.te
> index 3acbf1d..cfe1897 100644
> --- a/policy/modules/services/likewise.te
> +++ b/policy/modules/services/likewise.te
> @@ -98,7 +98,7 @@ allow lsassd_t netlogond_var_lib_t:file read_file_perms;
>
> manage_files_pattern(lsassd_t, likewise_etc_t, likewise_etc_t)
>
> -manage_files_pattern(lsassd_t, lsassd_tmp_t, lsassd_tmp_t);
> +manage_files_pattern(lsassd_t, lsassd_tmp_t, lsassd_tmp_t)
> files_tmp_filetrans(lsassd_t, lsassd_tmp_t, file)
>
> stream_connect_pattern(lsassd_t, likewise_var_lib_t, dcerpcd_var_socket_t, dcerpcd_t)
> diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te
> index 8ed5067..aea7baa 100644
> --- a/policy/modules/services/postgresql.te
> +++ b/policy/modules/services/postgresql.te
> @@ -141,7 +141,7 @@ type unpriv_sepgsql_proc_exec_t;
> postgresql_procedure_object(unpriv_sepgsql_proc_exec_t)
>
> type unpriv_sepgsql_schema_t;
> -postgresql_schema_object(unpriv_sepgsql_schema_t);
> +postgresql_schema_object(unpriv_sepgsql_schema_t)
>
> type unpriv_sepgsql_seq_t;
> postgresql_sequence_object(unpriv_sepgsql_seq_t)
> diff --git a/policy/modules/services/rpc.te b/policy/modules/services/rpc.te
> index 8e1ab72..b1468ed 100644
> --- a/policy/modules/services/rpc.te
> +++ b/policy/modules/services/rpc.te
> @@ -37,12 +37,12 @@ files_pid_file(rpcd_var_run_t)
> rpc_domain_template(rpcd)
>
> type rpcd_initrc_exec_t;
> -init_script_file(rpcd_initrc_exec_t);
> +init_script_file(rpcd_initrc_exec_t)
>
> rpc_domain_template(nfsd)
>
> type nfsd_initrc_exec_t;
> -init_script_file(nfsd_initrc_exec_t);
> +init_script_file(nfsd_initrc_exec_t)
>
> type nfsd_rw_t;
> files_type(nfsd_rw_t)


--
Chris PeBenito
Tresys Technology, LLC
http://www.tresys.com | oss.tresys.com