X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Futils.c;h=8e38459e004f9166aa5033297963e61852828bd1;hb=65399bc233d5f8910bf589d08b43b933975b462a;hp=216ae771af770b268d1e600961997bb5d80e9ab6;hpb=d3372da97568d5e1f35fa19787c8ec8af93a0435;p=doldaconnect.git

diff --git a/daemon/utils.c b/daemon/utils.c
index 216ae77..8e38459 100644
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -533,6 +533,8 @@ char *base64decode(char *data, size_t *datalen)
 	c = (int)(unsigned char)*data;
 	if(c == '=')
 	    break;
+	if(c == '\n')
+	    continue;
 	if(base64rev[c] == -1)
 	{
 	    if(buf != NULL)
@@ -630,6 +632,8 @@ char *base32decode(char *data, size_t *datalen)
 	c = (int)(unsigned char)*data;
 	if(c == '=')
 	    break;
+	if(c == '\n')
+	    continue;
 	if(base32rev[c] == -1)
 	{
 	    if(buf != NULL)
@@ -676,13 +680,19 @@ int _parrlen(void **arr)
 
 char *getetcpath(char *binpath)
 {
+    int f;
     char *etcpath, *p;
     size_t etcpathsize, etcpathdata;
 
     etcpath = NULL;
     etcpathsize = etcpathdata = 0;
+    f = 1;
     do
     {
+	if(f)
+	    f = 0;
+	else
+	    binpath++;
 	for(p = binpath; *p && (*p != ':'); p++);
 	for(; (p >= binpath) && (*p != '/'); p--);
 	if(p >= binpath)