[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 23dabd44c78fe66a0c4fbcc64c1212e98b0e76a1

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:09:32 CEST 2013


The branch, statusflag has been updated
       via  23dabd44c78fe66a0c4fbcc64c1212e98b0e76a1 (commit)
      from  30d74cbdcbcf4a1166e32381d27323c0e9dc9c50 (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/python-x2gobroker.install                   |    1 +
 etc/{ => broker}/x2gobroker-sessionprofiles.conf   |    2 +-
 .../authmechs/{htpasswd.py => htpasswd_mech.py}    |    0
 x2gobroker/authmechs/{pam.py => pam_mech.py}       |    2 ++
 .../authmechs/{testsuite.py => testsuite_mech.py}  |    0
 x2gobroker/brokers/base.py                         |    4 ++--
 .../{libnss.py => libnss_nameservice.py}           |    0
 .../{testsuite.py => testsuite_nameservice.py}     |    0
 8 files changed, 6 insertions(+), 3 deletions(-)
 rename etc/{ => broker}/x2gobroker-sessionprofiles.conf (99%)
 rename x2gobroker/authmechs/{htpasswd.py => htpasswd_mech.py} (100%)
 rename x2gobroker/authmechs/{pam.py => pam_mech.py} (99%)
 rename x2gobroker/authmechs/{testsuite.py => testsuite_mech.py} (100%)
 rename x2gobroker/nameservices/{libnss.py => libnss_nameservice.py} (100%)
 rename x2gobroker/nameservices/{testsuite.py => testsuite_nameservice.py} (100%)

The diff of changes is:
diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install
index 99281cd..c8bd09a 100644
--- a/debian/python-x2gobroker.install
+++ b/debian/python-x2gobroker.install
@@ -1,3 +1,4 @@
 etc/x2gobroker.conf etc/x2go/
+etc/broker etc/x2go/
 pam/x2gobroker etc/pam.d/
 usr/
diff --git a/etc/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
similarity index 99%
rename from etc/x2gobroker-sessionprofiles.conf
rename to etc/broker/x2gobroker-sessionprofiles.conf
index 24fd3ed..c8982f3 100644
--- a/etc/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -76,7 +76,7 @@ host=server-a.pool-a.domain.local
 name=GNOME - pool-A (srv-A)
 command=GNOME
 acl-users-deny=ALL
-acl-groups-allows=gnome-users,admins
+acl-groups-allow=gnome-users,admins
 acl-clients-deny=ALL
 acl-clients-allow=10.1.0.0/16
 acl-any-order=deny-allow
diff --git a/x2gobroker/authmechs/htpasswd.py b/x2gobroker/authmechs/htpasswd_mech.py
similarity index 100%
rename from x2gobroker/authmechs/htpasswd.py
rename to x2gobroker/authmechs/htpasswd_mech.py
diff --git a/x2gobroker/authmechs/pam.py b/x2gobroker/authmechs/pam_mech.py
similarity index 99%
rename from x2gobroker/authmechs/pam.py
rename to x2gobroker/authmechs/pam_mech.py
index 77927f4..fca5ec0 100644
--- a/x2gobroker/authmechs/pam.py
+++ b/x2gobroker/authmechs/pam_mech.py
@@ -18,6 +18,8 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+import pam
+
 class X2GoBrokerAuthMech(object):
 
     def authenticate(self, username, password):
diff --git a/x2gobroker/authmechs/testsuite.py b/x2gobroker/authmechs/testsuite_mech.py
similarity index 100%
rename from x2gobroker/authmechs/testsuite.py
rename to x2gobroker/authmechs/testsuite_mech.py
diff --git a/x2gobroker/brokers/base.py b/x2gobroker/brokers/base.py
index 788e1b7..79a5542 100644
--- a/x2gobroker/brokers/base.py
+++ b/x2gobroker/brokers/base.py
@@ -300,7 +300,7 @@ class X2GoBroker(object):
     def _import_authmech_module(self, mech='pam'):
         try:
             if self.authmech_module is None:
-                exec("import x2gobroker.authmechs.{mech} as _authmech_module".format(mech=mech))
+                exec("import x2gobroker.authmechs.{mech}_mech as _authmech_module".format(mech=mech))
                 self.authmech_module = _authmech_module
             return True
         except ImportError:
@@ -371,7 +371,7 @@ class X2GoBroker(object):
     def _import_nameservice_module(self, service='libnss'):
         try:
             if self.nameservice_module is None:
-                exec("import x2gobroker.nameservices.{service} as _nameservice_module".format(service=service))
+                exec("import x2gobroker.nameservices.{service}_nameservice as _nameservice_module".format(service=service))
                 self.nameservice_module = _nameservice_module
             return True
         except ImportError:
diff --git a/x2gobroker/nameservices/libnss.py b/x2gobroker/nameservices/libnss_nameservice.py
similarity index 100%
rename from x2gobroker/nameservices/libnss.py
rename to x2gobroker/nameservices/libnss_nameservice.py
diff --git a/x2gobroker/nameservices/testsuite.py b/x2gobroker/nameservices/testsuite_nameservice.py
similarity index 100%
rename from x2gobroker/nameservices/testsuite.py
rename to x2gobroker/nameservices/testsuite_nameservice.py


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).




More information about the x2go-commits mailing list