[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 3acbb6d354fe3421197a568004bb135c7b6612bf
X2Go dev team
git-admin at x2go.org
Sun May 19 13:02:55 CEST 2013
The branch, build-main has been updated
via 3acbb6d354fe3421197a568004bb135c7b6612bf (commit)
from 241a6ba9de4baaa0fda547636ce29578c24ff5bd (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:
X2Go/Broker/ZeroConf.pm | 4 ++--
debian/changelog | 1 +
debian/x2gobroker-common.install | 3 ++-
debian/x2gobroker.pam | 2 ++
4 files changed, 7 insertions(+), 3 deletions(-)
create mode 100644 debian/x2gobroker.pam
The diff of changes is:
diff --git a/X2Go/Broker/ZeroConf.pm b/X2Go/Broker/ZeroConf.pm
index 0655191..b98f9d8 100644
--- a/X2Go/Broker/ZeroConf.pm
+++ b/X2Go/Broker/ZeroConf.pm
@@ -44,7 +44,7 @@ sub CheckAccess
# zeroconf broker: use PAM to perform authentication against
# the local PAM login module
my ($user,$pass)=@_;
- my $pam = Authen::Simple::PAM->new(service => 'login');
+ my $pam = Authen::Simple::PAM->new(service => 'x2gobroker');
if ( $pam->authenticate( $username, $password ) ) {
# successfull authentication
return 0
@@ -63,7 +63,7 @@ sub SetPass
my ($username, $oldpassword, $newpassword)=@_;
# zeroconf broker: use PAM to initiate a local passwd change
- my $service = "passwd";
+ my $service = "x2gobroker";
ref($pamh = new Authen::PAM($service, $username, \&passwd_conv_func)) ||
die "Error code $pamh during PAM init!";
$state = 0;
diff --git a/debian/changelog b/debian/changelog
index 485bd70..73dcd8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Setting up new public X2Go project: x2gobroker.
+ - Using our own PAM service ,,x2gobroker''.
* /debian/control:
+ Add an initial dependency selection to the various Depends fields.
* Fix code indentations (spaces replaced by tabs, use proper indentation
diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install
index 59f3588..aaba49d 100644
--- a/debian/x2gobroker-common.install
+++ b/debian/x2gobroker-common.install
@@ -1 +1,2 @@
-cgi/x2gobroker.cgi usr/lib/cgi-bin/
\ No newline at end of file
+cgi/x2gobroker.cgi usr/lib/cgi-bin/
+x2gobroker etc/pam.d
\ No newline at end of file
diff --git a/debian/x2gobroker.pam b/debian/x2gobroker.pam
new file mode 100644
index 0000000..1eaad76
--- /dev/null
+++ b/debian/x2gobroker.pam
@@ -0,0 +1,2 @@
+ at include common-auth
+ at include common-passwd
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