Replace explicit checks for "/" with calls to IsPathSeparator, strchr with first_path...

[bacula/bacula] / bacula / src / lib / address_conf.h

diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index 42fe083d6007a9e3b131f129e37697d34a22f043..78d7992d2be8a1254b5780dfe0600845c3ed580c 100644 (file)
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -1,40 +1,46 @@
 /*
  *
- *   Written by Meno Abels, June MMIIII
+ *   Written by Meno Abels, June MMIV
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   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
+   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
- */
+   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.
+*/
 
 class IPADDR : public SMARTALLOC {
  public:
    typedef enum { R_SINGLE, R_SINGLE_PORT, R_SINGLE_ADDR, R_MULTIPLE,
-                 R_DEFAULT, R_EMPTY
+                  R_DEFAULT, R_EMPTY
    } i_type;
    IPADDR(int af);
    IPADDR(const IPADDR & src);
  private:
-   IPADDR() {  /* block this construction */ } 
+   IPADDR() {  /* block this construction */ }
    i_type type;
    union {
       struct sockaddr dontuse;
@@ -89,6 +95,9 @@ extern const char *build_addresses_str(dlist *addrs, char *buf, int blen);
 extern int sockaddr_get_port_net_order(const struct sockaddr *sa);
 extern int sockaddr_get_port(const struct sockaddr *sa);
 extern char *sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len);
+#ifdef WIN32
+#undef HAVE_OLD_SOCKOPT
+#endif
 #ifdef HAVE_OLD_SOCKOPT
 extern int inet_aton(const char *cp, struct in_addr *inp);
 #endif