X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fsecurity-util.h;h=dd1e3ccb9e5542b1d278eacb7a44b616d88d9231;hb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;hp=9b2dcc47ce855249dacd6d3d37ed79da385cbf2b;hpb=d3b2175e084f88c8736ad7073eacbf4670147aec;p=debian%2Famanda

diff --git a/common-src/security-util.h b/common-src/security-util.h
index 9b2dcc4..dd1e3cc 100644
--- a/common-src/security-util.h
+++ b/common-src/security-util.h
@@ -39,9 +39,9 @@
 #include "security.h"
 #include "event.h"
 
-#define auth_debug(i,x) do {		\
+#define auth_debug(i, ...) do {		\
 	if ((i) <= debug_auth) {	\
-	    dbprintf(x);		\
+	    dbprintf(__VA_ARGS__);	\
 	}				\
 } while (0)
 
@@ -83,6 +83,8 @@ struct tcp_conn {
     int			toclose;
     int			donotclose;
     int			auth;
+    char *              (*conf_fn)(char *, void *);
+    void *              datap;
 #ifdef KRB5_SECURITY
     gss_ctx_id_t	gss_context;
 #endif
@@ -206,8 +208,11 @@ typedef struct udp_handle {
 
 int	sec_stream_auth(void *);
 int	sec_stream_id(void *);
-void	sec_accept(const security_driver_t *, int, int,
-		    void (*)(security_handle_t *, pkt_t *));
+void	sec_accept(const security_driver_t *,
+		   char *(*)(char *, void *),
+		   int, int,
+		   void (*)(security_handle_t *, pkt_t *),
+		   void *);
 void	sec_close(void *);
 void	sec_connect_callback(void *);
 void	sec_connect_timeout(void *);
@@ -276,9 +281,5 @@ ssize_t net_read_fillbuf(int, int, void *, size_t);
 void	show_stat_info(char *a, char *b);
 int     check_name_give_sockaddr(const char *hostname, struct sockaddr *addr,
 				 char **errstr);
-int     check_addrinfo_give_name(struct addrinfo *res, const char *hostname,
-				 char **errstr);
-int	try_resolving_hostname(const char *hostname,
-			       char **cannonname);
 
 #endif /* _SECURITY_INFO_H */