Changeset 220 for trunk

Timestamp:

Feb 24, 2009, 9:18:45 PM (16 years ago)

Author:

katerina

Message:

Fix problem with standalone trustfile (ticket #147).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/trustfile.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.5.3:
+        * Fix problem in standalone trustfile, does not work correctly on
+          group-writeable files (reported by David).
         * Option SetThrottle to throttle throughput for db download
         * Option SetConnectionTimeout to configure the client connection 

trunk/src/trustfile.c

@@ -86 +86 @@
 #else
 #define UID_CAST long
+#define HAVE_GETPWENT
+#define SH_MUTEX_LOCK(a)   ((void)0)
+#define SH_MUTEX_UNLOCK(a) ((void)0)
 #endif
 
@@ -362 +365 @@
         SL_IRETURN(status, _("getfname"));
 #else
-      strncat(rbuf, "/",   rsz-strlen(rbuf));
-      strncat(rbuf, fname, rsz-strlen(rbuf));
+      strncat(rbuf, "/",   rsz-strlen(rbuf)-1);
+      strncat(rbuf, fname, rsz-strlen(rbuf)-1);
+      rbuf[rsz-1] = '\0';
 #endif
     }
@@ -624 +628 @@
                   fprintf (stderr, 
                            "trustfile: uid=%ld, trusted_uid=%ld, match found --> OK\n", 
-                           (UID_CAST)(w->pw_uid), *u);
+                           (UID_CAST)(w->pw_uid), (UID_CAST)(*u));
 #endif 
                   flag = 0;