package/libtirpc/patches/patch-src_rpc_soc_c

   1 --- libtirpc-1.0.1.orig/src/rpc_soc.c   2015-10-30 16:15:14.000000000 +0100
   2 +++ libtirpc-1.0.1/src/rpc_soc.c        2015-11-29 16:39:17.831379460 +0100
   3 @@ -61,7 +61,6 @@
   4  #include <string.h>
   5  #include <unistd.h>
   6  #include <fcntl.h>
   7 -#include <rpcsvc/nis.h>
   8
   9  #include "rpc_com.h"
  10
  11 @@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs,
  12  }
  13
  14  /*
  15 - * Create the client des authentication object. Obsoleted by
  16 - * authdes_seccreate().
  17 - */
  18 -AUTH *
  19 -authdes_create(servername, window, syncaddr, ckey)
  20 -       char *servername;               /* network name of server */
  21 -       u_int window;                   /* time to live */
  22 -       struct sockaddr *syncaddr;      /* optional hostaddr to sync with */
  23 -       des_block *ckey;                /* optional conversation key to use */
  24 -{
  25 -       AUTH *nauth;
  26 -       char hostname[NI_MAXHOST];
  27 -
  28 -       if (syncaddr) {
  29 -               /*
  30 -                * Change addr to hostname, because that is the way
  31 -                * new interface takes it.
  32 -                */
  33 -               switch (syncaddr->sa_family) {
  34 -               case AF_INET:
  35 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
  36 -                                 sizeof hostname, NULL, 0, 0) != 0)
  37 -                   goto fallback;
  38 -                 break;
  39 -               case AF_INET6:
  40 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname,
  41 -                                 sizeof hostname, NULL, 0, 0) != 0)
  42 -                   goto fallback;
  43 -                 break;
  44 -               default:
  45 -                 goto fallback;
  46 -               }
  47 -               nauth = authdes_seccreate(servername, window, hostname, ckey);
  48 -               return (nauth);
  49 -       }
  50 -fallback:
  51 -       return authdes_seccreate(servername, window, NULL, ckey);
  52 -}
  53 -
  54 -/*
  55 - * Create the client des authentication object. Obsoleted by
  56 - * authdes_pk_seccreate().
  57 - */
  58 -extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
  59 -        const des_block *, nis_server *);
  60 -
  61 -AUTH *
  62 -authdes_pk_create(servername, pkey, window, syncaddr, ckey)
  63 -       char *servername;               /* network name of server */
  64 -       netobj *pkey;                   /* public key */
  65 -       u_int window;                   /* time to live */
  66 -       struct sockaddr *syncaddr;      /* optional hostaddr to sync with */
  67 -       des_block *ckey;                /* optional conversation key to use */
  68 -{
  69 -       AUTH *nauth;
  70 -       char hostname[NI_MAXHOST];
  71 -
  72 -       if (syncaddr) {
  73 -               /*
  74 -                * Change addr to hostname, because that is the way
  75 -                * new interface takes it.
  76 -                */
  77 -               switch (syncaddr->sa_family) {
  78 -               case AF_INET:
  79 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
  80 -                                 sizeof hostname, NULL, 0, 0) != 0)
  81 -                   goto fallback;
  82 -                 break;
  83 -               default:
  84 -                 goto fallback;
  85 -               }
  86 -               nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL);
  87 -               return (nauth);
  88 -       }
  89 -fallback:
  90 -       return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL);
  91 -}
  92 -
  93 -
  94 -/*
  95   * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
  96   */
  97  CLIENT *