TLS: move from SUPPORT_TLS to DISABLE_TLS macro for the build

[exim.git] / src / src / functions.h

diff --git a/src/src/functions.h b/src/src/functions.h
index c5af51652030ac8e8f08487faadbe2aa285edf69..11fb8b59e7a33a098d6fde1b8364e9b4b3e654ea 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -22,7 +22,7 @@ extern uschar *init_perl(uschar *);
 #endif
 
 
-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS
 extern const char *
                std_dh_prime_default(void);
 extern const char *
@@ -51,6 +51,7 @@ extern BOOL    tls_client_start(client_conn_ctx *, smtp_connect_args *,
 
 extern void    tls_close(void *, int);
 extern BOOL    tls_could_read(void);
+extern void    tls_daemon_init(void);
 extern int     tls_export_cert(uschar *, size_t, void *);
 extern int     tls_feof(void);
 extern int     tls_ferror(void);
@@ -76,7 +77,7 @@ extern BOOL    tls_is_name_for_cert(const uschar *, void *);
 extern int     tlsa_lookup(const host_item *, dns_answer *, BOOL);
 # endif
 
-#endif /*SUPPORT_TLS*/
+#endif /*DISABLE_TLS*/
 
 
 /* Everything else... */
@@ -213,8 +214,6 @@ extern void    msg_event_raise(const uschar *, const address_item *);
 #endif
 
 extern int     exim_chown_failure(int, const uschar*, uid_t, gid_t);
-inline int     exim_chown(const uschar*, uid_t, gid_t);
-inline int     exim_fchown(int, uid_t, gid_t, const uschar*);
 extern const uschar * exim_errstr(int);
 extern void    exim_exit(int, const uschar *);
 extern void    exim_nullstd(void);
@@ -351,7 +350,7 @@ extern uschar *parse_message_id(uschar *, uschar **, uschar **);
 extern const uschar *parse_quote_2047(const uschar *, int, uschar *, uschar *, int, BOOL);
 extern uschar *parse_date_time(uschar *str, time_t *t);
 extern int     vaguely_random_number(int);
-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS
 extern int     vaguely_random_number_fallback(int);
 #endif
 
@@ -591,37 +590,40 @@ extern void    version_init(void);
 extern BOOL    write_chunk(transport_ctx *, uschar *, int);
 extern ssize_t write_to_fd_buf(int, const uschar *, size_t);
 
+
+#if !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
 /* exim_chown - in some NFSv4 setups *seemes* to be an issue with
-   chown(<exim-uid>, <exim-gid>).
+chown(<exim-uid>, <exim-gid>).
 
-   Probably because the idmapping is broken, misconfigured or set up in
-   an unusal way. (see Bug 2931). As I'm not sure, if this was a single
-   case of misconfiguration, or if there are more such broken systems
-   out, I try to impose as least impact as possible and for now just write
-   a panic log entry pointing to the bug report. You're encouraged to
-   contact the developers, if you experience this issue.
+Probably because the idmapping is broken, misconfigured or set up in
+an unusal way. (see Bug 2931). As I'm not sure, if this was a single
+case of misconfiguration, or if there are more such broken systems
+out, I try to impose as least impact as possible and for now just write
+a panic log entry pointing to the bug report. You're encouraged to
+contact the developers, if you experience this issue.
 
-   fd     the file descriptor (or -1 if not valid)
-   name   the file name for error messages or for file operations,
-          if fd is < 0
-   owner  the owner
-   group  the group
+fd     the file descriptor (or -1 if not valid)
+name   the file name for error messages or for file operations,
+  if fd is < 0
+owner  the owner
+group  the group
 
-   returns 0 on success, -1 on failure */
+returns 0 on success, -1 on failure */
 
-inline int
+static inline int
 exim_fchown(int fd, uid_t owner, gid_t group, const uschar *name)
 {
-return (0 == fchown(fd, owner, group))
-  ? 0 : exim_chown_failure(fd, name, owner, group);
+return fchown(fd, owner, group)
+  ? exim_chown_failure(fd, name, owner, group) : 0;
 }
 
-inline int
+static inline int
 exim_chown(const uschar *name, uid_t owner, gid_t group)
 {
-return (0 == chown(name, owner, group))
-  ? 0 : exim_chown_failure(-1, name, owner, group);
+return chown(CCS name, owner, group)
+  ? exim_chown_failure(-1, name, owner, group) : 0;
 }
+#endif /* !MACRO_PREDEF */
 
 #endif  /* _FUNCTIONS_H_ */