mirror of
				https://github.com/tiyn/slock.git
				synced 2025-11-04 05:01:18 +01:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			f3de7764af
			...
			secret-pas
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1dc51b3018 | |||
| 
						 | 
					f6f743c04d | ||
| 
						 | 
					535d3daa33 | ||
| 3922b40c0a | |||
| 9166655b4e | 
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					slock
 | 
				
			||||||
 | 
					*.o
 | 
				
			||||||
 | 
					config.h
 | 
				
			||||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -36,7 +36,7 @@ dist: clean
 | 
				
			|||||||
	@echo creating dist tarball
 | 
						@echo creating dist tarball
 | 
				
			||||||
	@mkdir -p slock-${VERSION}
 | 
						@mkdir -p slock-${VERSION}
 | 
				
			||||||
	@cp -R LICENSE Makefile README slock.1 config.mk \
 | 
						@cp -R LICENSE Makefile README slock.1 config.mk \
 | 
				
			||||||
		${SRC} explicit_bzero.c config.def.h arg.h util.h slock-${VERSION}
 | 
							${SRC} config.def.h arg.h util.h slock-${VERSION}
 | 
				
			||||||
	@tar -cf slock-${VERSION}.tar slock-${VERSION}
 | 
						@tar -cf slock-${VERSION}.tar slock-${VERSION}
 | 
				
			||||||
	@gzip slock-${VERSION}.tar
 | 
						@gzip slock-${VERSION}.tar
 | 
				
			||||||
	@rm -rf slock-${VERSION}
 | 
						@rm -rf slock-${VERSION}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										17
									
								
								config.def.h
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								config.def.h
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
/* user and group to drop privileges to */
 | 
					/* user and group to drop privileges to */
 | 
				
			||||||
static const char *user  = "nobody";
 | 
					static const char *user  = "nobody";
 | 
				
			||||||
static const char *group = "nogroup";
 | 
					static const char *group = "nobody";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const char *colorname[NUMCOLS] = {
 | 
					static const char *colorname[NUMCOLS] = {
 | 
				
			||||||
	[INIT] =   "black",     /* after initialization */
 | 
						[INIT] =   "black",     /* after initialization */
 | 
				
			||||||
@@ -10,3 +10,18 @@ static const char *colorname[NUMCOLS] = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* treat a cleared input like a wrong password (color) */
 | 
					/* treat a cleared input like a wrong password (color) */
 | 
				
			||||||
static const int failonclear = 1;
 | 
					static const int failonclear = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* struct for secret passwords and commands */
 | 
				
			||||||
 | 
					struct secretpass {
 | 
				
			||||||
 | 
					  char const *pass;
 | 
				
			||||||
 | 
					  char const *command;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* list of secret passwords and their commands */
 | 
				
			||||||
 | 
					static const struct secretpass scom[1] = {
 | 
				
			||||||
 | 
					/*	 Password				command */
 | 
				
			||||||
 | 
					  {"shutdown",           "sudo shutdown -h now"},
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* length of entries in scom */
 | 
				
			||||||
 | 
					static const int entrylen = 1;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# slock version
 | 
					# slock version
 | 
				
			||||||
VERSION = 1.4
 | 
					VERSION = 1.5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Customize below to fit your system
 | 
					# Customize below to fit your system
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										33
									
								
								slock-secret-password-1.4.diff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								slock-secret-password-1.4.diff
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					diff --git a/config.def.h b/config.def.h
 | 
				
			||||||
 | 
					index 9855e21..989ca08 100644
 | 
				
			||||||
 | 
					--- a/config.def.h
 | 
				
			||||||
 | 
					+++ b/config.def.h
 | 
				
			||||||
 | 
					@@ -10,3 +10,10 @@ static const char *colorname[NUMCOLS] = {
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 /* treat a cleared input like a wrong password (color) */
 | 
				
			||||||
 | 
					 static const int failonclear = 1;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+/* length of entires in scom  */
 | 
				
			||||||
 | 
					s
 | 
				
			||||||
 | 
					+static const int entrylen = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+static const secretpass scom[entrylen] = {
 | 
				
			||||||
 | 
					+/*	 Password				command */
 | 
				
			||||||
 | 
					+	{ "shutdown",           "doas poweroff" },
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					diff --git a/slock.c b/slock.c
 | 
				
			||||||
 | 
					index d2f0886..6a96a2d 100644
 | 
				
			||||||
 | 
					--- a/slock.c
 | 
				
			||||||
 | 
					+++ b/slock.c
 | 
				
			||||||
 | 
					@@ -160,6 +160,13 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 | 
				
			||||||
 | 
					 			case XK_Return:
 | 
				
			||||||
 | 
					 				passwd[len] = '\0';
 | 
				
			||||||
 | 
					 				errno = 0;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+				for (int i = 0; i < entrylen; i++){
 | 
				
			||||||
 | 
					+					if (strcmp(scom[i].pass, passwd) == 0){
 | 
				
			||||||
 | 
					+						system(scom[i].command);
 | 
				
			||||||
 | 
					+					}
 | 
				
			||||||
 | 
					+				}
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
							
								
								
									
										7
									
								
								slock.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								slock.c
									
									
									
									
									
								
							@@ -160,6 +160,13 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 | 
				
			|||||||
			case XK_Return:
 | 
								case XK_Return:
 | 
				
			||||||
				passwd[len] = '\0';
 | 
									passwd[len] = '\0';
 | 
				
			||||||
				errno = 0;
 | 
									errno = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									for (int i = 0; i < entrylen; i++){
 | 
				
			||||||
 | 
									    if (strcmp(scom[i].pass, passwd) == 0){
 | 
				
			||||||
 | 
									    	system(scom[i].command);
 | 
				
			||||||
 | 
									    }
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				if (!(inputhash = crypt(passwd, hash)))
 | 
									if (!(inputhash = crypt(passwd, hash)))
 | 
				
			||||||
					fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
 | 
										fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
 | 
				
			||||||
				else
 | 
									else
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user