f6e7ddf9e2
The AccountsService project provides
o A set of D-Bus interfaces for querying and manipulating
user account information.
o An implementation of these interfaces based on the usermod(8),
useradd(8) and userdel(8) commands.
70 lines
2 KiB
C
70 lines
2 KiB
C
$NetBSD: patch-src_libaccountsservice_act-user.c,v 1.1 2018/06/11 23:55:50 youri Exp $
|
|
|
|
Add NetBSD backend.
|
|
|
|
--- src/libaccountsservice/act-user.c.orig 2018-05-25 23:09:35.000000000 +0000
|
|
+++ src/libaccountsservice/act-user.c
|
|
@@ -25,6 +25,7 @@
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
+#include <errno.h>
|
|
|
|
#include <glib.h>
|
|
#include <glib/gi18n.h>
|
|
@@ -1818,8 +1819,29 @@ salt_char (GRand *rand)
|
|
}
|
|
|
|
static gchar *
|
|
-make_crypted (const gchar *plain)
|
|
+make_crypted (const gchar *username, const gchar *plain)
|
|
{
|
|
+#ifdef __NetBSD__
|
|
+ char salt[_PASSWORD_LEN+1];
|
|
+ char option[LINE_MAX], *key, *opt;
|
|
+ struct passwd *pw;
|
|
+
|
|
+ if (!(pw = getpwnam(username))) {
|
|
+ errx(EXIT_FAILURE, "can't get pw for %s", username);
|
|
+ }
|
|
+
|
|
+
|
|
+ pw_getpwconf(option, sizeof(option), pw, "localcipher");
|
|
+ opt = option;
|
|
+ key = strsep(&opt, ",");
|
|
+
|
|
+ if (pw_gensalt(salt, _PASSWORD_LEN, key, opt) == -1) {
|
|
+ errx(EXIT_FAILURE, "Failed to pw_gensalt: %s", strerror(errno));
|
|
+ }
|
|
+
|
|
+ gchar *result = g_strdup (crypt (plain, salt));
|
|
+
|
|
+#else
|
|
GString *salt;
|
|
gchar *result;
|
|
GRand *rand;
|
|
@@ -1830,6 +1852,7 @@ make_crypted (const gchar *plain)
|
|
|
|
/* SHA 256 */
|
|
g_string_append (salt, "$6$");
|
|
+
|
|
for (i = 0; i < 16; i++) {
|
|
g_string_append_c (salt, salt_char (rand));
|
|
}
|
|
@@ -1839,6 +1862,7 @@ make_crypted (const gchar *plain)
|
|
|
|
g_string_free (salt, TRUE);
|
|
g_rand_free (rand);
|
|
+#endif
|
|
|
|
return result;
|
|
}
|
|
@@ -1866,7 +1890,7 @@ act_user_set_password (ActUser
|
|
g_return_if_fail (password != NULL);
|
|
g_return_if_fail (ACCOUNTS_IS_USER (user->accounts_proxy));
|
|
|
|
- crypted = make_crypted (password);
|
|
+ crypted = make_crypted (user->user_name, password);
|
|
if (!accounts_user_call_set_password_sync (user->accounts_proxy,
|
|
crypted,
|
|
hint,
|