Can anyone explain why this fails? This was applied to source from openssh.org. Thanks, Ryan ========================== bash-2.05a$ /opt/freeware/bin/patch -p1 < ../openssh-3.6.1p2-passexpire20.patch patching file TODO Reversed (or previously applied) patch detected! Assume -R? [n] y patching file acconfig.h Reversed (or previously applied) patch detected! Assume -R? [n] y patching file auth-pam.c Reversed (or previously applied) patch detected! Assume -R? [n] y patching file auth-passwd.c Reversed (or previously applied) patch detected! Assume -R? [n] y patching file auth.c Reversed (or previously applied) patch detected! Assume -R? [n] y patching file auth.h Reversed (or previously applied) patch detected! Assume -R? [n] y patching file config.h.in Reversed (or previously applied) patch detected! Assume -R? [n] y patching file configure Reversed (or previously applied) patch detected! Assume -R? [n] y patching file configure.ac Reversed (or previously applied) patch detected! Assume -R? [n] y patching file openbsd-compat/port-aix.c Reversed (or previously applied) patch detected! Assume -R? [n] y patching file openbsd-compat/port-aix.h Reversed (or previously applied) patch detected! Assume -R? [n] y patching file session.c Reversed (or previously applied) patch detected! Assume -R? [n] y Hunk #5 FAILED at 748. 1 out of 6 hunks FAILED -- saving rejects to file session.c.rej patching file session.h Reversed (or previously applied) patch detected! Assume -R? [n] y patching file sshd.c Reversed (or previously applied) patch detected! Assume -R? [n] y patching file version.h Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file version.h.rej
rrr55 at daimlerchrysler.com wrote:> Can anyone explain why this fails? This was applied to source from > openssh.org.Which openssh tarball did you use and was it freshly unpacked? What version of patch are you using? [snip]> patching file version.h > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file version.h.rejThis makes me think the tarball you are using does not match the patch. -- Darren Tucker (dtucker at zip.com.au) GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4 37C9 C982 80C7 8FF4 FA69 Good judgement comes with experience. Unfortunately, the experience usually comes from bad judgement.
rrr55 at daimlerchrysler.com wrote:> I am using GNU patch. I used the source from openssh.org from apr 29th. I > realized that I was using a version that I had patched. I started again > w/fresh source and the patch was successful, but now compilation fails > w/auth.c. Prior versions had no problems patching/compiling. > =========================> > In file included from auth.c:41:[snip]> auth.c:630: too few arguments to function `loginfailed' > auth.c: In function `auth_debug_add':You're using AIX 5.2, right? As of 5.2, loginfailed() takes a 4th argument. For a discussion and quick fix, see http://marc.theaimsgroup.com/?l=openssh-unix-dev&m=105223097117841 That 4th argument seems to be optional. At some point I added the #include that defined loginfailed, which is why it now breaks. I guess I should have configure test for and define AIX_LOGINFAILED_4ARGS, and add an ugly #ifdef... -- Darren Tucker (dtucker at zip.com.au) GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4 37C9 C982 80C7 8FF4 FA69 Good judgement comes with experience. Unfortunately, the experience usually comes from bad judgement.
I was able to apply patch 20 to a 3.6.2 tarball on Solaris successfully; the result compiled and is running on 4 or 5 machines. What is better OpenSSH now actually puts up a new-password prompt when your password has expired, as long as the pam.conf file has an session entry for other or sshd. I couldn't get the new-password prompt with patch 19 or with patch 20 applied to 3.5.2. I got the same patchd code to compile on AIX but haven't got a chance to test it yet. I and my colleagues think this is a nice step foward and would like to say thanks. /greg dunkel