summaryrefslogtreecommitdiff
path: root/devel/bugzilla44/files/freebsd-project-ldap.diff
blob: b6769de3d795d7b48a4b9a49e938eb43c07ef637 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
--- Bugzilla/Auth/Verify/LDAP.pm	2014-05-06 17:26:02.000000000 +0100
+++ Bugzilla/Auth/Verify/LDAP.pm	2014-05-11 20:59:58.715356171 +0100
@@ -132,7 +132,7 @@
         }
 
     } else {
-        $params->{bz_username} = $username;
+        $params->{bz_username} = $username . '@freebsd.org';
     }
 
     $params->{realname}  ||= $user_entry->get_value("displayName");
--- token.cgi.dist	2014-06-03 00:27:29.279355734 +0000
+++ token.cgi	2014-06-03 00:37:48.727359133 +0000
@@ -122,6 +122,10 @@
     my $login_name = $cgi->param('loginname')
       or ThrowUserError("login_needed_for_password_change");
 
+    if ($login_name =~ /[@.]FreeBSD\.org$/i) {
+	ThrowUserError("password_change_requests_not_allowed");
+    }
+
     check_email_syntax($login_name);
     my $user = Bugzilla::User->check($login_name);