git.samba.org
/
abartlet
/
samba-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo
[abartlet/samba-debian.git]
/
source4
/
heimdal
/
lib
/
roken
/
rkpty.c
diff --git
a/source4/heimdal/lib/roken/rkpty.c
b/source4/heimdal/lib/roken/rkpty.c
index 0faf66861593f31590a8633c643b4bdda4ae1fce..f2c62f23f39c046eb7c8521f73acefdb37d2e25c 100644
(file)
--- a/
source4/heimdal/lib/roken/rkpty.c
+++ b/
source4/heimdal/lib/roken/rkpty.c
@@
-107,9
+107,9
@@
open_pty(void)
{
char *clone[] = {
"/dev/ptc",
- "/dev/ptmx",
+ "/dev/ptmx",
"/dev/ptm",
- "/dev/ptym/clone",
+ "/dev/ptym/clone",
NULL
};
char **q;
@@
-372,7
+372,7
@@
main(int argc, char **argv)
sa.sa_handler = caught_signal;
sa.sa_flags = 0;
sigemptyset (&sa.sa_mask);
-
+
sigaction(SIGALRM, &sa, NULL);
}