Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2008-12-18  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_pwhistory/pam_pwhistory.c (parse_option): Rename
        type= option to authtok_type= (because of pam_get_authtok).
        * modules/pam_pwhistory/pam_pwhistory.8.xml: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 30aec4062c1407245e51f46e753e7399ceb0fa9d..581aac7bc0480e932e5ae4ffc6a2c9cc8301ce57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-18  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_pwhistory/pam_pwhistory.c (parse_option): Rename
+       type= option to authtok_type= (because of pam_get_authtok).
+       * modules/pam_pwhistory/pam_pwhistory.8.xml: Likewise.
+
 2008-12-17  Tomas Mraz <t8m@centrum.cz>
 
        * modules/pam_tty_audit/pam_tty_audit.c (pam_sm_open_session): Do

diff --git a/modules/pam_pwhistory/pam_pwhistory.8.xml b/modules/pam_pwhistory/pam_pwhistory.8.xml
index f8c152ad96a830189cd7635352b985190b83ae5c..cc21670724cf0555c5b0ee2aa5236f17a4cc62dc 100644 (file)
--- a/modules/pam_pwhistory/pam_pwhistory.8.xml
+++ b/modules/pam_pwhistory/pam_pwhistory.8.xml
@@ -34,7 +34,7 @@
         retry=<replaceable>N</replaceable>
       </arg>
       <arg choice="opt">
-        type=<replaceable>STRING</replaceable>
+        authtok_type=<replaceable>STRING</replaceable>
       </arg>
 
     </cmdsynopsis>
@@ -124,15 +124,13 @@
 
         <varlistentry>
           <term>
-            <option>type=<replaceable>STRING</replaceable></option>
+            <option>authtok_type=<replaceable>STRING</replaceable></option>
           </term>
           <listitem>
             <para>
-              The default action is for the module to use the
-              following prompts when requesting passwords:
-              "New UNIX password: " and "Retype UNIX password: ".
-              The default word <emphasis>UNIX</emphasis> can
-              be replaced with this option.
+              See <citerefentry>
+       <refentrytitle>pam_get_authtok</refentrytitle><manvolnum>3</manvolnum>
+      </citerefentry> for more details.
             </para>
           </listitem>
         </varlistentry>
@@ -231,6 +229,9 @@ password     required       pam_unix.so        use_authtok
       <citerefentry>
        <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
+      <citerefentry>
+       <refentrytitle>pam_get_authtok</refentrytitle><manvolnum>3</manvolnum>
+      </citerefentry>
     </para>
   </refsect1>
 

diff --git a/modules/pam_pwhistory/pam_pwhistory.c b/modules/pam_pwhistory/pam_pwhistory.c
index c555ac392e4b33d956b9c8fad81f1b00e8d217ce..0f6ffca3496677f616655f7de8f20a02b64d7ad4 100644 (file)
--- a/modules/pam_pwhistory/pam_pwhistory.c
+++ b/modules/pam_pwhistory/pam_pwhistory.c
@@ -65,7 +65,6 @@ struct options_t {
   int enforce_for_root;
   int remember;
   int tries;
-  const char *prompt_type;
 };
 typedef struct options_t options_t;
 
@@ -97,8 +96,8 @@ parse_option (pam_handle_t *pamh, const char *argv, options_t *options)
     }
   else if (strcasecmp (argv, "enforce_for_root") == 0)
     options->enforce_for_root = 1;
-  else if (strncasecmp (argv, "type=", 5) == 0)
-    options->prompt_type = &argv[5];
+  else if (strncasecmp (argv, "authtok_type=", 13) == 0)
+    { /* ignore, for pam_get_authtok */; }
   else
     pam_syslog (pamh, LOG_ERR, "pam_pwhistory: unknown option: %s", argv);
 }
@@ -118,7 +117,6 @@ pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv)
   /* Set some default values, which could be overwritten later.  */
   options.remember = 10;
   options.tries = 1;
-  options.prompt_type = "UNIX";
 
   /* Parse parameters for module */
   for ( ; argc-- > 0; argv++)