@@ -733,10 +733,26 @@ redata_save(redata_t *redata, char *paramfilename, char **errordesc)

                 return(-1); /* sanity check failed */

         }

         filename=paramfilename;

+        memset(tmpfile,0,sizeof(tmpfile));

         if(stat(paramfilename,&statbuf)==0

           && (statbuf.st_mode & S_IFLNK)!=0

-          && readlink(paramfilename,tmplinkfilename,sizeof(tmplinkfilename))>0) {

-                tmplinkfilename[sizeof(tmplinkfilename)-1]='\0';

+          && readlink(paramfilename,tmpfile,sizeof(tmpfile))>0) {

+                tmpfile[sizeof(tmpfile)-1]='\0';

+                if(tmpfile[0]=='/') {

+                        /* absolute symlink, just copy it */

+                        strncpy(tmplinkfilename,tmpfile,sizeof(tmplinkfilename));

+                        tmplinkfilename[sizeof(tmplinkfilename)-1]='\0';

+                } else {

+                        char *aux;

+                        int off;

+                        /* relative symlink, put it after the path of paramfilename */

+                        off=0;

+                        if((aux=mymemrchr(paramfilename,'/',strlen(paramfilename)))!=NULL)

+                                off=(aux-paramfilename+1);

+                        memcpy(tmplinkfilename,paramfilename,off);

+                        strncpy(tmplinkfilename+off,tmpfile,sizeof(tmplinkfilename)-off);

+                        tmplinkfilename[sizeof(tmplinkfilename)-1]='\0';

+                }

                 filename=tmplinkfilename;

         }

         if((securesave_genname(filename,tmpfile,sizeof(tmpfile)))==NULL) {

@@ -772,7 +788,7 @@ redata_save(redata_t *redata, char *paramfilename, char **errordesc)

         }

         for(i=0;i<redata->sizeplugins;i++) {

                 if(redata->plugins[i].postsave!=NULL)

-                        redata->plugins[i].postsave(redata,redata->plugins+i,redata->filename,filename);

+                        redata->plugins[i].postsave(redata,redata->plugins+i,redata->filename,paramfilename);

         }

         strncpy(redata->filename,paramfilename,sizeof(redata->filename));

         redata->filename[sizeof(redata->filename)-1]='\0';

@@ -2157,7 +2173,8 @@ mymemrchr(const void *s, int c, size_t n)

         b=(*((unsigned int *)(&c)))&0xff;

         for(i=0;i<n;i++) {

                 if(((unsigned char *)s)[i]==b)

-                        res=(((unsigned char *)s)+i);        }

+                        res=(((unsigned char *)s)+i);

+        }

         return(res);

 }