1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
$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,
|
