Merge Meno's IPv6-1 code

[bacula/bacula] / bacula / src / dird / dird_conf.h

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 7d8b0d6b3efca95da7c77789ec8aae2524591373..a91f48b07b36fadc85b1776eed2a1532acfa2a54 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -62,20 +62,20 @@ enum {
 
 /* Used for certain KeyWord tables */
 struct s_kw {       
-   char *name;
+   const char *name;
    int token;   
 };
 
 /* Job Level keyword structure */
 struct s_jl {
-   char *level_name;                  /* level keyword */
+   const char *level_name;                  /* level keyword */
    int  level;                        /* level */
    int  job_type;                     /* JobType permitting this level */
 };
 
 /* Job Type keyword structure */
 struct s_jt {
-   char *type_name;
+   const char *type_name;
    int job_type;
 };
 
@@ -93,8 +93,7 @@ struct RUN;
  */
 struct DIRRES {
    RES   hdr;
-   int   DIRport;                     /* where we listen -- UA port server port */
-   char *DIRaddr;                     /* bind address */
+   dlist *DIRaddrs;
    char *password;                    /* Password for UA access */
    int enable_ssl;                    /* Use SSL for UA */
    char *query_file;                  /* SQL query file */
@@ -239,6 +238,7 @@ struct JOB {
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
 };
 
+#undef  MAX_FOPTS
 #define MAX_FOPTS 30
 
 /* File options structure */