X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fuimisc.c;h=e1ece1c3ae5178c482d2216849089c92a9067292;hb=0c58c2a0a0792f1b40969242bf1a483cf6405889;hp=794e976e004559fb5a4d1379c446d35b662ea555;hpb=ccce0b4b3fe66fdb95e271f2d1ca2cd6d741e175;p=doldaconnect.git diff --git a/lib/uimisc.c b/lib/uimisc.c index 794e976..e1ece1c 100644 --- a/lib/uimisc.c +++ b/lib/uimisc.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #ifdef HAVE_CONFIG_H @@ -35,7 +34,7 @@ #endif #include #include -#include +#include #ifdef HAVE_KRB5 #include @@ -80,6 +79,29 @@ struct fnetcbdata struct dc_fnetnode *dc_fnetnodes = NULL; struct dc_transfer *dc_transfers = NULL; +static void message(char *format, ...) +{ + static int on = -1; + char *v; + va_list args; + + if(on == -1) + { + on = 0; + if((v = getenv("LIBDCUI_MSG")) != NULL) + { + if(strtol(v, NULL, 0) & 1) + on = 1; + } + } + if(on == 1) + { + va_start(args, format); + vfprintf(stderr, format, args); + va_end(args); + } +} + static void freelogindata(struct logindata *data) { if((data->mech != NULL) && (data->mech->release != NULL)) @@ -206,77 +228,6 @@ struct krb5data int valid, fwd, fwded; }; -static char *hexencode(char *data, size_t datalen) -{ - char *buf, this; - size_t bufsize, bufdata; - int dig; - - buf = NULL; - bufsize = bufdata = 0; - for(; datalen > 0; datalen--, data++) - { - dig = (*data & 0xF0) >> 4; - if(dig > 9) - this = 'A' + dig - 10; - else - this = dig + '0'; - addtobuf(buf, this); - dig = *data & 0x0F; - if(dig > 9) - this = 'A' + dig - 10; - else - this = dig + '0'; - addtobuf(buf, this); - } - addtobuf(buf, 0); - return(buf); -} - -static char *hexdecode(char *data, size_t *len) -{ - char *buf, this; - size_t bufsize, bufdata; - - buf = NULL; - bufsize = bufdata = 0; - for(; *data; data++) - { - if((*data >= 'A') && (*data <= 'F')) - { - this = (this & 0x0F) | ((*data - 'A' + 10) << 4); - } else if((*data >= '0') && (*data <= '9')) { - this = (this & 0x0F) | ((*data - '0') << 4); - } else { - if(buf != NULL) - free(buf); - return(NULL); - } - data++; - if(!*data) - { - if(buf != NULL) - free(buf); - return(NULL); - } - if((*data >= 'A') && (*data <= 'F')) - { - this = (this & 0xF0) | (*data - 'A' + 10); - } else if((*data >= '0') && (*data <= '9')) { - this = (this & 0xF0) | (*data - '0'); - } else { - if(buf != NULL) - free(buf); - return(NULL); - } - addtobuf(buf, this); - } - addtobuf(buf, 0); - if(len != NULL) - *len = bufdata - 1; - return(buf); -} - static void process_krb5(struct dc_response *resp, struct logindata *data) { int ret; @@ -325,7 +276,7 @@ static void process_krb5(struct dc_response *resp, struct logindata *data) krb->reqbuf.data = NULL; if((ret = krb5_fwd_tgt_creds(krb->context, krb->authcon, NULL, krb->servcreds->client, krb->servcreds->server, 0, 1, &krb->reqbuf)) != 0) { - fprintf(stderr, "krb5_fwd_tgt_creds reported an error: %s\n", error_message(ret)); + message("krb5_fwd_tgt_creds reported an error: %s\n", error_message(ret)); dc_queuecmd(logincallback, data, L"pass", L"31", NULL); krb->fwd = 0; krb->state = 2; @@ -377,28 +328,28 @@ static int init_krb5(struct logindata *data) data->mechdata = krb; if((ret = krb5_init_context(&krb->context)) != 0) { - fprintf(stderr, "krb5_init_context reported an error: %s\n", error_message(ret)); + message("krb5_init_context reported an error: %s\n", error_message(ret)); return(1); } if((ret = krb5_auth_con_init(krb->context, &krb->authcon)) != 0) { - fprintf(stderr, "krb5_auth_con_init reported an error: %s\n", error_message(ret)); + message("krb5_auth_con_init reported an error: %s\n", error_message(ret)); return(1); } krb5_auth_con_setflags(krb->context, krb->authcon, KRB5_AUTH_CONTEXT_DO_SEQUENCE); if((ret = krb5_sname_to_principal(krb->context, dc_gethostname(), "doldacond", KRB5_NT_SRV_HST, &krb->sprinc)) != 0) { - fprintf(stderr, "krb5_sname_to_principal reported an error: %s\n", error_message(ret)); + message("krb5_sname_to_principal reported an error: %s\n", error_message(ret)); return(1); } if((ret = krb5_cc_default(krb->context, &krb->ccache)) != 0) { - fprintf(stderr, "krb5_cc_default reported an error: %s\n", error_message(ret)); + message("krb5_cc_default reported an error: %s\n", error_message(ret)); return(1); } if((ret = krb5_cc_get_principal(krb->context, krb->ccache, &krb->myprinc)) != 0) { - fprintf(stderr, "krb5_cc_default reported an error: %s\n", error_message(ret)); + message("krb5_cc_default reported an error: %s\n", error_message(ret)); return(1); } memset(&creds, 0, sizeof(creds)); @@ -406,7 +357,7 @@ static int init_krb5(struct logindata *data) creds.server = krb->sprinc; if((ret = krb5_get_credentials(krb->context, 0, krb->ccache, &creds, &krb->servcreds)) != 0) { - fprintf(stderr, "krb5_get_credentials reported an error: %s\n", error_message(ret)); + message("krb5_get_credentials reported an error: %s\n", error_message(ret)); return(1); } /* WTF is this checksum stuff?! The Krb docs don't say a word about it! */ @@ -414,7 +365,7 @@ static int init_krb5(struct logindata *data) cksum.length = strlen(cksum.data); if((ret = krb5_mk_req_extended(krb->context, &krb->authcon, AP_OPTS_MUTUAL_REQUIRED, &cksum, krb->servcreds, &krb->reqbuf)) != 0) { - fprintf(stderr, "krb5_mk_req_extended reported an error: %s\n", error_message(ret)); + message("krb5_mk_req_extended reported an error: %s\n", error_message(ret)); return(1); } free(cksum.data); @@ -528,7 +479,7 @@ static int logincallback(struct dc_response *resp) if(authmechs[i].release != NULL) authmechs[i].release(data); data->mechdata = odata; - fprintf(stderr, "authentication mechanism %ls failed, trying further...\n", authmechs[i].name); + message("authentication mechanism %ls failed, trying further...\n", authmechs[i].name); } else { if((data->mech != NULL) && data->mech->release != NULL) { @@ -995,9 +946,9 @@ static int sortlist1(const struct dc_respline *l1, const struct dc_respline *l2) return(wcscmp(l1->argv[1], l2->argv[1])); } -static int sortlist2(const struct dc_fnetpeer *p1, const struct dc_fnetpeer *p2) +static int sortlist2(const struct dc_fnetpeer **p1, const struct dc_fnetpeer **p2) { - return(wcscmp(p1->id, p2->id)); + return(wcscmp((*p1)->id, (*p2)->id)); } static void fillpeer(struct dc_fnetpeer *peer, struct dc_respline *r) @@ -1064,9 +1015,9 @@ static int getpeerlistcallback(struct dc_response *resp) delpeer(plist[o]); o++; } else { + fillpeer(plist[o], resp->rlines + i); i++; o++; - fillpeer(plist[o], resp->rlines + i); } } else if(i < resp->numlines) { peer = addpeer(fn, resp->rlines[i].argv[1], resp->rlines[i].argv[2]);