Ingo Feinerer <feine...@logic.at> writes:
> Hi,
>
> update net/dsocks 1.6 -> 1.7
>
> Now hosted at MASTER_SITE_GOOGLECODE instead of monkey.org.
> No visible changes (via nm -g) in .so so keep SHARED_LIBS at 1.0.
> Works for me on amd64.
>
> OK?
ok jca@
The only C code change is not relevant on OpenBSD. Please go ahead,
I have a few packaging fixes.
diff -pruN dsocks-1.6/dsocks.c dsocks-1.7/dsocks.c
--- dsocks-1.6/dsocks.c Thu Oct 12 06:13:58 2006
+++ dsocks-1.7/dsocks.c Wed Jun 4 06:08:03 2008
@@ -604,9 +604,10 @@ _dsocks_init(void)
}
if ((pw = getpwuid(getuid())) != NULL) {
strlcpy(_dsocks_user, pw->pw_name, sizeof(_dsocks_user));
- } else
- errx(1, "(dsocks) who are you?");
-
+ } else {
+ /* XXX - getpwuid() actually fails on MacOS X Leopard! */
+ strlcpy(_dsocks_user, getenv("USER"), sizeof(_dsocks_user));
+ }
#ifndef DL_LAZY
# define DL_LAZY RTLD_LAZY
#endif
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
