Merge remote-tracking branch 'salsa/debian/master'

1 files changed, 4 insertions, 18 deletions

diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index 1ff93685..59ad5e87 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2014 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2014 Red Hat, Inc.
  */
 
 #ifndef NMC_SETTINGS_H
@@ -45,7 +31,7 @@ char       *nmc_setting_get_property_parsable (NMSetting *setting,
 gboolean    nmc_setting_set_property (NMClient *client,
                                       NMSetting *setting,
                                       const char *prop,
-                                      char modifier,
+                                      NMMetaAccessorModifier modifier,
                                       const char *val,
                                       GError **error);