Bug#302454: polished patch

[Robert Lemmen]

hi,

theis is almost the same patch as the last one, but with correct
indentation and error reporting. plus it is tested much better. this one
should be fine to go in

cu  robert

-- 
Robert Lemmen                               http://www.semistable.com 

diff -ur trackballs-1.0.0.orig/src/settings.cc trackballs-1.0.0/src/settings.cc
--- trackballs-1.0.0.orig/src/settings.cc       2005-06-29 14:54:00.000000000 
+0200
+++ trackballs-1.0.0/src/settings.cc    2005-06-29 15:07:50.000000000 +0200
@@ -138,10 +138,22 @@
 void Settings::save() {
   char str[256];
   int version=4;
+  gid_t egid;
 
+  /* drop setgid privileges */
+  egid = getegid();
+  if (setgid(getgid()) == -1) {
+    /* failed to drop privileges */   
+    fprintf(stderr,"Error, could not drop privileges. Cannot save settings\n");
+    return;
+  }
+
+  
   snprintf(str,sizeof(str)-1,"%s/.trackballs",getenv("HOME"));
   if(pathIsLink(str)) {
        fprintf(stderr,"Error, %s is a symbolic link. Cannot save 
settings\n",str);
+    /* reaquire setgid privs */
+       setgid(egid);
        return;
   }
 
@@ -149,6 +161,8 @@
   snprintf(str,sizeof(str)-1,"%s/.trackballs/settings",getenv("HOME"));
   if(pathIsLink(str)) {
        fprintf(stderr,"Error, %s is a symbolic link. Cannot save 
settings\n",str);
+    /* reaquire setgid privs */
+       setgid(egid);
        return;
   }
   
@@ -178,6 +192,8 @@
        fwrite(&rotateSteering,sizeof(int),1,fp);
        fclose(fp);
   }
+  /* reaquire setgid privs */
+  setgid(egid);
 }
 
 int Settings::hasJoystick() { 

signature.asc
Description: Digital signature