git-remote-mediawiki: allow a domain to be set for authentication

When the wiki uses e.g. LDAP for authentication, the web interface shows
a popup to allow the user to chose an authentication domain, and we need
to use lgdomain in the API at login time.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index b809792853c0e9623f56273f0e6c97207887f21a..0b32d18eaa963492bfb7fb1bb4437763db7b70c3 100755 (executable)
--- a/contrib/mw-to-git/git-remote-mediawiki
+++ b/contrib/mw-to-git/git-remote-mediawiki
@@ -76,8 +76,10 @@ my $wiki_login = run_git("config --get remote.". $remotename .".mwLogin");
 # inside a remote helper, so our stdin is connect to git, not to a
 # terminal.
 my $wiki_passwd = run_git("config --get remote.". $remotename .".mwPassword");
 # inside a remote helper, so our stdin is connect to git, not to a
 # terminal.
 my $wiki_passwd = run_git("config --get remote.". $remotename .".mwPassword");

+my $wiki_domain = run_git("config --get remote.". $remotename .".mwDomain");

 chomp($wiki_login);
 chomp($wiki_passwd);
 chomp($wiki_login);
 chomp($wiki_passwd);

+chomp($wiki_domain);

 
 # Import only last revisions (both for clone and fetch)
 my $shallow_import = run_git("config --get --bool remote.". $remotename .".shallow");
 
 # Import only last revisions (both for clone and fetch)
 my $shallow_import = run_git("config --get --bool remote.". $remotename .".shallow");


@@ -158,6 +160,7 @@ sub mw_connect_maybe {
                if (!$mediawiki->login({
                        lgname => $wiki_login,
                        lgpassword => $wiki_passwd,
                if (!$mediawiki->login({
                        lgname => $wiki_login,
                        lgpassword => $wiki_passwd,

+                       lgdomain => $wiki_domain,

                })) {
                        print STDERR "Failed to log in mediawiki user \"$wiki_login\" on $url\n";
                        print STDERR "(error " .
                })) {
                        print STDERR "Failed to log in mediawiki user \"$wiki_login\" on $url\n";
                        print STDERR "(error " .