kes Add dynamic dll entry point for SHGetFolderPath to Win32 code.

[bacula/bacula] / bacula / src / lib / bnet_server.c

diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index 32940600a2d125afafc3238e2d60b98b061feadf..d7ade4a9cd87fadcffe9adbeb4c6c91f7b822e94 100644 (file)
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -1,17 +1,3 @@
-/*
-   Copyright (C) 2000-2005 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
-
- */
  /*
   * Originally written by Kern Sibbald for inclusion in apcupsd,
   *  but heavily modified for Bacula
@@ -19,6 +5,35 @@
   *   Version $Id$
   */
 
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+
+
 #include "bacula.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -153,7 +168,6 @@ bnet_thread_server(dlist *addrs, int max_clients, workq_t *client_wq,
          /* Error, get out */
          foreach_dlist(fd_ptr, &sockfds) {
             close(fd_ptr->fd);
-            free((void *)fd_ptr);
          }
          Emsg1(M_FATAL, 0, _("Error in select: %s\n"), be.strerror());
          break;
@@ -200,10 +214,6 @@ bnet_thread_server(dlist *addrs, int max_clients, workq_t *client_wq,
             sockaddr_to_ascii(&cli_addr, buf, sizeof(buf));
             V(mutex);
             BSOCK *bs;
-            int oflags = fcntl(newsockfd, F_GETFL, 0);
-            if (oflags & O_NONBLOCK) {
-               Jmsg1(NULL, M_ABORT, 0, _("Nonblocking socket %d.\n"), newsockfd);
-            }
             bs = init_bsock(NULL, newsockfd, "client", buf, fd_ptr->port, &cli_addr);
             if (bs == NULL) {
                Jmsg0(NULL, M_ABORT, 0, _("Could not create client BSOCK.\n"));