[X2go-Commits] x2goadmincenter.git - master (branch) updated: bf9c2a62b7d9ae0749d90a2ca185d6e582657a93

[X2Go dev team]

The branch, master has been updated
       via  bf9c2a62b7d9ae0749d90a2ca185d6e582657a93 (commit)
      from  a23b0f36e52f8f1bf0f288179a2a0972c75c61e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf9c2a62b7d9ae0749d90a2ca185d6e582657a93
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Jan 23 15:27:08 2013 +0100

    fixed setting password by user creation

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 .../lib/x2goadminserver_backend_ldap.pm            |   31 +++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 11f7f1c..4521723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,5 +11,6 @@ x2goadmincenter (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
   [ Oleksandr Shneyder ]
   * support for BIRTHDAY Argument in user administration module
     ldap backend for x2goadminserver
+  * fixed setting password by user creation
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 21 Sep 2011 21:12:56 +0200
diff --git a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm
index 2a415a9..e4c2b03 100644
--- a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm
+++ b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm
@@ -162,11 +162,16 @@ sub addModifyUser
     return $str;
   }
   my $modsn=0;
+  my $setPass=0;
   my $modcn=0;
   my $attr={};
   my @newgrp;
   my @obsgrp;
   my $userUidNumber;
+  my $valpwdlastset = 0;
+  my $lmPass = "XXX";
+  my $ntPass = "XXX";
+  my $userPass = "XXX";
   foreach (@args)
   {
     my @cmd=split(":",$_);
@@ -191,12 +196,14 @@ sub addModifyUser
     {
       my $csh = Crypt::SaltedHash->new(algorithm => 'SHA-1');
       $csh->add(@cmd[1]);
-      $attr->{'userPassword'}=$csh->generate;
-      my ( $lm, $nt ) = ntlmgen (@cmd[1]);
-      $attr->{'sambaNTPassword'}=$nt;
-      $attr->{'sambaLMPassword'}=$lm;
-      $attr->{'sambaPwdLastSet'}=time;
-       ###set samba passwords and flags
+      $userPass=$csh->generate;
+      $attr->{'userPassword'}=$userPass;
+      ($lmPass, $ntPass ) = ntlmgen (@cmd[1]);
+      $attr->{'sambaNTPassword'}=$ntPass;
+      $attr->{'sambaLMPassword'}=$lmPass;
+      $valpwdlastset = time;
+      $attr->{'sambaPwdLastSet'}=$valpwdlastset;
+      $setPass=1;
     }
     if(@cmd[0] eq "fname")
     {
@@ -270,7 +277,6 @@ sub addModifyUser
       my $valacctflags = "[UX]";
       my $userRid=2 * $userUidNumber + 1000;
 
-      push(@$arr, sambaPwdLastSet => "$valpwdlastset");
       push(@$arr, sambaLogonTime => '0');
       push(@$arr, sambaLogoffTime => '2147483647');
       push(@$arr, sambaKickoffTime => '2147483647');
@@ -279,10 +285,15 @@ sub addModifyUser
       push(@$arr, sambaAcctFlags => "$valacctflags");
       push(@$arr, sambaSID => "$sid-$userRid");
       push(@$arr, sambaPrimaryGroupSID => $sambagroup);
-      push(@$arr, sambaLMPassword => "XXX");
-      push(@$arr, sambaNTPassword => "XXX");
 
-      push(@$arr, userPassword=>'XXX');
+      if(!$setPass)
+      {
+          push(@$arr, sambaPwdLastSet => "$valpwdlastset");
+          push(@$arr, sambaLMPassword => $lmPass);
+          push(@$arr, sambaNTPassword => $ntPass);
+          push(@$arr, userPassword => $userPass);
+      }
+
       push(@$arr, objectClass=>['top','inetOrgPerson','posixAccount', 'shadowAccount', 'sambaSamAccount']);
       $message=$ldap->add("uid=$user,ou=People,$basedn", attr => $arr);
   }


hooks/post-receive
-- 
x2goadmincenter.git (X2Go Administration Center)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goadmincenter.git" (X2Go Administration Center).