[patch] patch1

musl-fgetspent_r.patch (text/plain), 1.10 KB, created by 464270342 on 2023-02-07 14:59:10 UTC

diff --color -Naur accountsservice-22.08.8/src/daemon.c accountsservice-22.08.8-new/src/daemon.c
--- accountsservice-22.08.8/src/daemon.c	2022-02-23 15:27:48.000000000 +0000
+++ accountsservice-22.08.8-new/src/daemon.c	2023-02-07 14:56:48.656558402 +0000
@@ -154,6 +154,28 @@
 #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 void
 remove_cache_files (const gchar *user_name)
 {