Rename script -> transcript

diff --git a/def_data.c b/def_data.c
index 2ba2be773eb9a1076e353bbb0d16198b8dac125a..aa7838b9837b803f20939102f059f8cc7effc6f3 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -315,7 +315,7 @@ struct sudo_defs_types sudo_defs_table[] = {
        "The umask specified in sudoers will override the user's, even if it is more permissive",
        NULL,
     }, {
-       "script", T_FLAG,
+       "transcript", T_FLAG,
        "Log a transcript of the command being run",
        NULL,
     }, {

diff --git a/def_data.h b/def_data.h
index a8dadb4f8b8a11f135ce29d27bc2adb2244112b4..dc87fa672b864b0073ae9208c49a05652a97bdd0 100644 (file)
--- a/def_data.h
+++ b/def_data.h
@@ -144,8 +144,8 @@
 #define I_FAST_GLOB             71
 #define def_umask_override      (sudo_defs_table[72].sd_un.flag)
 #define I_UMASK_OVERRIDE        72
-#define def_script              (sudo_defs_table[73].sd_un.flag)
-#define I_SCRIPT                73
+#define def_transcript          (sudo_defs_table[73].sd_un.flag)
+#define I_TRANSCRIPT            73
 
 enum def_tupple {
        never,

diff --git a/def_data.in b/def_data.in
index cb31693e1e0b4ec50113c5bca0342fa3a6b7ec32..61aba384facd0ca066217a3af6294346e2626d47 100644 (file)
--- a/def_data.in
+++ b/def_data.in
@@ -232,6 +232,6 @@ fast_glob
 umask_override
        T_FLAG
        "The umask specified in sudoers will override the user's, even if it is more permissive"
-script
+transcript
        T_FLAG
        "Log a transcript of the command being run"

diff --git a/gram.c b/gram.c
index e10c43dde3a44731b8f1b209eeaa80a6b2c96fe0..fe24d591c37dc46493786fb0946b5e6c105ee723 100644 (file)
--- a/gram.c
+++ b/gram.c
@@ -166,8 +166,8 @@ typedef union {
 #define EXEC 272
 #define SETENV 273
 #define NOSETENV 274
-#define SCRIPT 275
-#define NOSCRIPT 276
+#define TRANSCRIPT 275
+#define NOTRANSCRIPT 276
 #define ALL 277
 #define COMMENT 278
 #define HOSTALIAS 279
@@ -498,7 +498,7 @@ char *yyname[] =
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 "COMMAND","ALIAS","DEFVAR","NTWKADDR","NETGROUP","USERGROUP","WORD","DEFAULTS",
 "DEFAULTS_HOST","DEFAULTS_USER","DEFAULTS_RUNAS","DEFAULTS_CMND","NOPASSWD",
-"PASSWD","NOEXEC","EXEC","SETENV","NOSETENV","SCRIPT","NOSCRIPT","ALL",
+"PASSWD","NOEXEC","EXEC","SETENV","NOSETENV","TRANSCRIPT","NOTRANSCRIPT","ALL",
 "COMMENT","HOSTALIAS","CMNDALIAS","USERALIAS","RUNASALIAS","ERROR","TYPE",
 "ROLE",
 };
@@ -565,8 +565,8 @@ char *yyrule[] =
 "cmndtag : cmndtag EXEC",
 "cmndtag : cmndtag SETENV",
 "cmndtag : cmndtag NOSETENV",
-"cmndtag : cmndtag SCRIPT",
-"cmndtag : cmndtag NOSCRIPT",
+"cmndtag : cmndtag TRANSCRIPT",
+"cmndtag : cmndtag NOTRANSCRIPT",
 "cmnd : ALL",
 "cmnd : ALIAS",
 "cmnd : COMMAND",
@@ -1219,8 +1219,8 @@ case 35:
                            if (yyvsp[0].cmndspec->tags.setenv == UNSPEC &&
                                yyvsp[0].cmndspec->prev->tags.setenv != IMPLIED)
                                yyvsp[0].cmndspec->tags.setenv = yyvsp[0].cmndspec->prev->tags.setenv;
-                           if (yyvsp[0].cmndspec->tags.script == UNSPEC)
-                               yyvsp[0].cmndspec->tags.script = yyvsp[0].cmndspec->prev->tags.script;
+                           if (yyvsp[0].cmndspec->tags.transcript == UNSPEC)
+                               yyvsp[0].cmndspec->tags.transcript = yyvsp[0].cmndspec->prev->tags.transcript;
                            if ((tq_empty(&yyvsp[0].cmndspec->runasuserlist) &&
                                 tq_empty(&yyvsp[0].cmndspec->runasgrouplist)) &&
                                (!tq_empty(&yyvsp[0].cmndspec->prev->runasuserlist) ||
@@ -1358,7 +1358,7 @@ break;
 case 51:
 #line 428 "gram.y"
 {
-                           yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv = yyval.tag.script = UNSPEC;
+                           yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv = yyval.tag.transcript = UNSPEC;
                        }
 break;
 case 52:
@@ -1400,13 +1400,13 @@ break;
 case 58:
 #line 449 "gram.y"
 {
-                           yyval.tag.script = TRUE;
+                           yyval.tag.transcript = TRUE;
                        }
 break;
 case 59:
 #line 452 "gram.y"
 {
-                           yyval.tag.script = FALSE;
+                           yyval.tag.transcript = FALSE;
                        }
 break;
 case 60:

diff --git a/gram.h b/gram.h
index c71c897e62ba9b4394acb50f7a57372af7ead3be..1d1c6d590064c4597f844390ecb92f67ec93f748 100644 (file)
--- a/gram.h
+++ b/gram.h
@@ -16,8 +16,8 @@
 #define EXEC 272
 #define SETENV 273
 #define NOSETENV 274
-#define SCRIPT 275
-#define NOSCRIPT 276
+#define TRANSCRIPT 275
+#define NOTRANSCRIPT 276
 #define ALL 277
 #define COMMENT 278
 #define HOSTALIAS 279

diff --git a/gram.y b/gram.y
index 8d7eeef14060ed45804c4edc510d98ef02e7ce26..e36bad482a640db1ed8c4e4342de214c9f255cd8 100644 (file)
--- a/gram.y
+++ b/gram.y
@@ -146,8 +146,8 @@ yyerror(s)
 %token <tok>    EXEC                   /* don't preload dummy execve() */
 %token <tok>    SETENV                 /* user may set environment for cmnd */
 %token <tok>    NOSETENV               /* user may not set environment */
-%token <tok>    SCRIPT                 /* log a transcript of the cmnd */
-%token <tok>    NOSCRIPT               /* don't log a transcript of the cmnd */
+%token <tok>    TRANSCRIPT             /* log a transcript of the cmnd */
+%token <tok>    NOTRANSCRIPT           /* don't log a transcript of the cmnd */
 %token <tok>    ALL                    /* ALL keyword */
 %token <tok>    COMMENT                /* comment and/or carriage return */
 %token <tok>    HOSTALIAS              /* Host_Alias keyword */
@@ -319,8 +319,8 @@ cmndspeclist        :       cmndspec
                            if ($3->tags.setenv == UNSPEC &&
                                $3->prev->tags.setenv != IMPLIED)
                                $3->tags.setenv = $3->prev->tags.setenv;
-                           if ($3->tags.script == UNSPEC)
-                               $3->tags.script = $3->prev->tags.script;
+                           if ($3->tags.transcript == UNSPEC)
+                               $3->tags.transcript = $3->prev->tags.transcript;
                            if ((tq_empty(&$3->runasuserlist) &&
                                 tq_empty(&$3->runasgrouplist)) &&
                                (!tq_empty(&$3->prev->runasuserlist) ||
@@ -426,7 +426,7 @@ runaslist   :       userlist {
                ;
 
 cmndtag                :       /* empty */ {
-                           $$.nopasswd = $$.noexec = $$.setenv = $$.script = UNSPEC;
+                           $$.nopasswd = $$.noexec = $$.setenv = $$.transcript = UNSPEC;
                        }
                |       cmndtag NOPASSWD {
                            $$.nopasswd = TRUE;
@@ -446,11 +446,11 @@ cmndtag           :       /* empty */ {
                |       cmndtag NOSETENV {
                            $$.setenv = FALSE;
                        }
-               |       cmndtag SCRIPT {
-                           $$.script = TRUE;
+               |       cmndtag TRANSCRIPT {
+                           $$.transcript = TRUE;
                        }
-               |       cmndtag NOSCRIPT {
-                           $$.script = FALSE;
+               |       cmndtag NOTRANSCRIPT {
+                           $$.transcript = FALSE;
                        }
                ;
 

diff --git a/parse.c b/parse.c
index 0b9b23510d6545fba59736afa66821ff5d37d723..bfdfcc4feb1f3642e28b167c9e2ca8a034e93a98 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -254,8 +254,8 @@ sudo_file_lookup(nss, validated, pwflag)
                def_noexec = tags->noexec;
            if (tags->setenv != UNSPEC)
                def_setenv = tags->setenv;
-           if (tags->script != UNSPEC)
-               def_script = tags->script;
+           if (tags->transcript != UNSPEC)
+               def_transcript = tags->transcript;
        }
     } else if (match == DENY) {
        SET(validated, VALIDATE_NOT_OK);
@@ -297,10 +297,10 @@ sudo_file_append_cmnd(cs, tags, lbuf)
            "PASSWD: ", NULL);
        tags->nopasswd = cs->tags.nopasswd;
     }
-    if (TAG_CHANGED(script)) {
-       lbuf_append(lbuf, cs->tags.script ? "SCRIPT: " :
+    if (TAG_CHANGED(transcript)) {
+       lbuf_append(lbuf, cs->tags.transcript ? "SCRIPT: " :
            "NOSCRIPT: ", NULL);
-       tags->script = cs->tags.script;
+       tags->transcript = cs->tags.transcript;
     }
     m = cs->cmnd;
     print_member(lbuf, m->name, m->type, m->negated,
@@ -323,7 +323,7 @@ sudo_file_display_priv_short(pw, us, lbuf)
        tags.noexec = UNSPEC;
        tags.setenv = UNSPEC;
        tags.nopasswd = UNSPEC;
-       tags.script = UNSPEC;
+       tags.transcript = UNSPEC;
        lbuf_append(lbuf, "    ", NULL);
        tq_foreach_fwd(&priv->cmndlist, cs) {
            if (cs != tq_first(&priv->cmndlist))
@@ -375,7 +375,7 @@ sudo_file_display_priv_long(pw, us, lbuf)
        tags.noexec = UNSPEC;
        tags.setenv = UNSPEC;
        tags.nopasswd = UNSPEC;
-       tags.script = UNSPEC;
+       tags.transcript = UNSPEC;
        lbuf_print(lbuf);       /* force a newline */
        lbuf_append(lbuf, "Sudoers entry:", NULL);
        lbuf_print(lbuf);

diff --git a/parse.h b/parse.h
index a33b7904378766104b5d6528331b197d18f22cac..37ccb4c51a366f50bd52b65cc2314e69df959610 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -45,7 +45,7 @@ struct cmndtag {
     __signed char nopasswd;
     __signed char noexec;
     __signed char setenv;
-    __signed char script;
+    __signed char transcript;
 };
 
 /*

diff --git a/sudo.c b/sudo.c
index c54d4ee6f5d89a0c503327bd09fec2ed190bc988..4eb34e858b92e222f35973123819af92bba1dec2 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -461,7 +461,7 @@ main(argc, argv, envp)
        }
 
        /* Get next session ID so we can log it. */
-       if (def_script && ISSET(sudo_mode, (MODE_RUN | MODE_EDIT)))
+       if (def_transcript && ISSET(sudo_mode, (MODE_RUN | MODE_EDIT)))
            script_nextid();
 
        log_allowed(validated);
@@ -503,7 +503,7 @@ main(argc, argv, envp)
        audit_success(NewArgv);
 
        /* Open tty as needed */
-       if (def_script)
+       if (def_transcript)
            script_setup();
 
        /* Become specified user or root if executing a command. */
@@ -549,7 +549,7 @@ main(argc, argv, envp)
        sudo_endgrent();
 
        /* Move pty master/slave to low numbered fd and close the rest. */
-       fd = def_script ? script_duplow(def_closefrom) : def_closefrom;
+       fd = def_transcript ? script_duplow(def_closefrom) : def_closefrom;
        closefrom(fd);
 
 #ifndef PROFILING
@@ -563,7 +563,7 @@ main(argc, argv, envp)
                selinux_exec(user_role, user_type, NewArgv,
                    ISSET(sudo_mode, MODE_LOGIN_SHELL));
 #endif
-           if (def_script)
+           if (def_transcript)
                script_execv(safe_cmnd, NewArgv);
            else
                execv(safe_cmnd, NewArgv);
@@ -1460,7 +1460,7 @@ cleanup(gotsignal)
        sudo_endpwent();
        sudo_endgrent();
     }
-    if (def_script)
+    if (def_transcript)
        term_restore(STDIN_FILENO);
 }