diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
| commit | 3318204d294f3b3ac3409f192edc3eddeada245b (patch) | |
| tree | 442f52cc0c9bae0378c228c85166bcd005e60336 /source3/include/proto.h | |
| parent | ba5d6e6d706ebf07640ee24d701255cbb4803525 (diff) | |
| parent | 3dde0cbb769b92d922be13677ad076cae9b6a693 (diff) | |
| download | samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.gz samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.bz2 samba-3318204d294f3b3ac3409f192edc3eddeada245b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/proto.h')
| -rw-r--r-- | source3/include/proto.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index ec8f413d2f..afc207b6f6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6157,19 +6157,9 @@ bool convert_port_data_1( NT_PORT_DATA_1 *port1, RPC_BUFFER *buf ) ; /* The following definitions come from rpc_parse/parse_svcctl.c */ bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth ); -bool svcctl_io_service_status_process( const char *desc, SERVICE_STATUS_PROCESS *status, RPC_BUFFER *buffer, int depth ); uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status ); bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth); bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_STATUS *r_u, prs_struct *ps, int depth); -bool svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, prs_struct *ps, int depth); -void init_service_description_buffer(SERVICE_DESCRIPTION *desc, const char *service_desc ); -bool svcctl_io_service_description( const char *desc, SERVICE_DESCRIPTION *description, RPC_BUFFER *buffer, int depth ); -uint32 svcctl_sizeof_service_description( SERVICE_DESCRIPTION *desc ); -bool svcctl_io_service_fa( const char *desc, SERVICE_FAILURE_ACTIONS *fa, RPC_BUFFER *buffer, int depth ); -uint32 svcctl_sizeof_service_fa( SERVICE_FAILURE_ACTIONS *fa); -bool svcctl_io_r_query_service_config2(const char *desc, SVCCTL_R_QUERY_SERVICE_CONFIG2 *r_u, prs_struct *ps, int depth); -bool svcctl_io_q_query_service_status_ex(const char *desc, SVCCTL_Q_QUERY_SERVICE_STATUSEX *q_u, prs_struct *ps, int depth); -bool svcctl_io_r_query_service_status_ex(const char *desc, SVCCTL_R_QUERY_SERVICE_STATUSEX *r_u, prs_struct *ps, int depth); /* The following definitions come from rpc_server/srv_eventlog.c */ @@ -6409,8 +6399,6 @@ NTSTATUS rpc_svcctl2_init(void); bool init_service_op_table( void ); WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, SVCCTL_R_ENUM_SERVICES_STATUS *r_u); -WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_STATUSEX *q_u, SVCCTL_R_QUERY_SERVICE_STATUSEX *r_u ); -WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG2 *r_u ); /* The following definitions come from rpcclient/cmd_dfs.c */ @@ -6826,12 +6814,12 @@ bool name_to_8_3(const char *in, /* The following definitions come from smbd/mangle_hash.c */ -struct mangle_fns *mangle_hash_init(void); +const struct mangle_fns *mangle_hash_init(void); /* The following definitions come from smbd/mangle_hash2.c */ -struct mangle_fns *mangle_hash2_init(void); -struct mangle_fns *posix_mangle_init(void); +const struct mangle_fns *mangle_hash2_init(void); +const struct mangle_fns *posix_mangle_init(void); /* The following definitions come from smbd/map_username.c */ |