[debian-edu-commits] r81729 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-19 19:16:29 +0000 (Fri, 19 Jul 2013)
New Revision: 81729

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/get-default-homepage
Log:
Fix argument parsing in get-default-homepage.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-18 13:03:50 UTC (rev 81728)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-19 19:16:29 UTC (rev 81729)
@@ -4,6 +4,7 @@
   * Add new script init-ltsp.d/08-edu-hostname to adjust LTSP boot to
     set hostname based on reverse DNS or MAC address like we do for
     the other machines.
+  * Fix argument parsing in get-default-homepage.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 18 Jul 2013 14:16:00 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/get-default-homepage
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/get-default-homepage	2013-07-18 13:03:50 UTC (rev 81728)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/get-default-homepage	2013-07-19 19:16:29 UTC (rev 81729)
@@ -29,15 +29,16 @@
 
 my $homepage = "about:blank";
 
-my $server = $ARGV[0] || find_ldap_server() || "ldap";
-my $base   = $ARGV[1] || find_ldap_base($server)
-    || "dc=skole,dc=skolelinux,dc=no";
-
 my %opts;
 getopts("du:", \%opts) || usage(1);
 $debug = 1 if $opts{d};
 my $username = $opts{u};
 
+my $server = $ARGV[0] || find_ldap_server() || "ldap";
+my $base   = $ARGV[1] || find_ldap_base($server)
+    || "dc=skole,dc=skolelinux,dc=no";
+
+
 if  ($server) {
     my $ldap = Net::LDAP->new( $server ) or die "$@";
     my $mesg = $ldap->bind();