- Add Version, ConfigDir, and WorkingDir as Python attributes

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 6519503fed7de2f6c7c5de94f800515c91fa83c0..75e140ae5f73d1a75a0c971414f47cc5263a6955 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -23,7 +23,7 @@
 
  */
 
-struct JCR;
+class JCR;
 
 /* attr.c */
 ATTR     *new_attr();
@@ -71,11 +71,9 @@ bool       bnet_send             (BSOCK *bsock);
 bool       bnet_fsend            (BSOCK *bs, const char *fmt, ...);
 bool       bnet_set_buffer_size  (BSOCK *bs, uint32_t size, int rw);
 bool       bnet_sig              (BSOCK *bs, int sig);
-#ifdef HAVE_TLS
 int        bnet_tls_server       (TLS_CONTEXT *ctx, BSOCK *bsock,
                                   alist *verify_list);
 int        bnet_tls_client       (TLS_CONTEXT *ctx, BSOCK *bsock);
-#endif /* HAVE_TLS */
 BSOCK *    bnet_connect          (JCR *jcr, int retry_interval,
                int max_retry_time, const char *name, char *host, char *service,
                int port, int verbose);
@@ -213,7 +211,6 @@ int             bsscanf(const char *buf, const char *fmt, ...);
 int              init_tls                (void);
 int              cleanup_tls             (void);
 
-#ifdef HAVE_TLS
 TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *ca_certdir,
                                           const char *certfile,
@@ -223,6 +220,7 @@ TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *dhfile,
                                           bool verify_peer);
 void             free_tls_context        (TLS_CONTEXT *ctx);
+#ifdef HAVE_TLS
 bool             tls_postconnect_verify_host  (TLS_CONNECTION *tls,
                                                const char *host);
 bool             tls_postconnect_verify_cn    (TLS_CONNECTION *tls,