Print this page
1575 untangle libmlrpc ... pre2:
 Get rid of ndr_rpc_server_{info,os}

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/smbsrv/libmlsvc/common/libmlsvc.h
          +++ new/usr/src/lib/smbsrv/libmlsvc/common/libmlsvc.h
↓ open down ↓ 119 lines elided ↑ open up ↑
 120  120   * A local unique id (LUID) is an opaque id used by servers to identify
 121  121   * local resources, such as privileges.  A client will use lookup
 122  122   * functions to translate the LUID to a more general, machine independent
 123  123   * form; such as a string.
 124  124   */
 125  125  typedef struct ms_luid {
 126  126          uint32_t low_part;
 127  127          uint32_t high_part;
 128  128  } ms_luid_t;
 129  129  
 130      -/*
 131      - * Information about a server as reported by NetServerGetInfo.
 132      - * The SV_PLATFORM and SV_TYPE definitions are in srvsvc.ndl.
 133      - */
 134      -typedef struct srvsvc_server_info {
 135      -        uint32_t        sv_platform_id;
 136      -        char            *sv_name;
 137      -        uint32_t        sv_version_major;
 138      -        uint32_t        sv_version_minor;
 139      -        uint32_t        sv_type;
 140      -        char            *sv_comment;
 141      -        uint32_t        sv_os;
 142      -} srvsvc_server_info_t;
 143      -
 144      -int srvsvc_net_server_getinfo(char *, char *, srvsvc_server_info_t *);
 145  130  int srvsvc_net_remote_tod(char *, char *, struct timeval *, struct tm *);
 146  131  
 147  132  
 148  133  /*
 149  134   * A client_t is created while binding a client connection to hold the
 150  135   * context for calls made using that connection.
 151  136   *
 152  137   * Handles are RPC call specific and we use an inheritance mechanism to
 153  138   * ensure that each handle has a pointer to the client_t.  When the top
 154  139   * level (bind) handle is released, we close the connection.
 155  140   */
 156  141  typedef struct mlsvc_handle {
 157  142          ndr_hdid_t                      handle;
 158  143          ndr_client_t                    *clnt;
 159      -        srvsvc_server_info_t            svinfo;
 160  144  } mlsvc_handle_t;
 161  145  
 162  146  void ndr_rpc_init(void);
 163  147  void ndr_rpc_fini(void);
 164  148  uint32_t ndr_rpc_bind(mlsvc_handle_t *, char *, char *, char *, const char *);
 165  149  void ndr_rpc_unbind(mlsvc_handle_t *);
 166  150  int ndr_rpc_call(mlsvc_handle_t *, int, void *);
 167  151  void ndr_rpc_set_nonull(mlsvc_handle_t *);
 168      -const srvsvc_server_info_t *ndr_rpc_server_info(mlsvc_handle_t *);
 169      -uint32_t ndr_rpc_server_os(mlsvc_handle_t *);
 170  152  int ndr_rpc_get_ssnkey(mlsvc_handle_t *, unsigned char *, size_t);
 171  153  void *ndr_rpc_malloc(mlsvc_handle_t *, size_t);
 172  154  ndr_heap_t *ndr_rpc_get_heap(mlsvc_handle_t *);
 173  155  void ndr_rpc_release(mlsvc_handle_t *);
 174  156  boolean_t ndr_is_null_handle(mlsvc_handle_t *);
 175  157  boolean_t ndr_is_bind_handle(mlsvc_handle_t *);
 176  158  void ndr_inherit_handle(mlsvc_handle_t *, mlsvc_handle_t *);
 177  159  void ndr_rpc_status(mlsvc_handle_t *, int, uint32_t);
 178  160  
 179  161  /* SVCCTL service */
↓ open down ↓ 120 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX