Index: openacs-4/packages/auth-pam/tcl/auth-pam-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/auth-pam/tcl/auth-pam-procs.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/auth-pam/tcl/auth-pam-procs.tcl	13 Jan 2005 13:56:10 -0000	1.3
+++ openacs-4/packages/auth-pam/tcl/auth-pam-procs.tcl	1 Mar 2006 21:05:07 -0000	1.3.2.1
@@ -21,6 +21,7 @@
         aliases {
             Authenticate auth::pam::authentication::Authenticate
             GetParameters auth::pam::authentication::GetParameters
+	    MergeUser auth::pam::authentication::MergeUser
         }
     }
 
@@ -187,3 +188,9 @@
 } {
     return [list]
 }
+
+ad_proc -private auth::pam::password::MergeUser {} {
+    Implements the MergeUser operation of the auth_password
+    service contract for PAM.
+} {
+}