all: use nm_utils_name_to_uid() instead of getpwnam()th/getpwuid

3 files changed, 1 insertions, 24 deletions

diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index 6e2d95a219..9fa9215e7a 100644
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -281,28 +281,6 @@ ck_finalize (NMSessionMonitor *monitor)
 NM_DEFINE_SINGLETON_GETTER (NMSessionMonitor, nm_session_monitor_get, NM_TYPE_SESSION_MONITOR);
 
 /**
- * nm_session_monitor_user_to_uid:
- * @user: User naee.
- * @out_uid: Return location for UID.
- *
- * Translates a user name to a UID.
- */
-gboolean
-nm_session_monitor_user_to_uid (const char *user, uid_t *out_uid)
-{
-	struct passwd *pw = getpwnam (user);
-
-	g_assert (out_uid);
-
-	if (!pw)
-		return FALSE;
-
-	*out_uid = pw->pw_uid;
-
-	return TRUE;
-}
-
-/**
  * nm_session_monitor_session_exists:
  * @self: the session monitor
  * @uid: A user ID.
diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h
index 7ea1e14a91..e2ff8fbab2 100644
--- a/src/nm-session-monitor.h
+++ b/src/nm-session-monitor.h
@@ -23,7 +23,6 @@ GType nm_session_monitor_get_type (void) G_GNUC_CONST;
 
 NMSessionMonitor *nm_session_monitor_get (void);
 
-gboolean nm_session_monitor_user_to_uid    (const char *user, uid_t *out_uid);
 gboolean nm_session_monitor_session_exists (NMSessionMonitor *self,
                                             uid_t uid,
                                             gboolean active);
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index ca46de681d..fe93ea91c6 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -357,7 +357,7 @@ nm_settings_connection_check_visibility (NMSettingsConnection *self,
 
 		if (!nm_setting_connection_get_permission (s_con, i, NULL, &user, NULL))
 			continue;
-		if (!nm_session_monitor_user_to_uid (user, &uid))
+		if (!nm_utils_name_to_uid (user, &uid))
 			continue;
 		if (!nm_session_monitor_session_exists (session_monitor, uid, FALSE))
 			continue;