aboutsummaryrefslogtreecommitdiffstats
path: root/community/accountsservice/musl-fgetspent_r.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-05-25 15:16:54 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-25 15:16:54 +0200
commit19bfcef590655dbb27dc59fe27103715a8fcbce5 (patch)
tree3851db0bd5352da36c73a01453311b758b6afd55 /community/accountsservice/musl-fgetspent_r.patch
parentf73cb5c48ec938020c59024cc75f7b7d19ec9b31 (diff)
downloadaports-19bfcef590655dbb27dc59fe27103715a8fcbce5.tar.bz2
aports-19bfcef590655dbb27dc59fe27103715a8fcbce5.tar.xz
community/accountsservice: move from testing
needed by lightdm
Diffstat (limited to 'community/accountsservice/musl-fgetspent_r.patch')
-rw-r--r--community/accountsservice/musl-fgetspent_r.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/community/accountsservice/musl-fgetspent_r.patch b/community/accountsservice/musl-fgetspent_r.patch
new file mode 100644
index 0000000000..f5046d47c6
--- /dev/null
+++ b/community/accountsservice/musl-fgetspent_r.patch
@@ -0,0 +1,34 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index 312394a..e7b3c58 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -140,6 +140,28 @@ error_get_type (void)
+ #define MAX_LOCAL_USERS 50
+ #endif
+
++#ifndef __GLIBC__
++ /* Musl libc does not support fgetspent_r(), write own
++ * wrapper
++ */
++static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) {
++ struct spwd *shadow_entry = fgetspent(fp);
++ if(!shadow_entry)
++ return -1;
++ size_t namplen = strlen(shadow_entry->sp_namp);
++ size_t pwdplen = strlen(shadow_entry->sp_pwdp);
++
++ if(namplen + pwdplen + 2 > buflen)
++ return -1;
++
++ *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd));
++ spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1);
++ spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1);
++
++ return 0;
++}
++#endif
++
+ static struct passwd *
+ entry_generator_fgetpwent (Daemon *daemon,
+ GHashTable *users,
+