Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Tree: 7b6d51bed2
Branches Tags
openadk
/
package
/
openswan
/
patches
/
patch-include_arpa_nameser_h

patch-include_arpa_nameser_h 5.4 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128 
  1. --- openswan-2.6.38.orig/include/arpa/nameser.h	2012-03-23 22:33:43.000000000 +0100
    2. 

  2. +++ openswan-2.6.38/include/arpa/nameser.h	2014-03-26 19:50:18.000000000 +0100
    3. 

  3. @@ -55,7 +55,6 @@
    4. 

  4.  
    5. 

  5.  #include <sys/param.h>
    6. 

  6.  #include <sys/types.h>
    7. 

  7. -#include <sys/cdefs.h>
    8. 

  8.  
    9. 

  9.  /*
    10. 

  10.   * Revision information.  This is the release date in YYYYMMDD format.
    11. 

  11. @@ -505,62 +504,66 @@ typedef enum __ns_cert_types {
    12. 

  12.  #define	ns_makecanon		__ns_makecanon
    13. 

  13.  #define	ns_samename		__ns_samename
    14. 

  14.  
    15. 

  15. -__BEGIN_DECLS
    16. 

  16. -int		ns_msg_getflag __P((ns_msg, int));
    17. 

  17. -u_int		ns_get16 __P((const u_char *));
    18. 

  18. -u_long		ns_get32 __P((const u_char *));
    19. 

  19. -void		ns_put16 __P((u_int, u_char *));
    20. 

  20. -void		ns_put32 __P((u_long, u_char *));
    21. 

  21. -int		ns_initparse __P((const u_char *, int, ns_msg *));
    22. 

  22. -int		ns_skiprr __P((const u_char *, const u_char *, ns_sect, int));
    23. 

  23. -int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
    24. 

  24. -int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
    25. 

  25. -				 const char *, const char *, char *, size_t));
    26. 

  26. -int		ns_sprintrrf __P((const u_char *, size_t, const char *,
    27. 

  27. +#ifdef __cplusplus
    28. 

  28. +extern "C" {
    29. 

  29. +#endif
    30. 

  30. +int		ns_msg_getflag (ns_msg, int);
    31. 

  31. +u_int		ns_get16 (const u_char *);
    32. 

  32. +u_long		ns_get32 (const u_char *);
    33. 

  33. +void		ns_put16 (u_int, u_char *);
    34. 

  34. +void		ns_put32 (u_long, u_char *);
    35. 

  35. +int		ns_initparse (const u_char *, int, ns_msg *);
    36. 

  36. +int		ns_skiprr (const u_char *, const u_char *, ns_sect, int);
    37. 

  37. +int		ns_parserr (ns_msg *, ns_sect, int, ns_rr *);
    38. 

  38. +int		ns_sprintrr (const ns_msg *, const ns_rr *,
    39. 

  39. +				 const char *, const char *, char *, size_t);
    40. 

  40. +int		ns_sprintrrf (const u_char *, size_t, const char *,
    41. 

  41.  				  ns_class, ns_type, u_long, const u_char *,
    42. 

  42.  				  size_t, const char *, const char *,
    43. 

  43. -				  char *, size_t));
    44. 

  44. -int		ns_format_ttl __P((u_long, char *, size_t));
    45. 

  45. -int		ns_parse_ttl __P((const char *, u_long *));
    46. 

  46. -u_int32_t	ns_datetosecs __P((const char *cp, int *errp));
    47. 

  47. -int		ns_name_ntol __P((const u_char *, u_char *, size_t));
    48. 

  48. -int		ns_name_ntop __P((const u_char *, char *, size_t));
    49. 

  49. -int		ns_name_pton __P((const char *, u_char *, size_t));
    50. 

  50. -int		ns_name_unpack __P((const u_char *, const u_char *,
    51. 

  51. -				    const u_char *, u_char *, size_t));
    52. 

  52. -int		ns_name_pack __P((const u_char *, u_char *, int,
    53. 

  53. -				  const u_char **, const u_char **));
    54. 

  54. -int		ns_name_uncompress __P((const u_char *, const u_char *,
    55. 

  55. -					const u_char *, char *, size_t));
    56. 

  56. -int		ns_name_compress __P((const char *, u_char *, size_t,
    57. 

  57. -				      const u_char **, const u_char **));
    58. 

  58. -int		ns_name_skip __P((const u_char **, const u_char *));
    59. 

  59. -void		ns_name_rollback __P((const u_char *, const u_char **,
    60. 

  60. -				      const u_char **));
    61. 

  61. -int		ns_sign __P((u_char *, int *, int, int, void *,
    62. 

  62. -			     const u_char *, int, u_char *, int *, time_t));
    63. 

  63. -int		ns_sign2 __P((u_char *, int *, int, int, void *,
    64. 

  64. +				  char *, size_t);
    65. 

  65. +int		ns_format_ttl (u_long, char *, size_t);
    66. 

  66. +int		ns_parse_ttl (const char *, u_long *);
    67. 

  67. +u_int32_t	ns_datetosecs (const char *cp, int *errp);
    68. 

  68. +int		ns_name_ntol (const u_char *, u_char *, size_t);
    69. 

  69. +int		ns_name_ntop (const u_char *, char *, size_t);
    70. 

  70. +int		ns_name_pton (const char *, u_char *, size_t);
    71. 

  71. +int		ns_name_unpack (const u_char *, const u_char *,
    72. 

  72. +				    const u_char *, u_char *, size_t);
    73. 

  73. +int		ns_name_pack (const u_char *, u_char *, int,
    74. 

  74. +				  const u_char **, const u_char **);
    75. 

  75. +int		ns_name_uncompress (const u_char *, const u_char *,
    76. 

  76. +					const u_char *, char *, size_t);
    77. 

  77. +int		ns_name_compress (const char *, u_char *, size_t,
    78. 

  78. +				      const u_char **, const u_char **);
    79. 

  79. +int		ns_name_skip (const u_char **, const u_char *);
    80. 

  80. +void		ns_name_rollback (const u_char *, const u_char **,
    81. 

  81. +				      const u_char **);
    82. 

  82. +int		ns_sign (u_char *, int *, int, int, void *,
    83. 

  83. +			     const u_char *, int, u_char *, int *, time_t);
    84. 

  84. +int		ns_sign2 (u_char *, int *, int, int, void *,
    85. 

  85.  			      const u_char *, int, u_char *, int *, time_t,
    86. 

  86. -			      u_char **, u_char **));
    87. 

  87. -int		ns_sign_tcp __P((u_char *, int *, int, int,
    88. 

  88. -				 ns_tcp_tsig_state *, int));
    89. 

  89. -int		ns_sign_tcp2 __P((u_char *, int *, int, int,
    90. 

  90. +			      u_char **, u_char **);
    91. 

  91. +int		ns_sign_tcp (u_char *, int *, int, int,
    92. 

  92. +				 ns_tcp_tsig_state *, int);
    93. 

  93. +int		ns_sign_tcp2 (u_char *, int *, int, int,
    94. 

  94.  				  ns_tcp_tsig_state *, int,
    95. 

  95. -				  u_char **, u_char **));
    96. 

  96. -int		ns_sign_tcp_init __P((void *, const u_char *, int,
    97. 

  97. -					ns_tcp_tsig_state *));
    98. 

  98. -u_char		*ns_find_tsig __P((u_char *, u_char *));
    99. 

  99. -int		ns_verify __P((u_char *, int *, void *,
    100. 

  100. +				  u_char **, u_char **);
    101. 

  101. +int		ns_sign_tcp_init (void *, const u_char *, int,
    102. 

  102. +					ns_tcp_tsig_state *);
    103. 

  103. +u_char		*ns_find_tsig (u_char *, u_char *);
    104. 

  104. +int		ns_verify (u_char *, int *, void *,
    105. 

  105.  			       const u_char *, int, u_char *, int *,
    106. 

  106. -			       time_t *, int));
    107. 

  107. -int		ns_verify_tcp __P((u_char *, int *, ns_tcp_tsig_state *, int));
    108. 

  108. -int		ns_verify_tcp_init __P((void *, const u_char *, int,
    109. 

  109. -					ns_tcp_tsig_state *));
    110. 

  110. -int		ns_samedomain __P((const char *, const char *));
    111. 

  111. -int		ns_subdomain __P((const char *, const char *));
    112. 

  112. -int		ns_makecanon __P((const char *, char *, size_t));
    113. 

  113. -int		ns_samename __P((const char *, const char *));
    114. 

  114. -__END_DECLS
    115. 

  115. +			       time_t *, int);
    116. 

  116. +int		ns_verify_tcp (u_char *, int *, ns_tcp_tsig_state *, int);
    117. 

  117. +int		ns_verify_tcp_init (void *, const u_char *, int,
    118. 

  118. +					ns_tcp_tsig_state *);
    119. 

  119. +int		ns_samedomain (const char *, const char *);
    120. 

  120. +int		ns_subdomain (const char *, const char *);
    121. 

  121. +int		ns_makecanon (const char *, char *, size_t);
    122. 

  122. +int		ns_samename (const char *, const char *);
    123. 

  123. +#ifdef __cplusplus
    124. 

  124. +}
    125. 

  125. +#endif
    126. 

  126.  
    127. 

  127.  #ifdef BIND_4_COMPAT
    128. 

  128.  #include <arpa/nameser_compat.h>
    129.