@@ -719,18 +719,27 @@ redata_load(redata_t *redata, char *filename, char **errordesc)

 }

 int

-redata_save(redata_t *redata, char *filename, char **errordesc)

+redata_save(redata_t *redata, char *paramfilename, char **errordesc)

 {

         int fd;

         int i,n;

+        char tmplinkfilename[PATH_MAX+1];

         char tmpfile[PATH_MAX+1];

         struct stat statbuf;

-        if(redata==NULL || filename==NULL) {

+        char *filename;

+        if(redata==NULL || paramfilename==NULL) {

                 if(errordesc!=NULL)

                         *errordesc="Internal error";

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

         }

-        if((securesave_genname(redata->filename,tmpfile,sizeof(tmpfile)))==NULL) {

+        filename=paramfilename;

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

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

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

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

+                filename=tmplinkfilename;

+        }

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

                 if(errordesc!=NULL)

                         *errordesc="Malformed filename";

                 return(-1); /* malformed filename */

@@ -765,7 +774,7 @@ redata_save(redata_t *redata, char *filename, char **errordesc)

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

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

         }

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

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

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

         /* mark as not modified */

         redata->needs_saving=0;