Commit f7c609fd authored by Olivier Duchateau's avatar Olivier Duchateau
Browse files

Update to 0.6.50

parent cf2a464b
......@@ -2,7 +2,7 @@
# $FreeBSD: head/sysutils/accountsservice/Makefile 517057 2019-11-08 13:11:05Z tobik $
PORTNAME= accountsservice
PORTVERSION= 0.6.49
PORTVERSION= 0.6.50
CATEGORIES= sysutils devel
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
......
TIMESTAMP = 1600439341
SHA256 (accountsservice-0.6.49.tar.xz) = 251e5dd56db839e9470d97692ef6e5e07dc659196f27b65b228a3e14f46e560c
SIZE (accountsservice-0.6.49.tar.xz) = 384108
TIMESTAMP = 1600439523
SHA256 (accountsservice-0.6.50.tar.xz) = 035928f5dea46f2220657e0bd669bc7fac45165b700c0a81b2b66ff2c3dbc74a
SIZE (accountsservice-0.6.50.tar.xz) = 384484
--- src/daemon.c.orig 2018-04-04 13:59:42 UTC
--- src/daemon.c.orig 2018-06-13 16:39:06 UTC
+++ src/daemon.c
@@ -79,7 +79,11 @@ struct DaemonPrivate {
GHashTable *extension_ifaces;
......@@ -63,8 +63,8 @@
if (shadow_entry_buffers != NULL) {
*spent = &shadow_entry_buffers->spbuf;
return pwent;
}
return pwent;
+#else
+ if (!generator_state->users || g_hash_table_lookup (generator_state->users, pwent->pw_name))
+ return pwent;
......@@ -220,7 +220,7 @@
daemon->priv->explicitly_requested_users = g_list_append (daemon->priv->explicitly_requested_users,
g_strdup (pwent->pw_name));
@@ -1070,10 +1136,12 @@ daemon_create_user_authorized_cb (Daemon
@@ -1071,10 +1137,12 @@ daemon_create_user_authorized_cb (Daemon
sys_log (context, "create user '%s'", cd->user_name);
......@@ -235,11 +235,11 @@
+ argv[4] = "-c";
+ argv[5] = cd->real_name;
if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {
g_autofree gchar *admin_groups = NULL;
if (EXTRA_ADMIN_GROUPS != NULL && EXTRA_ADMIN_GROUPS[0] != '\0')
admin_groups = g_strconcat (ADMIN_GROUP, ",",
@@ -1082,15 +1150,11 @@ daemon_create_user_authorized_cb (Daemon
admin_groups = g_strconcat (admin_groups, ",",
EXTRA_ADMIN_GROUPS, NULL);
else
admin_groups = g_strdup (ADMIN_GROUP);
- argv[4] = "-G";
- argv[5] = admin_groups;
......@@ -264,19 +264,19 @@
User *user;
pwent = getpwuid (ud->uid);
@@ -1279,19 +1343,17 @@ daemon_delete_user_authorized_cb (Daemon
@@ -1279,19 +1343,16 @@ daemon_delete_user_authorized_cb (Daemon
remove_cache_files (pwent->pw_name);
- argv[0] = "/usr/sbin/userdel";
+ argv[0] = "/usr/sbin/pw";
+ argv[1] = "userdel";
if (ud->remove_files) {
- argv[1] = "-f";
- argv[2] = "-r";
- argv[3] = "--";
- argv[4] = pwent->pw_name;
- argv[5] = NULL;
+ argv[1] = "userdel";
+ argv[2] = pwent->pw_name;
+ argv[3] = "-r";
+ argv[4] = NULL;
......@@ -286,7 +286,6 @@
- argv[2] = "--";
- argv[3] = pwent->pw_name;
- argv[4] = NULL;
+ argv[1] = "userdel";
+ argv[2] = pwent->pw_name;
+ argv[3] = NULL;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment