jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

fix segfault in openssh-5.8p2-force_krb.patch (#882541)

Browse Source
This commit is contained in:
Petr Lautrbach 2012-12-03 17:02:10 +01:00
parent 790103e764
commit 4dbe32e492
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openssh-5.8p2-force_krb.patch
View File

@ -80,7 +80,7 @@ diff -up openssh-5.8p2/gss-serv-krb5.c.force_krb openssh-5.8p2/gss-serv-krb5.c
} else } else
retval = 0; retval = 0;
@@ -108,6 +132,134 @@ ssh_gssapi_krb5_userok(ssh_gssapi_client @@ -108,6 +132,135 @@ ssh_gssapi_krb5_userok(ssh_gssapi_client
return retval; return retval;
} }
@ -167,7 +167,8 @@ diff -up openssh-5.8p2/gss-serv-krb5.c.force_krb openssh-5.8p2/gss-serv-krb5.c
+ char *token; + char *token;
+ +
+ /* we parse just like ksu, even though we could do better */ + /* we parse just like ksu, even though we could do better */
+ token = strtok(line, " \t\n"); + if ((token = strtok(line, " \t\n")) == NULL)
+ continue;
+ if (strcmp(name, token) == 0) { + if (strcmp(name, token) == 0) {
+ /* we matched on client principal */ + /* we matched on client principal */
+ found_principal = 1; + found_principal = 1;
@ -218,7 +219,7 @@ diff -up openssh-5.8p2/gss-serv-krb5.c.force_krb openssh-5.8p2/gss-serv-krb5.c
diff -up openssh-5.8p2/session.c.force_krb openssh-5.8p2/session.c diff -up openssh-5.8p2/session.c.force_krb openssh-5.8p2/session.c
--- openssh-5.8p2/session.c.force_krb 2011-05-19 03:41:41.000000000 +0200 --- openssh-5.8p2/session.c.force_krb 2011-05-19 03:41:41.000000000 +0200
+++ openssh-5.8p2/session.c 2011-05-19 03:43:32.437173662 +0200 +++ openssh-5.8p2/session.c 2011-05-19 03:43:32.437173662 +0200
@@ -816,6 +816,29 @@ do_exec(Session *s, const char *command) @@ -820,6 +820,29 @@ do_exec(Session *s, const char *command)
debug("Forced command (key option) '%.900s'", command); debug("Forced command (key option) '%.900s'", command);
} }
@ -251,7 +252,7 @@ diff -up openssh-5.8p2/session.c.force_krb openssh-5.8p2/session.c
diff -up openssh-5.8p2/sshd.8.force_krb openssh-5.8p2/sshd.8 diff -up openssh-5.8p2/sshd.8.force_krb openssh-5.8p2/sshd.8
--- openssh-5.8p2/sshd.8.force_krb 2011-05-19 03:41:30.582114401 +0200 --- openssh-5.8p2/sshd.8.force_krb 2011-05-19 03:41:30.582114401 +0200
+++ openssh-5.8p2/sshd.8 2011-05-19 03:41:46.159106308 +0200 +++ openssh-5.8p2/sshd.8 2011-05-19 03:41:46.159106308 +0200
@@ -320,6 +320,7 @@ Finally, the server and the client enter @@ -323,6 +323,7 @@ Finally, the server and the client enter
The client tries to authenticate itself using The client tries to authenticate itself using
host-based authentication, host-based authentication,
public key authentication, public key authentication,
@ -259,7 +260,7 @@ diff -up openssh-5.8p2/sshd.8.force_krb openssh-5.8p2/sshd.8
challenge-response authentication, challenge-response authentication,
or password authentication. or password authentication.
.Pp .Pp
@@ -788,6 +789,12 @@ This file is used in exactly the same wa @@ -796,6 +797,12 @@ This file is used in exactly the same wa
but allows host-based authentication without permitting login with but allows host-based authentication without permitting login with
rlogin/rsh. rlogin/rsh.
.Pp .Pp