summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-26 19:39:29 +0200
committerDan McDonald <danmcd@joyent.com>2019-02-04 13:39:11 -0500
commitde4cec4850ed6a4d4ee96e179e79e02a3d872ea3 (patch)
tree0ee5b9518610460b573ca34998da8322ea75eebe
parent332e84f52cdee3d0232bd5ac5306c42177959c96 (diff)
downloadillumos-joyent-de4cec4850ed6a4d4ee96e179e79e02a3d872ea3.tar.gz
10310 auditconfig: NULL pointer errors
Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Gergő Mihály Doma <domag02@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/cmd/auditconfig/auditconfig.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/cmd/auditconfig/auditconfig.c b/usr/src/cmd/auditconfig/auditconfig.c
index f82a22d4d1..197ab63ad3 100644
--- a/usr/src/cmd/auditconfig/auditconfig.c
+++ b/usr/src/cmd/auditconfig/auditconfig.c
@@ -106,8 +106,8 @@ enum commands {
AC_ARG_SET_TEMPORARY
};
-#define AC_KERN_EVENT 0
-#define AC_USER_EVENT 1
+#define AC_KERN_EVENT 0
+#define AC_USER_EVENT 1
#define NONE(s) (!strlen(s) ? gettext("none") : s)
@@ -857,8 +857,8 @@ do_args(char **argv, au_mask_t *mask)
{
char *plugin_str = NULL;
boolean_t plugin_state = B_FALSE;
- char *plugin_att = NULL;
- int plugin_qsize = -1;
+ char *plugin_att = NULL;
+ int plugin_qsize = -1;
plugin_str = *++argv;
if (strcmp(*++argv, "active") == 0) {
@@ -1077,7 +1077,7 @@ static void
do_chkaconf(void)
{
char *namask_cfg;
- au_mask_t pmask, kmask;
+ au_mask_t pmask, kmask;
if (!do_getnaflags_scf(&namask_cfg) || namask_cfg == NULL) {
exit_error(gettext("Could not get configured value."));
@@ -1112,7 +1112,7 @@ do_chkaconf(void)
static void
do_aconf(void)
{
- au_mask_t namask;
+ au_mask_t namask;
char *namask_cfg;
if (!do_getnaflags_scf(&namask_cfg) || namask_cfg == NULL) {
@@ -1400,7 +1400,7 @@ do_getnaflags(void)
static void
do_getpolicy(void)
{
- char policy_str[1024];
+ char policy_str[1024];
uint32_t policy;
if (!temporary_set) {
@@ -2434,7 +2434,7 @@ cond2str(void)
}
/*
- * exit = 0, success
+ * exit = 0, success
* 1, error
* 2, bad zone
*/
@@ -2775,7 +2775,7 @@ print_mask(char *desc, au_mask_t *pmp)
{
char auflags[512];
- if (getauditflagschar(auflags, pmp, NULL) < 0)
+ if (getauditflagschar(auflags, pmp, 0) < 0)
(void) strlcpy(auflags, gettext("unknown"), sizeof (auflags));
(void) printf("%s = %s(0x%x,0x%x)\n",