projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.6.0
[debian/amanda]
/
common-src
/
security-util.h
diff --git
a/common-src/security-util.h
b/common-src/security-util.h
index 9b2dcc47ce855249dacd6d3d37ed79da385cbf2b..dd1e3ccb9e5542b1d278eacb7a44b616d88d9231 100644
(file)
--- a/
common-src/security-util.h
+++ b/
common-src/security-util.h
@@
-39,9
+39,9
@@
#include "security.h"
#include "event.h"
#include "security.h"
#include "event.h"
-#define auth_debug(i,
x) do {
\
+#define auth_debug(i,
...) do {
\
if ((i) <= debug_auth) { \
if ((i) <= debug_auth) { \
- dbprintf(
x);
\
+ dbprintf(
__VA_ARGS__);
\
} \
} while (0)
} \
} while (0)
@@
-83,6
+83,8
@@
struct tcp_conn {
int toclose;
int donotclose;
int auth;
int toclose;
int donotclose;
int auth;
+ char * (*conf_fn)(char *, void *);
+ void * datap;
#ifdef KRB5_SECURITY
gss_ctx_id_t gss_context;
#endif
#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 *);
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 *);
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);
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 */
#endif /* _SECURITY_INFO_H */