The branch, master-inai has been updated via 7c41ea0951e4a04f2324a7948c81d9c4e4414c29 (commit) from 2a9d64ae0863147ded432227b13275107ba18ff2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/control | 1 + lib/x2gobroker-ldap.pm | 6 +++--- lib/x2gobroker-zeroconf.pm | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 0280326..10dc11a 100644 --- a/debian/control +++ b/debian/control @@ -72,6 +72,7 @@ Depends: ${misc:Depends}, apache2 | httpd, perl, + libnet-ldap-perl, x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), Description: X2Go http(s) session broker (simple broker) X2Go is a serverbased computing environment with diff --git a/lib/x2gobroker-ldap.pm b/lib/x2gobroker-ldap.pm index 5e56c28..d05d63f 100644 --- a/lib/x2gobroker-ldap.pm +++ b/lib/x2gobroker-ldap.pm @@ -18,7 +18,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -package x2gobroker-simple; +package x2gobroker-ldap; use strict; use Net::LDAP; @@ -29,7 +29,7 @@ use Data::Dumper; my $cfg=new Config::Simple(syntax=>'ini'); -$cfg->read("/etc/x2go/x2gobroker-simple.cfg"); +$cfg->read("/etc/x2go/x2gobroker-ldap.cfg"); my $ldapuri=$cfg->param('ldapuri'); my $replica=$cfg->param('replica'); my $binddn=$cfg->param('binddn'); @@ -40,7 +40,7 @@ our @EXPORT = ('checkAccess', 'listSessions', 'selectSession', 'setPass'); sub getBase ### -### FIXME: provide that in /etc/x2go/x2gobroker-simple.cfg +### FIXME: provide that in /etc/x2go/x2gobroker-ldap.cfg ### FIXME: put the pid of this process in the lock files { my $login=shift; diff --git a/lib/x2gobroker-zeroconf.pm b/lib/x2gobroker-zeroconf.pm index 5e56c28..fae529a 100644 --- a/lib/x2gobroker-zeroconf.pm +++ b/lib/x2gobroker-zeroconf.pm @@ -21,7 +21,6 @@ package x2gobroker-simple; use strict; -use Net::LDAP; use Config::Simple; use Crypt::SaltedHash; use MIME::Base64; hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).