Xinqi Bao's Git
projects
/
slock.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
applied sin's patch and prepared new release
[slock.git]
/
slock.c
diff --git
a/slock.c
b/slock.c
index
399386b
..
5051f04
100644
(file)
--- a/
slock.c
+++ b/
slock.c
@@
-23,6
+23,8
@@
#include <bsd_auth.h>
#endif
#include <bsd_auth.h>
#endif
+#include "config.h"
+
typedef struct {
int screen;
Window root, win;
typedef struct {
int screen;
Window root, win;
@@
-73,7
+75,6
@@
getpw(void) { /* only run as root */
else
die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n");
}
else
die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n");
}
- endpwent();
rval = pw->pw_passwd;
#if HAVE_SHADOW_H
rval = pw->pw_passwd;
#if HAVE_SHADOW_H
@@
-82,7
+83,6
@@
getpw(void) { /* only run as root */
sp = getspnam(getenv("USER"));
if(!sp)
die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
sp = getspnam(getenv("USER"));
if(!sp)
die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
- endspent();
rval = sp->sp_pwdp;
}
#endif
rval = sp->sp_pwdp;
}
#endif