diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-22 13:41:09 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-22 17:06:08 +0200 |
| commit | f0c1b5dad20392cdd051fefbb64a32c1fcb3bfc8 (patch) | |
| tree | 236f8fb9347894f731122d8542aab44a4d5ca274 /source3/utils | |
| parent | e91797689b99e255ffdf02b765f349861c97e445 (diff) | |
| download | samba-f0c1b5dad20392cdd051fefbb64a32c1fcb3bfc8.tar.gz samba-f0c1b5dad20392cdd051fefbb64a32c1fcb3bfc8.tar.bz2 samba-f0c1b5dad20392cdd051fefbb64a32c1fcb3bfc8.zip | |
s3:net_rpc_join: pass const sockaddr_storage to net_rpc_join_ok()
metze
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_proto.h | 3 | ||||
| -rw-r--r-- | source3/utils/net_rpc_join.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index 1e89507fa8..d1393f1818 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -202,7 +202,8 @@ int net_rpc_audit(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_rpc_join.c */ NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain, - const char *server, struct sockaddr_storage *pss); + const char *server, + const struct sockaddr_storage *server_ss); int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv); int net_rpc_testjoin(struct net_context *c, int argc, const char **argv); diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index d228f92804..f84ab1caab 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -77,7 +77,8 @@ * **/ NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain, - const char *server, struct sockaddr_storage *pss) + const char *server, + const struct sockaddr_storage *server_ss) { enum security_types sec; unsigned int conn_flags = NET_FLAGS_PDC; @@ -101,8 +102,8 @@ NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain, } /* Connect to remote machine */ - ntret = net_make_ipc_connection_ex(c, domain, server, pss, conn_flags, - &cli); + ntret = net_make_ipc_connection_ex(c, domain, server, server_ss, + conn_flags, &cli); if (!NT_STATUS_IS_OK(ntret)) { return ntret; } |