From dcc310e31af7fa88eb51fabe90de7edd374aecc5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Oct 2011 08:47:38 +0200 Subject: Imported Upstream version 0.9.1.90 --- docs/Makefile.in | 6 + docs/api/Makefile.in | 6 + docs/api/html/NetworkManager.devhelp | 28 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +-- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 ++--- docs/api/html/ref-settings.html | 36 +-- docs/api/html/spec.html | 132 +++++++++- docs/api/spec.html | 132 +++++++++- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 6 + docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-util/Makefile.in | 6 + docs/libnm-util/html/NMConnection.html | 59 +++++ docs/libnm-util/html/NMSetting.html | 79 +++++- docs/libnm-util/html/api-index-full.html | 427 ++----------------------------- docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.sgml | 4 + docs/libnm-util/html/libnm-util.devhelp | 4 + docs/libnm-util/html/libnm-util.devhelp2 | 4 + docs/libnm-util/libnm-util-sections.txt | 3 + 23 files changed, 544 insertions(+), 516 deletions(-) (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index 91ce98e5..9a5b96c2 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -192,6 +192,12 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNL1_CFLAGS = @LIBNL1_CFLAGS@ +LIBNL1_LIBS = @LIBNL1_LIBS@ +LIBNL2_CFLAGS = @LIBNL2_CFLAGS@ +LIBNL2_LIBS = @LIBNL2_LIBS@ +LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ +LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 47874caf..ed69a17b 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -196,6 +196,12 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNL1_CFLAGS = @LIBNL1_CFLAGS@ +LIBNL1_LIBS = @LIBNL1_LIBS@ +LIBNL2_CFLAGS = @LIBNL2_CFLAGS@ +LIBNL2_LIBS = @LIBNL2_LIBS@ +LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ +LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp index 225718a4..4a5c1038 100644 --- a/docs/api/html/NetworkManager.devhelp +++ b/docs/api/html/NetworkManager.devhelp @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index e5538797..c67adae7 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index c734b922..bc12bb5c 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -22,11 +22,11 @@     
  

-

Version 0.9.0 +

Version 0.9.1.90

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -61,25 +61,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index ffcd2110..92a951b4 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index a3221b04..ad4813eb 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -188,7 +188,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -222,7 +222,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -254,7 +254,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 17. 

+

Table 17. 

@@ -305,7 +305,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -323,7 +323,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -346,7 +346,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -361,7 +361,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -377,7 +377,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -413,7 +413,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -422,7 +422,7 @@ following values:

-

Table 18. 

+

Table 18. 

@@ -484,7 +484,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -494,7 +494,7 @@ their replacements:

-

Table 19. 

+

Table 19. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 5db0ccd8..d062b73f 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -228,7 +228,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -267,7 +267,7 @@


-

Table 3. cdma setting

+

Table 3. cdma setting

@@ -318,7 +318,7 @@


-

Table 4. connection setting

+

Table 4. connection setting

@@ -387,7 +387,7 @@


-

Table 5. gsm setting

+

Table 5. gsm setting

@@ -480,7 +480,7 @@


-

Table 6. ipv4 setting

+

Table 6. ipv4 setting

@@ -579,7 +579,7 @@


-

Table 7. ipv6 setting

+

Table 7. ipv6 setting

@@ -660,7 +660,7 @@


-

Table 8. 802-11-olpc-mesh setting

+

Table 8. 802-11-olpc-mesh setting

@@ -705,7 +705,7 @@


-

Table 9. ppp setting

+

Table 9. ppp setting

@@ -840,7 +840,7 @@


-

Table 10. pppoe setting

+

Table 10. pppoe setting

@@ -891,7 +891,7 @@


-

Table 11. serial setting

+

Table 11. serial setting

@@ -948,7 +948,7 @@


-

Table 12. vpn setting

+

Table 12. vpn setting

@@ -999,7 +999,7 @@


-

Table 13. wimax setting

+

Table 13. wimax setting

@@ -1038,7 +1038,7 @@


-

Table 14. 802-3-ethernet setting

+

Table 14. 802-3-ethernet setting

@@ -1131,7 +1131,7 @@


-

Table 15. 802-11-wireless setting

+

Table 15. 802-11-wireless setting

@@ -1236,7 +1236,7 @@


-

Table 16. 802-11-wireless-security setting

+

Table 16. 802-11-wireless-security setting

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index c8abf6ca..9f652756 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.0

NetworkManager D-Bus Interface Specification

Version 0.9.0

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.1.90

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

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 @@ -112,7 +112,7 @@ General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-

Interfaces

+

Interfaces

org.freedesktop.NetworkManager

Methods:

GetDevices ( ) → @@ -1169,6 +1169,129 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

Interface has no signals.

Interface has no properties.

+ +

org.freedesktop.NetworkManager.SecretAgent

+ Private D-Bus interface used by secret agents that store and provide + secrets to NetworkManager. If an agent provides secrets to + NetworkManager as part of connection creation, and the some of those + secrets are "agent owned" the agent should store those secrets + itself and should not expect its SaveSecrets() method to be called. + SaveSecrets() will be called eg if some program other than the + agent itself (like a connection editor) changes the secrets out of + band. +

Methods:

GetSecrets ( + a{sa{sv}}: connection, o: connection_path, s: setting_name, as: hints, u: flags + ) → + a{sa{sv}}

+ Retrieve and return stored secrets, if any, or request new + secrets from the agent's user. +

Parameters

connection - + a{sa{sv}} + (String_String_Variant_Map_Map) +
+ Nested settings maps containing the connection for which + secrets are being requested. This may contain system-owned + secrets if the agent has successfully authenticated to + modify system network settings and the GetSecrets request + flags allow user interaction. +
connection_path - + o
+ Object path of the connection for which secrets are being + requested. +
setting_name - + s
+ Setting name for which secrets are being requested. +
hints - + as
+ Array of strings of key names in the requested setting for + which NetworkManager thinks a secrets may be required, + and/or well-known identifiers and data that may be useful + to the client in processing the secrets request. The Agent + should return any secrets it has, or that it thinks are + required, regardless of what hints NetworkManager sends + in this request. +
flags - + u + (NM_SECRET_AGENT_GET_SECRETS_FLAGS) +
+ Flags which modify the behavior of the secrets request. + If true, new secrets are assumed to be invalid or incorrect, + and the agent should ask the user for new secrets. If false, + existing secrets should be retrieved from storage and + returned without interrupting the user. +

Returns

secrets - + a{sa{sv}} + (String_String_Variant_Map_Map) +
+ Nested settings maps containing secrets. Each setting MUST + contain at least the 'name' field, containing the name of + the setting, and one or more secrets. +

CancelGetSecrets ( + o: connection_path, s: setting_name + ) → + nothing

+ Cancel a pending GetSecrets request for secrets of the given + connection. Any matching request should be canceled. +

Parameters

connection_path - + o
+ Object path of the connection for which, if secrets are being + requested, the request should be canceled. +
setting_name - + s
+ Setting name for which secrets for this connection were + originally being requested. +

SaveSecrets ( + a{sa{sv}}: connection, o: connection_path + ) → + nothing

+ Save given secrets to backing storage. +

Parameters

connection - + a{sa{sv}} + (String_String_Variant_Map_Map) +
+ Nested settings maps containing the entire connection + (including secrets), for which the agent should save the + secrets to backing storage. This method will not be called + when the agent itself is the process creating or updating + a connection; in that case the agent is assumed to have + already saved those secrets since it had them already. +
connection_path - + o
+ Object path of the connection for which the agent should + save secrets to backing storage. +

DeleteSecrets ( + a{sa{sv}}: connection, o: connection_path + ) → + nothing

+ Delete secrets from backing storage. +

Parameters

connection - + a{sa{sv}} + (String_String_Variant_Map_Map) +
+ Nested settings maps containing the connection properties + (sans secrets), for which the agent should delete the + secrets from backing storage. +
connection_path - + o
+ Object path of the connection for which the agent should + delete secrets from backing storage. +

Interface has no signals.

Interface has no properties.

Sets of flags:

NM_SECRET_AGENT_GET_SECRETS_FLAGS

+ Flags modifying the behavior of GetSecrets request. +
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0
+ No special behavior; by default no user interaction is allowed and + requests for secrets are fulfilled from persistent storage, or + if no secrets are available an error is returned. +
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1
+ Allows the request to interact with the user, possibly prompting + via UI for secrets if any are required, or if none are found in + persistent storage. +
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2
+ Explicitly prompt for new secrets from the user. This flag + signals that NetworkManager thinks any existing secrets are + invalid or wrong. This flag implies that interaction is allowed. +
+ +

org.freedesktop.NetworkManager.VPN.Connection

Represents an active connection to a Virtual Private Network.

Interface has no methods.

Signals:

PropertiesChanged ( @@ -1379,7 +1502,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArguments

Invalid arguments were passed with the request. FIXME: too general.

org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

A binary providing the service failed to launch.

org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid

The request could not be processed because the VPN connection settings were invalid. -

Index

Index of interfaces

Index of types

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 10f59ff8..c3596613 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -29,7 +29,7 @@

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 0b90a06e..980f5287 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -159,6 +159,12 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNL1_CFLAGS = @LIBNL1_CFLAGS@ +LIBNL1_LIBS = @LIBNL1_LIBS@ +LIBNL2_CFLAGS = @LIBNL2_CFLAGS@ +LIBNL2_LIBS = @LIBNL2_LIBS@ +LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ +LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index c700c0d9..5fc9cb01 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -82,6 +82,10 @@ enum N const char * nm_connection_need_secrets (NMConnection *connection, GPtrArray **hints); void nm_connection_clear_secrets (NMConnection *connection); +void nm_connection_clear_secrets_with_flags + (NMConnection *connection, + NMSettingClearSecretsWithFlagsFn func, + gpointer user_data); gboolean nm_connection_update_secrets (NMConnection *connection, const char *setting_name, GHashTable *secrets, @@ -153,6 +157,7 @@ const char *

Signals

+  "secrets-cleared"                                : Run First
   "secrets-updated"                                : Run First
@@ -700,6 +705,37 @@ keeping secret data in memory when not needed.
+

nm_connection_clear_secrets_with_flags ()

+
void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
+

+Clears and frees secrets determined by func. +

+
++ + + + + + + + + + + + + + +

connection :

the NMConnection +

func :

function to be called to determine whether a specific secret should be +cleared or not

user_data :

caller-supplied data passed to func +
+
+
+

nm_connection_update_secrets ()

gboolean            nm_connection_update_secrets        (NMConnection *connection,
                                                          const char *setting_name,
@@ -1344,6 +1380,29 @@ of the D-Bus path of the connection as provided by a settings service.
 

 
Signal Details

 

+
The "secrets-cleared" signal

+
void                user_function                      (NMConnection *connection,
+                                                        gpointer      user_data)       : Run First

+

+The ::secrets-cleared signal is emitted when the secrets of a connection
+are cleared.
+

+

++
+
+
+
+
+
+
+
+
+
+


connection :
the object on which the signal is emitted
user_data :
user data set when the signal handler was connected.

+

+

+

 
The "secrets-updated" signal

 
void                user_function                      (NMConnection *connection,
                                                         gchar        *setting_name,
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 0cc1fd03..f33f7e56 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -56,6 +56,10 @@ enum                NMSetti
 enum                NMSettingSecretFlags;
 enum                NMSettingCompareFlags;
                     NMSetting;
+gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                                         const char *secret,
+                                                         NMSettingSecretFlags flags,
+                                                         gpointer user_data);
                     NMSettingClass;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
@@ -87,6 +91,9 @@ enum                gpointer user_data);
 char *              nm_setting_to_string                (NMSetting *setting);
 void                nm_setting_clear_secrets            (NMSetting *setting);
+void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
 GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
 gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
@@ -380,6 +387,42 @@ It should only be accessed through the functions described below.
 

 

 

+
NMSettingClearSecretsWithFlagsFn ()

+
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                                         const char *secret,
+                                                         NMSettingSecretFlags flags,
+                                                         gpointer user_data);

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


setting :
The setting for which secrets are being iterated
secret :
The secret's name
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
+
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
+
Returns :

+TRUE to clear the secret, FALSE to not clear the secret

+

+

+

 
NMSettingClass

 
typedef struct {
 	GObjectClass parent;
@@ -414,10 +457,14 @@ It should only be accessed through the functions described below.
 	                                  const GParamSpec *prop_spec,
 	                                  NMSettingCompareFlags flags);
 
+	void        (*clear_secrets_with_flags) (NMSetting *setting,
+	                                         GParamSpec *pspec,
+	                                         NMSettingClearSecretsWithFlagsFn func,
+	                                         gpointer user_data);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
-	void (*_reserved3) (void);
 } NMSettingClass;
 

 

@@ -851,6 +898,36 @@ leakage of information.
 

 

 

+
nm_setting_clear_secrets_with_flags ()

+
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

+

+Clears and frees secrets determined by func.
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


setting :
the NMSetting
+
func :
function to be called to determine whether a specific secret should be
+cleared or not
user_data :
caller-supplied data passed to func
+

+

+

+

 
nm_setting_need_secrets ()

 
GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

 

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index f47ea2c9..4a913a44 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -21,20 +21,10 @@
 Next
 
 
-8
-                      | 
-                   A
-                      | 
-                   B
-                      | 
-                   C
-                      | 
-                   D
+C
                       | 
                    I
                       | 
-                   M
-                      | 
                    S
                       | 
                    T
@@ -49,36 +39,13 @@
 

 

 API Index

-
8

-

-NM80211ApFlags, enum in NetworkManager
-

-

-

-NM80211ApSecurityFlags, enum in NetworkManager
-

-

-

-NM80211Mode, enum in NetworkManager
-

-

-
A

-

-NMActiveConnectionState, enum in NetworkManager
-

-

-
B

-

-NMBluetoothCapabilities, enum in NetworkManager
-

-

-
C

+
C

 

-NM_CHECK_VERSION, macro in nm-version
+NMConnection, struct in NMConnection
 

 

 

-NMConnection, struct in NMConnection
+NMConnection::secrets-cleared, object signal in NMConnection
 

 

 

@@ -106,6 +73,10 @@ NM_CHECK_VERSION, macro in nm-version
 

 

 

+nm_connection_clear_secrets_with_flags, function in NMConnection
+

+

+

 nm_connection_compare, function in NMConnection
 

 

@@ -269,275 +240,6 @@ NM_CHECK_VERSION, macro in nm-version
 nm_connection_verify, function in NMConnection
 
 

-
D

-

-NM_DBUS_IFACE_SETTINGS, macro in NetworkManager
-

-

-

-NM_DBUS_IFACE_SETTINGS_CONNECTION, macro in NetworkManager
-

-

-

-NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_ACCESS_POINT, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_ACTIVE_CONNECTION, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_AGENT_MANAGER, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE_MODEM, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE_WIMAX, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE_WIRED, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DEVICE_WIRELESS, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DHCP4_CONFIG, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_DHCP6_CONFIG, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_IP4_CONFIG, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_IP6_CONFIG, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_SECRET_AGENT, macro in NetworkManager
-

-

-

-NM_DBUS_INTERFACE_VPN, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_INTERFACE_WIMAX_NSP, macro in NetworkManager
-

-

-

-NM_DBUS_INVALID_VPN_CONNECTION, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_NO_VPN_CONNECTIONS, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_PATH, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_ACCESS_POINT, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_AGENT_MANAGER, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_SECRET_AGENT, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_SETTINGS, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_SETTINGS_CONNECTION, macro in NetworkManager
-

-

-

-NM_DBUS_PATH_VPN, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_PATH_VPN_CONNECTION, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_PATH_WIMAX_NSP, macro in NetworkManager
-

-

-

-NM_DBUS_SERVICE, macro in NetworkManager
-

-

-

-DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_STRING, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_ARRAY_OF_UINT, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_IP6_ADDRESS, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_IP6_ROUTE, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_LIST_OF_STRING, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_MAP_OF_STRING, macro in nm-dbus-glib-types
-

-

-

-DBUS_TYPE_G_MAP_OF_VARIANT, macro in nm-dbus-glib-types
-

-

-

-NM_DBUS_VPN_ALREADY_STARTED, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_ALREADY_STOPPED, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_BAD_ARGUMENTS, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in NetworkManagerVPN
-

-

-

-NM_DBUS_VPN_WRONG_STATE, macro in NetworkManagerVPN
-

-

-

-NMDeviceCapabilities, enum in NetworkManager
-

-

-

-NMDeviceModemCapabilities, enum in NetworkManager
-

-

-

-NMDeviceState, enum in NetworkManager
-

-

-

-NMDeviceStateReason, enum in NetworkManager
-

-

-

-NMDeviceType, enum in NetworkManager
-

-

-

-NMDeviceWifiCapabilities, enum in NetworkManager
-

-

 
I

 

 NMIP4Address, typedef in NMSettingIP4Config
@@ -763,19 +465,6 @@ NMDeviceWifiCapabilities, enum in NetworkManager
 nm_ip6_route_unref, function in NMSettingIP6Config
 

 

-
M

-

-NM_MAJOR_VERSION, macro in nm-version
-

-

-

-NM_MICRO_VERSION, macro in nm-version
-

-

-

-NM_MINOR_VERSION, macro in nm-version
-

-

 
S

 

 NMSetting, struct in NMSetting
@@ -966,6 +655,10 @@ NM_MINOR_VERSION, macro in nm-version
 

 

 

+NMSettingClearSecretsWithFlagsFn, user_function in NMSetting
+

+

+

 NMSettingCompareFlags, enum in NMSetting
 

 

@@ -2098,6 +1791,10 @@ NM_MINOR_VERSION, macro in nm-version
 
 

 

+nm_setting_clear_secrets_with_flags, function in NMSetting
+

+

+

 nm_setting_compare, function in NMSetting
 

 

@@ -3661,14 +3358,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 NM_SETTING_WIRELESS_TX_POWER, macro in NMSettingWireless
 
 

-

-NMState, enum in NetworkManager
-

-

-

-NM_STATE_CONNECTED, macro in NetworkManager
-

-

 
T

 

 NM_TYPE_CONNECTION_ERROR, macro in NMConnection
@@ -3865,93 +3554,9 @@ NM_STATE_CONNECTED, macro in NetworkManager
 

 
V

 

-NMVPNConnectionState, enum in NetworkManagerVPN
-

-

-

-NMVPNConnectionStateReason, enum in NetworkManagerVPN
-

-

-

 NMVPNIterFunc, user_function in NMSettingVPN
 

 

-

-NMVPNPluginFailure, enum in NetworkManagerVPN
-

-

-

-NMVPNServiceState, enum in NetworkManagerVPN
-

-

-

-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in NetworkManagerVPN
-

-

-

-NM_VPN_DBUS_PLUGIN_PATH, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in NetworkManagerVPN
-

-

-

-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in NetworkManagerVPN
-

-

 
W

 

 NMWepKeyType, enum in NMSettingWirelessSecurity
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index d97a8939..abd30410 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index eda2a542..84b45556 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -33,6 +33,7 @@
 
 
 
+
 
 
 
@@ -61,6 +62,7 @@
 
 
 
+
 
 
 
@@ -95,6 +97,7 @@
 
 
 
+
 
 
 
@@ -116,6 +119,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 21ba39f2..126736d9 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -50,6 +50,7 @@
     
     
     
+    
     
     
     
@@ -76,6 +77,7 @@
     
     
     
+    
     
     
     
@@ -89,6 +91,7 @@
     
     
     
+    
     
     
     
@@ -104,6 +107,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index a6544ddd..571a921a 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -50,6 +50,7 @@
     
     
     
+    
     
     
     
@@ -76,6 +77,7 @@
     
     
     
+    
     
     
     
@@ -89,6 +91,7 @@
     
     
     
+    
     
     
     
@@ -104,6 +107,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 06bd0d32..17fa48a6 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -657,6 +657,7 @@ NM_SETTING_NAME
 NMSettingSecretFlags
 NMSettingCompareFlags
 NMSetting
+NMSettingClearSecretsWithFlagsFn
 NMSettingClass
 NMSettingValueIterFn
 nm_setting_get_type
@@ -672,6 +673,7 @@ nm_setting_diff
 nm_setting_enumerate_values
 nm_setting_to_string
 nm_setting_clear_secrets
+nm_setting_clear_secrets_with_flags
 nm_setting_need_secrets
 nm_setting_update_secrets
 nm_setting_get_secret_flags
@@ -769,6 +771,7 @@ nm_connection_diff
 nm_connection_verify
 nm_connection_need_secrets
 nm_connection_clear_secrets
+nm_connection_clear_secrets_with_flags
 nm_connection_update_secrets
 nm_connection_set_path
 nm_connection_get_path
-- 
cgit 1.3.0-6-gf8a5