Ignore:
Timestamp:
Nov 14, 2012, 12:59:34 PM (12 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to 3.6.0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified vendor/current/source4/heimdal/lib/krb5/addr_families.c

    r414 r740  
    176176    } else
    177177        p = address;
    178 #ifdef HAVE_INET_ATON
    179178    if(inet_aton(p, &a) == 0)
    180179        return -1;
    181 #elif defined(HAVE_INET_ADDR)
    182     a.s_addr = inet_addr(p);
    183     if(a.s_addr == INADDR_NONE)
    184         return -1;
    185 #else
    186     return -1;
    187 #endif
    188180    addr->addr_type = KRB5_ADDRESS_INET;
    189181    if(krb5_data_alloc(&addr->address, 4) != 0)
    … …  
    340332{
    341333    char buf[128], buf2[3];
    342 #ifdef HAVE_INET_NTOP
    343334    if(inet_ntop(AF_INET6, addr->address.data, buf, sizeof(buf)) == NULL)
    344 #endif
    345335        {
    346336            /* XXX this is pretty ugly, but better than abort() */
    … …  
    791781 */
    792782
    793 krb5_error_code KRB5_LIB_FUNCTION
     783KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    794784krb5_sockaddr2address (krb5_context context,
    795785                       const struct sockaddr *sa, krb5_address *addr)
    … …  
    819809 */
    820810
    821 krb5_error_code KRB5_LIB_FUNCTION
     811KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    822812krb5_sockaddr2port (krb5_context context,
    823813                    const struct sockaddr *sa, int16_t *port)
    … …  
    854844 */
    855845
    856 krb5_error_code KRB5_LIB_FUNCTION
     846KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    857847krb5_addr2sockaddr (krb5_context context,
    858848                    const krb5_address *addr,
    … …  
    890880 */
    891881
    892 size_t KRB5_LIB_FUNCTION
     882KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
    893883krb5_max_sockaddr_size (void)
    894884{
    … …  
    914904 */
    915905
    916 krb5_boolean KRB5_LIB_FUNCTION
     906KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
    917907krb5_sockaddr_uninteresting(const struct sockaddr *sa)
    918908{
    … …  
    942932 */
    943933
    944 krb5_error_code KRB5_LIB_FUNCTION
     934KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    945935krb5_h_addr2sockaddr (krb5_context context,
    946936                      int af,
    … …  
    973963 */
    974964
    975 krb5_error_code KRB5_LIB_FUNCTION
     965KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    976966krb5_h_addr2addr (krb5_context context,
    977967                  int af,
    … …  
    1004994 */
    1005995
    1006 krb5_error_code KRB5_LIB_FUNCTION
     996KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    1007997krb5_anyaddr (krb5_context context,
    1008998              int af,
    … …  
    10391029 */
    10401030
    1041 krb5_error_code KRB5_LIB_FUNCTION
     1031KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    10421032krb5_print_address (const krb5_address *addr,
    10431033                    char *str, size_t len, size_t *ret_len)
    … …  
    10891079 */
    10901080
    1091 krb5_error_code KRB5_LIB_FUNCTION
     1081KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    10921082krb5_parse_address(krb5_context context,
    10931083                   const char *string,
    … …  
    11701160 */
    11711161
    1172 int KRB5_LIB_FUNCTION
     1162KRB5_LIB_FUNCTION int KRB5_LIB_CALL
    11731163krb5_address_order(krb5_context context,
    11741164                   const krb5_address *addr1,
    … …  
    12191209 */
    12201210
    1221 krb5_boolean KRB5_LIB_FUNCTION
     1211KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
    12221212krb5_address_compare(krb5_context context,
    12231213                     const krb5_address *addr1,
    … …  
    12401230 */
    12411231
    1242 krb5_boolean KRB5_LIB_FUNCTION
     1232KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
    12431233krb5_address_search(krb5_context context,
    12441234                    const krb5_address *addr,
    … …  
    12651255 */
    12661256
    1267 krb5_error_code KRB5_LIB_FUNCTION
     1257KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    12681258krb5_free_address(krb5_context context,
    12691259                  krb5_address *address)
    … …  
    12891279 */
    12901280
    1291 krb5_error_code KRB5_LIB_FUNCTION
     1281KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    12921282krb5_free_addresses(krb5_context context,
    12931283                    krb5_addresses *addresses)
    … …  
    13151305 */
    13161306
    1317 krb5_error_code KRB5_LIB_FUNCTION
     1307KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    13181308krb5_copy_address(krb5_context context,
    13191309                  const krb5_address *inaddr,
    … …  
    13391329 */
    13401330
    1341 krb5_error_code KRB5_LIB_FUNCTION
     1331KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    13421332krb5_copy_addresses(krb5_context context,
    13431333                    const krb5_addresses *inaddr,
    … …  
    13661356 */
    13671357
    1368 krb5_error_code KRB5_LIB_FUNCTION
     1358KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    13691359krb5_append_addresses(krb5_context context,
    13701360                      krb5_addresses *dest,
    … …  
    14101400 */
    14111401
    1412 krb5_error_code KRB5_LIB_FUNCTION
     1402KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    14131403krb5_make_addrport (krb5_context context,
    14141404                    krb5_address **res, const krb5_address *addr, int16_t port)
    … …  
    14771467 */
    14781468
    1479 krb5_error_code KRB5_LIB_FUNCTION
     1469KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
    14801470krb5_address_prefixlen_boundary(krb5_context context,
    14811471                                const krb5_address *inaddr,
Note: See TracChangeset for help on using the changeset viewer.