diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2014-04-30 04:16:24 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2014-04-30 04:16:24 +0000 |
| commit | 0d968e414cf268a76174fe0ece60523f2cc77606 (patch) | |
| tree | 6c79c46b3e2f9e9866097c7e2c427f219e890c68 /sysutils/screen-legacy/files/patch-attacher.c | |
| parent | Update to 6.0.3 (diff) | |
Prepare for screen 4.2.1. Screen 4.0.3 becomes screen-legacy.
Notes
Notes:
svn path=/head/; revision=352668
Diffstat (limited to 'sysutils/screen-legacy/files/patch-attacher.c')
| -rw-r--r-- | sysutils/screen-legacy/files/patch-attacher.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sysutils/screen-legacy/files/patch-attacher.c b/sysutils/screen-legacy/files/patch-attacher.c new file mode 100644 index 000000000000..0f89189898e3 --- /dev/null +++ b/sysutils/screen-legacy/files/patch-attacher.c @@ -0,0 +1,24 @@ +--- attacher.c.orig 2003-09-08 07:24:48.000000000 -0700 ++++ attacher.c 2011-01-02 21:42:39.547897531 -0800 +@@ -662,7 +662,7 @@ + printf("\n"); + + prg = getenv("LOCKPRG"); +- if (prg && strcmp(prg, "builtin") && !access(prg, X_OK)) ++ if (prg && (strcmp(prg, "builtin") || strcmp(prg,"builtin-passwd")) && !access(prg, X_OK)) + { + signal(SIGCHLD, SIG_DFL); + debug1("lockterminal: '%s' seems executable, execl it!\n", prg); +@@ -676,7 +676,11 @@ + setuid(real_uid); /* this should be done already */ + #endif + closeallfiles(0); /* important: /etc/shadow may be open */ +- execl(prg, "SCREEN-LOCK", NULL); ++ if (strcmp(prg,"builtin-passwd")) ++ /* use system passsword for lock */ ++ execl(prg, "SCREEN-LOCK", "-p", "-n", NULL); ++ else ++ execl(prg, "SCREEN-LOCK", NULL); + exit(errno); + } + if (pid == -1) |