libselinux: support objname in compute_create
PATCH 1/1 libselinux: support objname in compute_create
Support passing an optional object name to compute_create for name based type transitions.
Signed-off-by Christian Göttsche <[email protected]>
--- libselinux/utils/compute_create.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
libselinux/utils/compute_create.c +6 -3
@@ -10,10 +10,11 @@ int main(int argc, char **argv) {char *buf;security_class_t tclass; +const char *objname;int ret; -if (argc !=4 ) { -fprintf (stderr,"usage: %s scontext tcontext tclass\n" , +if (argc !=4 && argc !=5 ) { +fprintf (stderr,"usage: %s scontext tcontext tclass [objname]\n" , argv[0 ]);exit (1 ); }
@@ -34,7 +35,9 @@ int main(int argc, char **argv)exit (2 ); } - ret =security_compute_create (argv[1 ], argv[2 ], tclass, &buf); + objname = (argc ==5 ) ? argv[4 ] :NULL ; + + ret =security_compute_create_name (argv[1 ], argv[2 ], tclass, objname, &buf);if (ret <0 ) {fprintf (stderr,"%s: security_compute_create failed: %s\n" , argv[0 ],strerror (errno));
Signature · 1 line
2.37.2
Quoted 4 lines · Christian Göttsche
Support passing an optional object name to
compute_createfor name based type transitions.
Any comments?
Patchwork:
https://patchwork.kernel.org/project/selinux/patch/[email protected]/
Quoted 37 lines
Signed-off-by Christian Göttsche <[email protected]>--- libselinux/utils/compute_create.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)libselinux/utils/compute_create.c +6
-4@@ -10,10 +10,11 @@ int main(int argc, char **argv) {char *buf;security_class_t tclass; +const char *objname;int ret; -if (argc !=4 ) { -fprintf (stderr,"usage: %s scontext tcontext tclass\n" , +if (argc !=4 && argc !=5 ) { +fprintf (stderr,"usage: %s scontext tcontext tclass [objname]\n" , argv[0 ]);exit (1 ); }@@ -34,7 +35,9 @@ int main(int argc, char **argv)exit (2 ); } - ret =security_compute_create (argv[1 ], argv[2 ], tclass, &buf); + objname = (argc ==5 ) ? argv[4 ] :NULL ; + + ret =security_compute_create_name (argv[1 ], argv[2 ], tclass, objname, &buf);if (ret <0 ) {fprintf (stderr,"%s: security_compute_create failed: %s\n" , argv[0 ],strerror (errno)); --2.37.2
Quoted 5 lines · Christian Göttsche
Support passing an optional object name to
compute_createfor name based type transitions.Signed-off-by Christian Göttsche <[email protected]>
Acked-by James Carter <[email protected]>
Quoted 36 lines
--- libselinux/utils/compute_create.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)libselinux/utils/compute_create.c +6
-4@@ -10,10 +10,11 @@ int main(int argc, char **argv) {char *buf;security_class_t tclass; +const char *objname;int ret; -if (argc !=4 ) { -fprintf (stderr,"usage: %s scontext tcontext tclass\n" , +if (argc !=4 && argc !=5 ) { +fprintf (stderr,"usage: %s scontext tcontext tclass [objname]\n" , argv[0 ]);exit (1 ); }@@ -34,7 +35,9 @@ int main(int argc, char **argv)exit (2 ); } - ret =security_compute_create (argv[1 ], argv[2 ], tclass, &buf); + objname = (argc ==5 ) ? argv[4 ] :NULL ; + + ret =security_compute_create_name (argv[1 ], argv[2 ], tclass, objname, &buf);if (ret <0 ) {fprintf (stderr,"%s: security_compute_create failed: %s\n" , argv[0 ],strerror (errno)); --2.37.2
Quoted 11 lines · James Carter
Quoted 5 lines · Christian Göttsche
Support passing an optional object name to
compute_createfor name based type transitions.Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Jim
Quoted 36 lines
Quoted 36 lines
--- libselinux/utils/compute_create.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)libselinux/utils/compute_create.c +6
-4@@ -10,10 +10,11 @@ int main(int argc, char **argv) {char *buf;security_class_t tclass; +const char *objname;int ret; -if (argc !=4 ) { -fprintf (stderr,"usage: %s scontext tcontext tclass\n" , +if (argc !=4 && argc !=5 ) { +fprintf (stderr,"usage: %s scontext tcontext tclass [objname]\n" , argv[0 ]);exit (1 ); }@@ -34,7 +35,9 @@ int main(int argc, char **argv)exit (2 ); } - ret =security_compute_create (argv[1 ], argv[2 ], tclass, &buf); + objname = (argc ==5 ) ? argv[4 ] :NULL ; + + ret =security_compute_create_name (argv[1 ], argv[2 ], tclass, objname, &buf);if (ret <0 ) {fprintf (stderr,"%s: security_compute_create failed: %s\n" , argv[0 ],strerror (errno)); --2.37.2