Imported Debian patch 2.5.0-1

[debian/amanda] / common-src / amflock.c

diff --git a/common-src/amflock.c b/common-src/amflock.c
index d27a857691088640d66a397baee9837442bc2054..9fe27c7c575397c2e1878c3ef92b524b4bc9dcb0 100644 (file)
--- a/common-src/amflock.c
+++ b/common-src/amflock.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: amflock.c,v 1.17.4.6.6.1 2003/10/22 17:43:33 martinea Exp $
+ * $Id: amflock.c,v 1.27 2005/10/06 17:26:21 martinea Exp $
  *
  * file locking routines, put here to hide the system dependant stuff
  * from the rest of the code
@@ -284,7 +284,7 @@ int op;    /* true to lock; false to unlock */
 
        /* lock the resource */
 
-       ap_snprintf(pid_str, sizeof(pid_str), "%ld", mypid);
+       snprintf(pid_str, sizeof(pid_str), "%ld", mypid);
        tlockfile = vstralloc(AMANDA_TMPDIR, "am", res, ".", pid_str, NULL);
 
        (void)create_lock(tlockfile, mypid);
@@ -414,16 +414,6 @@ main()
     char *resn = "test";
     int fd;
 
-    for(fd = 3; fd < FD_SETSIZE; fd++) {
-       /*
-        * Make sure nobody spoofs us with a lot of extra open files
-        * that would cause an open we do to get a very high file
-        * descriptor, which in turn might be used as an index into
-        * an array (e.g. an fd_set).
-        */
-       close(fd);
-    }
-
     unlink(filen);
     if ((lockfd = open(filen, O_RDONLY|O_CREAT|O_EXCL, 0600)) == -1) {
        perror (filen);