sync with changes from Jerome Tournier @ IDEALX; should now work with sambaSamAccount schema

(This used to be commit 5f41cd76b793305e1e9e4da76d58daa2d8438c63)

1 files changed, 7 insertions, 6 deletions

diff --git a/examples/LDAP/smbldap-tools/smbldap-passwd.pl b/examples/LDAP/smbldap-tools/smbldap-passwd.pl
index ef7687a49e..29aee97c50 100755
--- a/examples/LDAP/smbldap-tools/smbldap-passwd.pl
+++ b/examples/LDAP/smbldap-tools/smbldap-passwd.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # LDAP to unix password sync script for samba
+#
 #  This code was developped by IDEALX (http://IDEALX.org/) and
 #  contributors (their names can be found in the CONTRIBUTORS file).
 #
@@ -113,19 +114,19 @@ if ($samba == 1) {
 	    exit(1);
 	}
 	my $ntpwd = `$mk_ntpasswd '$pass'`;
-        chomp(my $lmpassword = substr($ntpwd, 0, index($ntpwd, ':')));
-        chomp(my $ntpassword = substr($ntpwd, index($ntpwd, ':')+1));
+        chomp(my $sambaLMPassword = substr($ntpwd, 0, index($ntpwd, ':')));
+        chomp(my $sambaNTPassword = substr($ntpwd, index($ntpwd, ':')+1));
 
 # change nt/lm passwords
 	my $tmpldif =
 "$dn_line
 changetype: modify
-replace: lmpassword
-lmpassword: $lmpassword
+replace: sambaLMPassword
+sambaLMPassword: $sambaLMPassword
 -
 changetype: modify
-replace: ntpassword
-ntpassword: $ntpassword
+replace: sambaNTPassword
+sambaNTPassword: $sambaNTPassword
 -
 
 ";