Commit Graph

12 Commits

Author SHA1 Message Date
christos
cbdb6c7a40 resolve conflicts. 2008-04-06 23:38:19 +00:00
jnemeth
c9b9889ada add back #include <sys/socket.h> from Scott Ellis on current-users@ 2007-12-21 20:42:03 +00:00
christos
512c2e7e60 merge conflicts 2007-12-18 02:35:25 +00:00
christos
d1cb3ec527 remove unused variable. 2007-06-25 01:42:31 +00:00
christos
a9fc92da63 PR/34681: Scott Ellis: Explicitly include <sys/socket.h> 2006-10-04 14:30:35 +00:00
christos
c5a8b87f73 Resolve conflicts 2006-09-28 21:22:14 +00:00
jnemeth
79787ff03b Fix Coverity run 5, issue 2021 -- memory leak.
Approved by christos@.
2006-03-18 10:22:46 +00:00
christos
fab0e5bf66 resolve conflicts 2006-02-04 22:32:13 +00:00
lukem
56b6919254 Remove a stale #endif, and add one missing at EOF.
Noticed by code inspection and confirming by diffing against the vendor source.
The previous code compiled, but it certainly wouldn't have DTRT ...
2005-05-08 23:30:46 +00:00
christos
0a3fafc305 Update PAM from the "portable openssh" 4.0p1 2005-05-08 21:15:04 +00:00
christos
b3a1b19bc5 Make this compile. 2005-02-13 18:13:34 +00:00
christos
cb2bba8c62 Add pam files from portable openssh 3.9p1 2005-02-13 18:11:30 +00:00