More work on bug #5082, use LC_ALL as this takes

precedence.
Jeremy.
(This used to be commit 446ebae76d6796b30e4c71ff7190337c28637be6)

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 58b67a58cd88ae3baf045cc93e8b42647ecf694d..a277e729bf73145debfff29fb8aa23d4620966d8 100644 (file)
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -520,7 +520,7 @@ bool chgpasswd(const char *name, const struct passwd *pass,
        if (lp_pam_password_change()) {
                bool ret;
 #ifdef HAVE_SETLOCALE
-               const char *prevlocale = setlocale(LC_MESSAGES, "C");
+               const char *prevlocale = setlocale(LC_ALL, "C");
 #endif
 
                if (as_root)
@@ -536,7 +536,7 @@ bool chgpasswd(const char *name, const struct passwd *pass,
                        unbecome_root();
 
 #ifdef HAVE_SETLOCALE
-               setlocale(LC_MESSAGES, prevlocale);
+               setlocale(LC_ALL, prevlocale);
 #endif
 
                return ret;