diff options
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/dcerpc_server.c | 4 | ||||
| -rw-r--r-- | source4/rpc_server/dcerpc_tcp.c | 6 | ||||
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 6 | ||||
| -rw-r--r-- | source4/rpc_server/remote/dcesrv_remote.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/samr/samdb.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/samr/samr_utils.c | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 350621aa6b..4191c42edc 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -131,7 +131,7 @@ static const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv /* find a call that is pending in our call list */ -static struct dcesrv_call_state *dcesrv_find_call(struct dcesrv_connection *dce_conn, uint16 call_id) +static struct dcesrv_call_state *dcesrv_find_call(struct dcesrv_connection *dce_conn, uint16_t call_id) { struct dcesrv_call_state *c; for (c=dce_conn->call_list;c;c=c->next) { @@ -554,7 +554,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call) { struct ndr_pull *pull; struct ndr_push *push; - uint16 opnum; + uint16_t opnum; void *r; NTSTATUS status; DATA_BLOB stub; diff --git a/source4/rpc_server/dcerpc_tcp.c b/source4/rpc_server/dcerpc_tcp.c index e349de6194..81f1631c19 100644 --- a/source4/rpc_server/dcerpc_tcp.c +++ b/source4/rpc_server/dcerpc_tcp.c @@ -73,7 +73,7 @@ static ssize_t dcerpc_write_fn(void *private, const void *buf, size_t count) called when a RPC socket becomes writable */ static void dcerpc_write_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { struct rpc_server_context *r = fde->private; NTSTATUS status; @@ -92,7 +92,7 @@ static void dcerpc_write_handler(struct event_context *ev, struct fd_event *fde, called when a RPC socket becomes readable */ static void dcerpc_read_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { struct rpc_server_context *r = fde->private; DATA_BLOB blob; @@ -133,7 +133,7 @@ static void dcerpc_read_handler(struct event_context *ev, struct fd_event *fde, called when a RPC socket becomes readable */ static void dcerpc_io_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { if (flags & EVENT_FD_WRITE) { dcerpc_write_handler(ev, fde, t, flags); diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index f6b758ad98..c3ec1f48a1 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -31,7 +31,7 @@ struct server_pipe_state { char *account_name; char *computer_name; /* for logging only */ uint32_t acct_flags; - uint16 sec_chan_type; + uint16_t sec_chan_type; struct creds_CredentialState *creds; }; @@ -138,7 +138,7 @@ static NTSTATUS netr_ServerAuthenticateInternals(struct server_pipe_state *pipe_ TALLOC_CTX *mem_ctx, const char *account_name, const char *computer_name, - uint16 secure_channel_type, + uint16_t secure_channel_type, uint32_t in_flags, const struct netr_Credential *client_credentials, struct netr_Credential *server_credentials, @@ -146,7 +146,7 @@ static NTSTATUS netr_ServerAuthenticateInternals(struct server_pipe_state *pipe_ { void *sam_ctx; uint8 *mach_pwd; - uint16 acct_flags; + uint16_t acct_flags; int num_records; struct ldb_message **msgs; NTSTATUS nt_status; diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c index 7856908236..37fa89f175 100644 --- a/source4/rpc_server/remote/dcesrv_remote.c +++ b/source4/rpc_server/remote/dcesrv_remote.c @@ -65,7 +65,7 @@ static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CT { struct dcesrv_remote_private *private = dce_call->conn->private; NTSTATUS status; - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; const char *name = dce_call->conn->iface->ndr->calls[opnum].name; ndr_push_flags_fn_t ndr_push_fn = dce_call->conn->iface->ndr->calls[opnum].ndr_push; ndr_pull_flags_fn_t ndr_pull_fn = dce_call->conn->iface->ndr->calls[opnum].ndr_pull; diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c index 98374c6c86..76de3e3c30 100644 --- a/source4/rpc_server/samr/samdb.c +++ b/source4/rpc_server/samr/samdb.c @@ -571,7 +571,7 @@ struct samr_LogonHours samdb_result_logon_hours(TALLOC_CTX *mem_ctx, struct ldb_ /* pull a set of account_flags from a result set. */ -uint16 samdb_result_acct_flags(struct ldb_message *msg, const char *attr) +uint16_t samdb_result_acct_flags(struct ldb_message *msg, const char *attr) { uint_t userAccountControl = ldb_msg_find_uint(msg, attr, 0); return samdb_uf2acb(userAccountControl); diff --git a/source4/rpc_server/samr/samr_utils.c b/source4/rpc_server/samr/samr_utils.c index 6b8a2ff19a..8297792cc2 100644 --- a/source4/rpc_server/samr/samr_utils.c +++ b/source4/rpc_server/samr/samr_utils.c @@ -28,7 +28,7 @@ translated the ACB_CTRL Flags to UserFlags (userAccountControl) /* mapping between ADS userAccountControl and SAMR acct_flags */ static const struct { uint32_t uf; - uint16 acb; + uint16_t acb; } acct_flags_map[] = { { UF_ACCOUNTDISABLE, ACB_DISABLED }, { UF_HOMEDIR_REQUIRED, ACB_HOMDIRREQ }, @@ -43,7 +43,7 @@ static const struct { { UF_LOCKOUT, ACB_AUTOLOCK } }; -uint32_t samdb_acb2uf(uint16 acb) +uint32_t samdb_acb2uf(uint16_t acb) { uint32_t i, ret = 0; for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) { @@ -57,10 +57,10 @@ uint32_t samdb_acb2uf(uint16 acb) /* translated the UserFlags (userAccountControl) to ACB_CTRL Flags */ -uint16 samdb_uf2acb(uint32_t uf) +uint16_t samdb_uf2acb(uint32_t uf) { uint32_t i; - uint16 ret = 0; + uint16_t ret = 0; for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) { if (acct_flags_map[i].uf & uf) { ret |= acct_flags_map[i].acb; |