birdwm

commit 5a80e5949d602cc1a0788f9317826be4a2ec202a
parent 0344acbc03b2bb66f7108cb3ced831b8b676ef83
Author: grouse <bdmfegys@duck.com>
Date:   Tue,  5 Dec 2023 19:30:27 -0500

patched user patch to slock

Diffstat:
M
slock/config.def.h
 | 
4
++--
M
slock/slock.c
 | 
10
+++++-----

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/slock/config.def.h b/slock/config.def.h
@@ -1,6 +1,6 @@
 /* user and group to drop privileges to */
-static const char *user  = "nobody";
-static const char *group = "nobody";
+//static const char *user  = "nobody";
+//static const char *group = "nobody";
 
 static const char *colorname[NUMCOLS] = {
 	[BACKGROUND] = "black", /* after initialization */
diff --git a/slock/slock.c b/slock/slock.c
@@ -51,7 +51,7 @@ struct lock {
 	unsigned int xoff, yoff, mw, mh;
 	Drawable drawable;
 	GC gc;
-	XRectangle rectangles[LENGTH(rectangles)]
+	XRectangle rectangles[LENGTH(rectangles)];
 };
 
 struct xrandr {
@@ -405,13 +405,13 @@ main(int argc, char **argv) {
 
 	/* validate drop-user and -group */
 	errno = 0;
-	if (!(pwd = getpwnam(user)))
-		die("slock: getpwnam %s: %s\n", user,
+	if (!(pwd = getpwnam(getenv("USER"))))
+		die("slock: getpwnam %s: %s\n", getenv("USER"),
 		    errno ? strerror(errno) : "user entry not found");
 	duid = pwd->pw_uid;
 	errno = 0;
-	if (!(grp = getgrnam(group)))
-		die("slock: getgrnam %s: %s\n", group,
+	if (!(grp = getgrnam(getenv("USER"))))
+		die("slock: getgrnam %s: %s\n", getenv("USER"),
 		    errno ? strerror(errno) : "group entry not found");
 	dgid = grp->gr_gid;