Merge pull request #15530 from ssahani/lpr-dhcpv4-option-9

network: add support to DHCPv4 server/client option 9 LPR

diff --cc man/systemd.network.xml
Simple merge

diff --cc src/libsystemd-network/sd-dhcp-lease.c
index 56ea1925869c605aa4c73709bcf5c84040f4e43f,abb2018810f696a43b088795a56718dee22a465a..29688f2d4fe56c8f4228b3127eeed38b391222bd
--- 1/src/libsystemd-network/sd-dhcp-lease.c
--- 2/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@@ -140,9 -140,16 +140,16 @@@ int sd_dhcp_lease_get_servers
                  *addr = lease->smtp_server;
                  return (int) lease->smtp_server_size;
  
+         case SD_DHCP_LEASE_LPR_SERVERS:
+                 if (lease->lpr_server_size <= 0)
+                         return -ENODATA;
+ 
+                 *addr = lease->lpr_server;
+                 return (int) lease->lpr_server_size;
+ 
          default:
 -                log_debug("Uknown DHCP lease info item %d.", what);
 -                return -ENXIO;
 +                return log_debug_errno(SYNTHETIC_ERRNO(ENXIO),
 +                                       "Unknown DHCP lease info item %d.", what);
          }
  }
  

diff --cc src/libsystemd-network/sd-dhcp-server.c
index 1c61749ef06af9306c79b658e0576770bc5cd0ba,e197f1ea72654bffe59ff770b87913c61332ff3c..57eed765eea364062a0a35c009776320d2a62766
--- 1/src/libsystemd-network/sd-dhcp-server.c
--- 2/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@@ -1161,9 -1171,14 +1171,14 @@@ int sd_dhcp_server_set_servers
                  n_a = &server->n_smtp_server;
                  break;
  
+         case SD_DHCP_LEASE_LPR_SERVERS:
+                 a = &server->lpr_server;
+                 n_a = &server->n_lpr_server;
+                 break;
+ 
          default:
 -                log_debug("Uknown DHCP lease info item %d.", what);
 -                return -ENXIO;
 +                return log_debug_errno(SYNTHETIC_ERRNO(ENXIO),
 +                                       "Unknown DHCP lease info item %d.", what);
          }
  
          if (*n_a == n_addresses &&

diff --cc src/network/networkd-dhcp-server.c
index 7859768f5e64f9838496d60a0b0d1223f827f75e,be723ddbbc6df6ae5f4dfed9f76f9cd7b5d08afb..c0df1fb2c4c381bef4cfcfce685150ee22ff5b5d
--- 1/src/network/networkd-dhcp-server.c
--- 2/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@@ -127,8 -127,13 +127,13 @@@ static int link_push_uplink_to_dhcp_ser
                  lease_condition = link->network->dhcp_use_sip;
                  break;
  
+         case SD_DHCP_LEASE_LPR_SERVERS:
+                 servers = link->network->lpr;
+                 lease_condition = true;
+                 break;
+ 
          default:
 -                assert_not_reached("Uknown DHCP lease info item");
 +                assert_not_reached("Unknown DHCP lease info item");
          }
  
          char **a;

diff --cc src/network/networkd-manager.c
Simple merge

diff --cc src/network/networkd-network-gperf.gperf
Simple merge

diff --cc src/network/networkd-network.h
Simple merge