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

diff --git a/doc/TODO b/doc/TODO
index 2f15a875dad51d90eecf6c2ae03f0dc088a661af..f194997ee32e036c9c4854f7b44721d5449cf354 100644 (file)
--- 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 dfe414c45d47dd512769d5a0e6ddcb25807778f4..a2993956d6dfece156fae3fc44a7c6f942dc98dc 100644 (file)
--- 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);
 }