diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2009-03-28 22:55:02 -0300 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:48 -0500 |
| commit | 1b6665085f47e0a86e4bebd5e313a2ab63600eb4 (patch) | |
| tree | 6b7dedc1886b42d07cc48359470fe3f595500cc8 /arch/common/users.h | |
| parent | 819c0c3382b06fc0f0a1679465966f811aa2e0f8 (diff) | |
| parent | 4979bb6cbbbe39eb44c32530cd13f86bf44e5d77 (diff) | |
Import Debian changes 0.5c-1
hardinfo (0.5c-1) unstable; urgency=low
* New upstream version.
(Closes: #517591, #511237, #457703, #519256, #449250, #457820, #497758)
Diffstat (limited to 'arch/common/users.h')
| -rw-r--r-- | arch/common/users.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/common/users.h b/arch/common/users.h index fd8f7834..2361a4bf 100644 --- a/arch/common/users.h +++ b/arch/common/users.h @@ -1,5 +1,4 @@ -static gchar *sys_users = NULL, - *human_users = NULL; +static gchar *users = NULL; static gboolean remove_users(gpointer key, gpointer value, gpointer data) @@ -17,15 +16,13 @@ scan_users_do(void) if (!passwd) return; - if (sys_users) { - g_free(sys_users); - g_free(human_users); + if (users) { + g_free(users); g_hash_table_foreach_remove(moreinfo, remove_users, NULL); } - sys_users = g_strdup(""); - human_users = g_strdup(""); + users = g_strdup(""); while (fgets(buffer, 512, passwd)) { gchar **tmp; @@ -44,11 +41,7 @@ scan_users_do(void) uid = atoi(tmp[2]); strend(tmp[4], ','); - if (uid >= 1000 && uid <= 65530) { - human_users = h_strdup_cprintf("$%s$%s=%s\n", human_users, key, tmp[0], tmp[4]); - } else { - sys_users = h_strdup_cprintf("$%s$%s=%s\n", sys_users, key, tmp[0], tmp[4]); - } + users = h_strdup_cprintf("$%s$%s=%s\n", users, key, tmp[0], tmp[4]); g_strfreev(tmp); } |