From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 27 May 2008 14:45:07 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
X-Git-Tag: 1.3~11^2^2~10
X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=b65b119a8db3fcd383efcd65b38b333096c1cec2;hp=a77b52c86516752280fe9b7dd2b72fead11060b0

Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
---

diff --git a/doc/TODO b/doc/TODO
index 2f15a87..f194997 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -22,5 +22,4 @@ Documentation:
 
 Code cleanups:
  * Clean up local variables in the library.
-
-Other: See output of "grep -r XXX ."
+ * See output of "grep -r XXX ."
diff --git a/lib/uilib.c b/lib/uilib.c
index dfe414c..a299395 100644
--- a/lib/uilib.c
+++ b/lib/uilib.c
@@ -104,7 +104,8 @@ struct {
     int family;
     int sentcreds;
 } servinfo;
-char *dc_srv_local;
+char dc_srv_local_addr;
+char *dc_srv_local = &dc_srv_local_addr;
 
 static void message(int bits, char *format, ...)
 {
@@ -320,7 +321,6 @@ int dc_init(void)
 {
     if((ichandle = iconv_open("wchar_t", "utf-8")) == (iconv_t)-1)
 	return(-1);
-    dc_srv_local = sstrdup("");
     initcmds();
     return(0);
 }