Index: openacs-4/packages/auth-ldap/tcl/auth-ldap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/auth-ldap/tcl/auth-ldap-procs.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/auth-ldap/tcl/auth-ldap-procs.tcl 13 Jan 2005 13:56:09 -0000 1.9 +++ openacs-4/packages/auth-ldap/tcl/auth-ldap-procs.tcl 13 Jun 2005 16:27:11 -0000 1.9.2.1 @@ -20,6 +20,7 @@ name "LDAP" pretty_name "LDAP" aliases { + MergeUser auth::ldap::authentication::MergeUser Authenticate auth::ldap::authentication::Authenticate GetParameters auth::ldap::authentication::GetParameters } @@ -224,7 +225,21 @@ # ##### +ad_proc -private auth::ldap::authentication::MergeUser { + from_user_id + to_user_id + {authority_id ""} +} { + Implements the merge operation of the auth_authentication + service contract for local_LDAP. +} { + ns_log Notice "Running ldap MergeUser ..." + auth::ldap::delete_user $from_user_id + set msg "MergeUser is complete" + ns_log Notice $msg +} + ad_proc -private auth::ldap::authentication::Authenticate { username password