Changeset 124 for branches/samba-3.0/source/smbd/chgpasswd.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/smbd/chgpasswd.c (modified) (6 diffs)

branches/samba-3.0/source/smbd/chgpasswd.c

@@ -127 +127 @@
         gid_t gid;
         uid_t uid;
+        char * const eptrs[1] = { NULL };
 
         if (pass == NULL)
@@ -154 +155 @@
                 return (False);
         }
-#if defined(I_PUSH) && defined(I_FIND)
+#if defined(TIOCSCTTY)
+        if (ioctl(slave, TIOCSCTTY, 0) < 0)
+        {
+                DEBUG(3, ("Error in ioctl call for slave pty\n"));
+                /* return(False); */
+        }
+#elif defined(I_PUSH) && defined(I_FIND)
         if (ioctl(slave, I_FIND, "ptem") == 0) {
                 ioctl(slave, I_PUSH, "ptem");
@@ -160 +167 @@
         if (ioctl(slave, I_FIND, "ldterm") == 0) {
                 ioctl(slave, I_PUSH, "ldterm");
-        }
-#elif defined(TIOCSCTTY)
-        if (ioctl(slave, TIOCSCTTY, 0) < 0)
-        {
-                DEBUG(3, ("Error in ioctl call for slave pty\n"));
-                /* return(False); */
         }
 #endif
@@ -223 +224 @@
 
         /* execl() password-change application */
-        if (execl("/bin/sh", "sh", "-c", passwordprogram, NULL) < 0)
+        if (execle("/bin/sh", "sh", "-c", passwordprogram, NULL, eptrs) < 0)
         {
                 DEBUG(3, ("Bad status returned from %s\n", passwordprogram));
@@ -499 +500 @@
         if (lp_pam_password_change()) {
                 BOOL ret;
+#ifdef HAVE_SETLOCALE
+                char *prevlocale = setlocale(LC_ALL, "C");
+#endif
 
                 if (as_root)
@@ -511 +515 @@
                 if (as_root)
                         unbecome_root();
+
+#ifdef HAVE_SETLOCALE
+                setlocale(LC_ALL, prevlocale);
+#endif
 
                 return ret;