accountsservice: ifdef openbsd -> openbsd||netbsd
This commit is contained in:
parent
f9e0458427
commit
87543edb55
|
@ -5,7 +5,7 @@ RMD160 (accountsservice-0.6.55.tar.xz) = 80144b2c703645e15cb59e8aa8f2966b7005448
|
||||||
SHA512 (accountsservice-0.6.55.tar.xz) = c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
|
SHA512 (accountsservice-0.6.55.tar.xz) = c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
|
||||||
Size (accountsservice-0.6.55.tar.xz) = 97972 bytes
|
Size (accountsservice-0.6.55.tar.xz) = 97972 bytes
|
||||||
SHA1 (patch-meson.build) = 1cf810fe17ae59caf4cc6c84826133521d5dcf92
|
SHA1 (patch-meson.build) = 1cf810fe17ae59caf4cc6c84826133521d5dcf92
|
||||||
SHA1 (patch-src_daemon.c) = 5e1eff5d6a17e1b86ba1461508f90047157ca74d
|
SHA1 (patch-src_daemon.c) = a3fa2e521a8932838be621bb5052904a5055fd79
|
||||||
SHA1 (patch-src_user.c) = a4c2ed335f3b7f58326911482dae25339dcb3d78
|
SHA1 (patch-src_user.c) = 1b5e6aafad15ff6fff21845c5872dea980283928
|
||||||
SHA1 (patch-src_user.h) = eacd388f4728f7bf2e34b97d622d154ffd75a782
|
SHA1 (patch-src_user.h) = eacd388f4728f7bf2e34b97d622d154ffd75a782
|
||||||
SHA1 (patch-src_wtmp-helper.h) = 848e73291fa8fe10d758343eac798bbeed212e2d
|
SHA1 (patch-src_wtmp-helper.h) = 848e73291fa8fe10d758343eac798bbeed212e2d
|
||||||
|
|
|
@ -61,7 +61,7 @@ $NetBSD$
|
||||||
+ * we need to explicitely remove the user's group if it contains no more
|
+ * we need to explicitely remove the user's group if it contains no more
|
||||||
+ * members and matches the username.
|
+ * members and matches the username.
|
||||||
+ */
|
+ */
|
||||||
+#ifdef __OpenBSD__
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
+ struct group *grp;
|
+ struct group *grp;
|
||||||
+ GError *grperror;
|
+ GError *grperror;
|
||||||
+ const gchar *grpargv[3];
|
+ const gchar *grpargv[3];
|
||||||
|
@ -91,7 +91,7 @@ $NetBSD$
|
||||||
|
|
||||||
argv[0] = "/usr/sbin/userdel";
|
argv[0] = "/usr/sbin/userdel";
|
||||||
if (ud->remove_files) {
|
if (ud->remove_files) {
|
||||||
+#ifdef __OpenBSD__
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
+ argv[1] = "-r";
|
+ argv[1] = "-r";
|
||||||
+ argv[2] = "--";
|
+ argv[2] = "--";
|
||||||
+ argv[3] = pwent->pw_name;
|
+ argv[3] = pwent->pw_name;
|
||||||
|
|
|
@ -6,7 +6,7 @@ $NetBSD$
|
||||||
if (spent)
|
if (spent)
|
||||||
passwd = spent->sp_pwdp;
|
passwd = spent->sp_pwdp;
|
||||||
|
|
||||||
+#ifdef __OpenBSD__
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
+ pw = getpwnam_shadow (pwent->pw_name);
|
+ pw = getpwnam_shadow (pwent->pw_name);
|
||||||
+ if (pw)
|
+ if (pw)
|
||||||
+ passwd = pw->pw_passwd;
|
+ passwd = pw->pw_passwd;
|
||||||
|
@ -15,7 +15,7 @@ $NetBSD$
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+#ifdef __OpenBSD__
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
+ if (passwd && passwd[0] == '*') {
|
+ if (passwd && passwd[0] == '*') {
|
||||||
+#else
|
+#else
|
||||||
if (passwd && passwd[0] == '!') {
|
if (passwd && passwd[0] == '!') {
|
||||||
|
@ -27,7 +27,7 @@ $NetBSD$
|
||||||
accounts_user_get_user_name (ACCOUNTS_USER (user)),
|
accounts_user_get_user_name (ACCOUNTS_USER (user)),
|
||||||
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
||||||
argv[0] = "/usr/sbin/usermod";
|
argv[0] = "/usr/sbin/usermod";
|
||||||
+#ifdef __OpenBSD__
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
+ argv[1] = locked ? "-Z" : "-U";
|
+ argv[1] = locked ? "-Z" : "-U";
|
||||||
+#else
|
+#else
|
||||||
argv[1] = locked ? "-L" : "-U";
|
argv[1] = locked ? "-L" : "-U";
|
||||||
|
|
Loading…
Reference in New Issue