Expand def_mailsub in the sudoers locale, not the user's.

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index 81bedb5cf3a64102924863326eb7c4831265a1d2..bcbcefaeaa0a17c4f88be3f5e377052329b603a4 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -452,7 +452,7 @@ init_defaults(void)
 
     /* Now do the strings */
     def_mailto = estrdup(MAILTO);
-    def_mailsub = estrdup(_(MAILSUBJECT));
+    def_mailsub = estrdup(N_(MAILSUBJECT));
     def_badpass_message = estrdup(_(INCORRECT_PASSWORD));
     def_timestampdir = estrdup(_PATH_SUDO_TIMEDIR);
     def_passprompt = estrdup(_(PASSPROMPT));

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 7e5288323fc00632534c42947aba79d0f582a86e..2dbd0f7be57b8ddfa203ed1e8a493def406b88a6 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -681,7 +681,7 @@ send_mail(const char *fmt, ...)
     /* Pipes are all setup, send message. */
     (void) fprintf(mail, "To: %s\nFrom: %s\nAuto-Submitted: %s\nSubject: ",
        def_mailto, def_mailfrom ? def_mailfrom : user_name, "auto-generated");
-    for (p = def_mailsub; *p; p++) {
+    for (p = _(def_mailsub); *p; p++) {
        /* Expand escapes in the subject */
        if (*p == '%' && *(p+1) != '%') {
            switch (*(++p)) {