--- client/client.c.orig	2011-03-31 10:29:41.000000000 +0200
+++ client/client.c	2011-04-30 16:43:02.053451005 +0200
@@ -368,7 +368,7 @@
 
   bzero(&sa, sizeof(sa));
   sa.sun_family = AF_UNIX;
-  strcpy(sa.sun_path, server_path);
+  strncpy(sa.sun_path, server_path, sizeof(sa.sun_path));
   if (connect(server_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0)
     die("Unable to connect to server control socket (%s): %m", server_path);
   if (fcntl(server_fd, F_SETFL, O_NONBLOCK) < 0)
--- sysdep/unix/io.c.orig	2011-03-31 10:29:42.000000000 +0200
+++ sysdep/unix/io.c	2011-04-30 16:43:02.063451005 +0200
@@ -1212,7 +1212,7 @@
 
   /* Path length checked in test_old_bird() */
   sa.sun_family = AF_UNIX;
-  strcpy(sa.sun_path, name);
+  strncpy(sa.sun_path, name, sizeof(sa.sun_path));
   if (bind(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0)
     ERR("bind");
   if (listen(fd, 8))
