The error string returned by alias_add should be const.

diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c
index 2823c939231f8862eb3fa796c1a1802e75ac84a0..f68aa054061847b80fdb8054afa42c6d381cd04b 100644 (file)
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -120,7 +120,7 @@ alias_put(struct alias *a)
  * Add an alias to the aliases redblack tree.
  * Returns NULL on success and an error string on failure.
  */
-char *
+const char *
 alias_add(char *name, int type, struct member *members)
 {
     static char errbuf[512];

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index adc21bea0afdc1de16b9c7bbe87b844b9a4ff3a1..33e01e1fd5be1e127788566e22a8d286bd72b31b 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -1736,7 +1736,7 @@ break;
 case 84:
 #line 562 "gram.y"
 {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -1753,7 +1753,7 @@ break;
 case 89:
 #line 582 "gram.y"
 {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -1770,7 +1770,7 @@ break;
 case 94:
 #line 602 "gram.y"
 {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -1780,7 +1780,7 @@ break;
 case 97:
 #line 615 "gram.y"
 {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
                                sudoerserror(s);
                                YYERROR;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index d1d032f10bdba19459df43c0855438c593907cf5..30029fb16f9521c75723e240d29ab6399d88d6ff 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -560,7 +560,7 @@ hostaliases :       hostalias
                ;
 
 hostalias      :       ALIAS '=' hostlist {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add($1, HOSTALIAS, $3)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -580,7 +580,7 @@ cmndaliases :       cmndalias
                ;
 
 cmndalias      :       ALIAS '=' cmndlist {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add($1, CMNDALIAS, $3)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -600,7 +600,7 @@ runasaliases        :       runasalias
                ;
 
 runasalias     :       ALIAS '=' userlist {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add($1, RUNASALIAS, $3)) != NULL) {
                                sudoerserror(s);
                                YYERROR;
@@ -613,7 +613,7 @@ useraliases :       useralias
                ;
 
 useralias      :       ALIAS '=' userlist {
-                           char *s;
+                           const char *s;
                            if ((s = alias_add($1, USERALIAS, $3)) != NULL) {
                                sudoerserror(s);
                                YYERROR;

diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index df3440e68b78c3cdfdcdf7d082d1d5cd23a5d08d..b2dca49566e5e8b5c773f127cfaa88bc67662f61 100644 (file)
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -185,7 +185,7 @@ extern struct defaults_list defaults;
 
 /* alias.c */
 bool no_aliases(void);
-char *alias_add(char *name, int type, struct member *members);
+const char *alias_add(char *name, int type, struct member *members);
 int alias_compare(const void *a1, const void *a2);
 struct alias *alias_get(char *name, int type);
 struct alias *alias_remove(char *name, int type);