about summary refs log tree commit diff
path: root/src/dhcp/nm-dhcp-dhclient-utils.h
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2021-01-11 18:07:03 +0100
committerSebastien Bacher <seb128@ubuntu.com>2021-01-11 18:15:57 +0100
commit2567f558da3eb9911678227d4aeb15162e707d89 (patch)
tree13c80b0e091c8ba585b14b966cda998f95f1936d /src/dhcp/nm-dhcp-dhclient-utils.h
parent02d99ffd62ede29cffcb45fcbe33d044b7406d3a (diff)
parentf54032b30e1ddd84f10a339e0caf493772e049a7 (diff)
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/dhcp/nm-dhcp-dhclient-utils.h')
-rw-r--r--src/dhcp/nm-dhcp-dhclient-utils.h37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index 5094d614..3e524ee0 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010 Red Hat, Inc.
  */
@@ -9,27 +9,26 @@
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 
-char *nm_dhcp_dhclient_create_config (const char *interface,
-                                      int addr_family,
-                                      GBytes *client_id,
-                                      const char *anycast_addr,
-                                      const char *hostname,
-                                      guint32 timeout,
-                                      gboolean use_fqdn,
-                                      NMDhcpHostnameFlags hostname_flags,
-                                      const char *mud_url,
-                                      const char *orig_path,
-                                      const char *orig_contents,
-                                      GBytes **out_new_client_id);
+char *nm_dhcp_dhclient_create_config(const char *        interface,
+                                     int                 addr_family,
+                                     GBytes *            client_id,
+                                     const char *        anycast_addr,
+                                     const char *        hostname,
+                                     guint32             timeout,
+                                     gboolean            use_fqdn,
+                                     NMDhcpHostnameFlags hostname_flags,
+                                     const char *        mud_url,
+                                     const char *const * reject_servers,
+                                     const char *        orig_path,
+                                     const char *        orig_contents,
+                                     GBytes **           out_new_client_id);
 
-char *nm_dhcp_dhclient_escape_duid (GBytes *duid);
+char *nm_dhcp_dhclient_escape_duid(GBytes *duid);
 
-GBytes *nm_dhcp_dhclient_unescape_duid (const char *duid);
+GBytes *nm_dhcp_dhclient_unescape_duid(const char *duid);
 
-GBytes *nm_dhcp_dhclient_read_duid (const char *leasefile, GError **error);
+GBytes *nm_dhcp_dhclient_read_duid(const char *leasefile, GError **error);
 
-gboolean nm_dhcp_dhclient_save_duid (const char *leasefile,
-                                     GBytes *duid,
-                                     GError **error);
+gboolean nm_dhcp_dhclient_save_duid(const char *leasefile, GBytes *duid, GError **error);
 
 #endif /* __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ */