mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

191 lines
4.6 KiB

  1. --- ./src/chage.c.orig 2004-12-22 17:32:12.194686152 +0100
  2. +++ ./src/chage.c 2004-12-22 17:34:47.019149256 +0100
  3. @@ -748,21 +748,6 @@
  4. SYSLOG ((LOG_INFO, "changed password expiry for %s", name));
  5. #ifdef USE_PAM
  6. - if (!lflg) {
  7. - if (retval == PAM_SUCCESS) {
  8. - retval = pam_chauthtok (pamh, 0);
  9. - if (retval != PAM_SUCCESS) {
  10. - pam_end (pamh, retval);
  11. - }
  12. - }
  13. -
  14. - if (retval != PAM_SUCCESS) {
  15. - fprintf (stderr, _("%s: PAM chauthtok failed\n"),
  16. - Prog);
  17. - exit (1);
  18. - }
  19. - }
  20. -
  21. if (retval == PAM_SUCCESS)
  22. pam_end (pamh, PAM_SUCCESS);
  23. --- ./src/chpasswd.c.orig 2004-12-22 17:35:32.017308496 +0100
  24. +++ ./src/chpasswd.c 2004-12-22 17:34:59.981178728 +0100
  25. @@ -325,18 +325,6 @@
  26. pw_unlock ();
  27. #ifdef USE_PAM
  28. - if (retval == PAM_SUCCESS) {
  29. - retval = pam_chauthtok (pamh, 0);
  30. - if (retval != PAM_SUCCESS) {
  31. - pam_end (pamh, retval);
  32. - }
  33. - }
  34. -
  35. - if (retval != PAM_SUCCESS) {
  36. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  37. - exit (1);
  38. - }
  39. -
  40. if (retval == PAM_SUCCESS)
  41. pam_end (pamh, PAM_SUCCESS);
  42. #endif /* USE_PAM */
  43. --- ./src/groupadd.c.orig 2004-12-22 17:35:52.601179272 +0100
  44. +++ ./src/groupadd.c 2004-12-22 17:35:57.214477944 +0100
  45. @@ -584,18 +584,6 @@
  46. close_files ();
  47. #ifdef USE_PAM
  48. - if (retval == PAM_SUCCESS) {
  49. - retval = pam_chauthtok (pamh, 0);
  50. - if (retval != PAM_SUCCESS) {
  51. - pam_end (pamh, retval);
  52. - }
  53. - }
  54. -
  55. - if (retval != PAM_SUCCESS) {
  56. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  57. - exit (1);
  58. - }
  59. -
  60. if (retval == PAM_SUCCESS)
  61. pam_end (pamh, PAM_SUCCESS);
  62. #endif /* USE_PAM */
  63. --- ./src/groupdel.c.orig 2004-12-22 17:36:03.971450728 +0100
  64. +++ ./src/groupdel.c 2004-12-22 17:36:08.384779800 +0100
  65. @@ -402,18 +402,6 @@
  66. close_files ();
  67. #ifdef USE_PAM
  68. - if (retval == PAM_SUCCESS) {
  69. - retval = pam_chauthtok (pamh, 0);
  70. - if (retval != PAM_SUCCESS) {
  71. - pam_end (pamh, retval);
  72. - }
  73. - }
  74. -
  75. - if (retval != PAM_SUCCESS) {
  76. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  77. - exit (1);
  78. - }
  79. -
  80. if (retval == PAM_SUCCESS)
  81. pam_end (pamh, PAM_SUCCESS);
  82. #endif /* USE_PAM */
  83. --- ./src/groupmod.c.orig 2004-12-22 17:36:16.650523216 +0100
  84. +++ ./src/groupmod.c 2004-12-22 17:36:20.521934672 +0100
  85. @@ -596,18 +596,6 @@
  86. close_files ();
  87. #ifdef USE_PAM
  88. - if (retval == PAM_SUCCESS) {
  89. - retval = pam_chauthtok (pamh, 0);
  90. - if (retval != PAM_SUCCESS) {
  91. - pam_end (pamh, retval);
  92. - }
  93. - }
  94. -
  95. - if (retval != PAM_SUCCESS) {
  96. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  97. - exit (1);
  98. - }
  99. -
  100. if (retval == PAM_SUCCESS)
  101. pam_end (pamh, PAM_SUCCESS);
  102. #endif /* USE_PAM */
  103. --- ./src/newusers.c.orig 2004-12-22 17:36:27.011948040 +0100
  104. +++ ./src/newusers.c 2004-12-22 17:36:31.626246560 +0100
  105. @@ -598,18 +598,6 @@
  106. (void) pw_unlock ();
  107. #ifdef USE_PAM
  108. - if (retval == PAM_SUCCESS) {
  109. - retval = pam_chauthtok (pamh, 0);
  110. - if (retval != PAM_SUCCESS) {
  111. - pam_end (pamh, retval);
  112. - }
  113. - }
  114. -
  115. - if (retval != PAM_SUCCESS) {
  116. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  117. - exit (1);
  118. - }
  119. -
  120. if (retval == PAM_SUCCESS)
  121. pam_end (pamh, PAM_SUCCESS);
  122. #endif /* USE_PAM */
  123. --- ./src/useradd.c.orig 2004-12-22 17:36:37.990279080 +0100
  124. +++ ./src/useradd.c 2004-12-22 17:36:41.877688104 +0100
  125. @@ -1776,18 +1776,6 @@
  126. close_files ();
  127. #ifdef USE_PAM
  128. - if (retval == PAM_SUCCESS) {
  129. - retval = pam_chauthtok (pamh, 0);
  130. - if (retval != PAM_SUCCESS) {
  131. - pam_end (pamh, retval);
  132. - }
  133. - }
  134. -
  135. - if (retval != PAM_SUCCESS) {
  136. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  137. - exit (1);
  138. - }
  139. -
  140. if (retval == PAM_SUCCESS)
  141. pam_end (pamh, PAM_SUCCESS);
  142. #endif /* USE_PAM */
  143. --- ./src/userdel.c.orig 2004-12-22 17:36:45.031208696 +0100
  144. +++ ./src/userdel.c 2004-12-22 17:36:48.645659216 +0100
  145. @@ -807,17 +807,6 @@
  146. user_cancel (user_name);
  147. close_files ();
  148. #ifdef USE_PAM
  149. - if (retval == PAM_SUCCESS) {
  150. - retval = pam_chauthtok (pamh, 0);
  151. - if (retval != PAM_SUCCESS)
  152. - pam_end (pamh, retval);
  153. - }
  154. -
  155. - if (retval != PAM_SUCCESS) {
  156. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  157. - exit (E_PW_UPDATE);
  158. - }
  159. -
  160. if (retval == PAM_SUCCESS)
  161. pam_end (pamh, PAM_SUCCESS);
  162. #endif /* USE_PAM */
  163. --- ./src/usermod.c.orig 2004-12-22 17:36:51.806178744 +0100
  164. +++ ./src/usermod.c 2004-12-22 17:36:55.669591416 +0100
  165. @@ -1487,18 +1487,6 @@
  166. exit (E_GRP_UPDATE);
  167. #ifdef USE_PAM
  168. - if (retval == PAM_SUCCESS) {
  169. - retval = pam_chauthtok (pamh, 0);
  170. - if (retval != PAM_SUCCESS) {
  171. - pam_end (pamh, retval);
  172. - }
  173. - }
  174. -
  175. - if (retval != PAM_SUCCESS) {
  176. - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
  177. - exit (1);
  178. - }
  179. -
  180. if (retval == PAM_SUCCESS)
  181. pam_end (pamh, PAM_SUCCESS);
  182. #endif /* USE_PAM */