From: Fredrik Tolf Date: Wed, 31 Oct 2007 18:12:26 +0000 (+0100) Subject: A few bugfixes. X-Git-Tag: 1.1~43 X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=70d8f2f1dd421bdf51b8408b47276a5daf02dc6e;p=doldaconnect.git A few bugfixes. --- diff --git a/daemon/auth-krb5.c b/daemon/auth-krb5.c index 069413d..7b88af3 100644 --- a/daemon/auth-krb5.c +++ b/daemon/auth-krb5.c @@ -468,7 +468,7 @@ static int opensess(struct authhandle *auth) } if((ret = krb5_cc_resolve(k5context, buf, &data->ccache)) != 0) { - flog(LOG_ERR, "could not resolve ccache name \"%s\": %s", buf2, error_message(ret)); + flog(LOG_ERR, "could not resolve ccache name \"%s\": %s", buf, error_message(ret)); return(AUTH_ERR); } setenv("KRB5CCNAME", buf, 1); diff --git a/daemon/fnet-adc.c b/daemon/fnet-adc.c index 2e920e6..5c609f8 100644 --- a/daemon/fnet-adc.c +++ b/daemon/fnet-adc.c @@ -356,13 +356,13 @@ static void hubconnect(struct fnetnode *fn, struct socket *sk) { struct adchub *hub; - getsock(hub->sk = sk); sk->readcb = (void (*)(struct socket *, void *))hubread; sk->errcb = (void (*)(struct socket *, int, void *))huberr; sk->data = fn; hub = smalloc(sizeof(*hub)); memset(hub, 0, sizeof(*hub)); + getsock(hub->sk = sk); if((hub->ich = iconv_open("wchar_t", "utf-8")) == (iconv_t)-1) { flog(LOG_CRIT, "iconv cannot handle UTF-8: %s", strerror(errno)); killfnetnode(fn);