svn commit: samba r17843 - in branches/SOC/sree: .

[sree at samba.org]

Author: sree
Date: 2006-08-26 17:51:20 +0000 (Sat, 26 Aug 2006)
New Revision: 17843

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17843

Log:
Remove code in user_rename() in usermgmt.js that changes "CN" and
"name" of renamed user, as ldb.rename() now does that.

Enhance test_user_rename() tests to check all attributes for effect of
rename in test.js



Modified:
   branches/SOC/sree/test.js
   branches/SOC/sree/usermgmt.js


Changeset:
Modified: branches/SOC/sree/test.js
===================================================================
--- branches/SOC/sree/test.js	2006-08-26 17:19:58 UTC (rev 17842)
+++ branches/SOC/sree/test.js	2006-08-26 17:51:20 UTC (rev 17843)
@@ -43,10 +43,21 @@
 
 function test_user_rename(sam)
 {
+    var names = new Array("CN", "name", "sAMAccountName");
     print("Testing user_rename ... ");
     
     var ok = user_rename(sam, "jrandomuser", "jrurenamed");
-    assert(ok);
+    assert(ok);    
+    
+    var results = user_get(sam, "jrurenamed", names);
+    assert(results != null);
+    for(var i = 0; i < names.length; i++)
+	{
+	    var key = names[i];
+	    printf("%s ", key);
+	    assert(results[key] == "jrurenamed");
+	}
+    
     assert(user_rename(sam, "jrurenamed", "jrandomuser"));
 
     print("OK.\n");

Modified: branches/SOC/sree/usermgmt.js
===================================================================
--- branches/SOC/sree/usermgmt.js	2006-08-26 17:19:58 UTC (rev 17842)
+++ branches/SOC/sree/usermgmt.js	2006-08-26 17:51:20 UTC (rev 17843)
@@ -233,7 +233,8 @@
     var newuser_dn = sprintf("CN=%s,CN=Users,%s", 
 			    newusername, sam.domain_dn);
 
-    var replace_attrs = new Array("sAMAccountName", "name");
+    // this list should get shorter over time?
+    var replace_attrs = new Array("sAMAccountName");
 
     sam.ldb.transaction_start();
 
@@ -277,12 +278,7 @@
 
     ldifmod = sprintf("dn: %s
 changetype: modify
-delete: cn
-cn: %s
--
-add: cn
-cn: %s
-", newuser_dn, username, newusername);  // cn is multi-valued
+", newuser_dn);
 
     // the others are single-valued and can be replaced
     for(var i = 0; i < replace_attrs.length; i++)