[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ff12bfdae1c2c1e54da564fdd7da6783b5e30047

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ff12bfdae1c2c1e54da564fdd7da6783b5e30047

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 3952 bytes --]

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 "IPFire 2.x development tree".

The branch, next has been updated
       via  ff12bfdae1c2c1e54da564fdd7da6783b5e30047 (commit)
       via  70d8e3be302cfc30631d7cc5b4f572e410cb777c (commit)
      from  a778e396bdb52fed0f1e62060ee86ec6f4242e3b (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 -----------------------------------------------------------------
commit ff12bfdae1c2c1e54da564fdd7da6783b5e30047
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:39:45 2023 +0000

    Revert "Run ./make.sh update-contributors"
    
    This reverts commit a778e396bdb52fed0f1e62060ee86ec6f4242e3b.

commit 70d8e3be302cfc30631d7cc5b4f572e410cb777c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:37:24 2023 +0000

    Revert "dhcp.cgi: Add column with resolved hostname by IP address"
    
    This reverts commit ee556e820f02c77716e74be727da319bd429fba4.
    
    See https://lists.ipfire.org/hyperkitty/list/development(a)lists.ipfire.org/message/QNCXBVG7CNENG4YTSRXXDQCB52E7FEW7/

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/credits.cgi |  3 +--
 html/cgi-bin/dhcp.cgi    | 11 ++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 04a81445d..2d9697a65 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -79,8 +79,8 @@ Timo Eissler,
 Ben Schweikert,
 Daniel Weismüller,
 Peter Pfeiffer,
-Robin Roevens,
 Daniel Glanzmann,
+Robin Roevens,
 Heiner Schmeling,
 Stephan Feddersen,
 Stéphane Pautrel,
@@ -143,7 +143,6 @@ Oliver Fuhrer,
 Osmar Gonzalez,
 Paul T. Simmons,
 Robert Möker,
-Sebastien GISLAIN,
 Stefan Ernst,
 Stefan Ferstl,
 Steffen Klammer,
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index fdfc74eb4..84e2322af 100755
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -21,7 +21,6 @@
 
 use strict;
 use experimental 'smartmatch';
-use IO::Socket;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -1008,9 +1007,8 @@ END
 print <<END
 <table width='100%' class='tbl'>
 <tr>
-    <th width='15%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
-    <th width='10%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th>
-    <th width='15%' align='center'><b>$Lang::tr{'hostname'}</b></th>
+    <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
+    <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th>
     <th width='15%' align='center'><b>$Lang::tr{'remark'}</b></th>
     <th width='15%' class='boldbase' align='center'><b>next-server</b></th>
     <th width='15%' class='boldbase' align='center'><b>filename</b></th>
@@ -1108,14 +1106,9 @@ foreach my $line (@current2) {
 	$TAG4 = "class='red'" if ($dhcpsettings{'KEY2'} ne $key);
     }
 
-	# resolved name (if exists)
-	my $iaddr = inet_aton($temp[1]);
-	my $rname = gethostbyaddr($iaddr, AF_INET);
-	if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup failed'}; }
     print <<END
 <td align='center' $col>$TAG2$temp[0]$TAG3</td>
 <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
-<td align='center' $col>$rname&nbsp;</td>
 <td align='center' $col>$temp[6]&nbsp;</td>
 <td align='center' $col>$temp[3]&nbsp;</td>
 <td align='center' $col>$temp[4]&nbsp;</td>


hooks/post-receive
--
IPFire 2.x development tree