From b6e7caebe4e7b95977540ea068fb37b4c0cdf97b Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 17 Dec 2008 16:26:43 +0100 Subject: s3/smb.h: Remove unused LDAP_SSL_ON. LDAP_SSL_ON is not defined at all. Ldaps can be used by specifying an ldaps URL using the "passdb backend" parameter. Karolin --- source3/include/smb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/smb.h b/source3/include/smb.h index 891bd4aaf7..a8a2d98154 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1514,7 +1514,7 @@ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, enum schema_types {SCHEMA_COMPAT, SCHEMA_AD, SCHEMA_SAMBA}; /* LDAP SSL options */ -enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF, LDAP_SSL_START_TLS}; +enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS}; /* LDAP PASSWD SYNC methods */ enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PASSWD_SYNC_ONLY}; -- cgit From 934b90c17c37e7cab6d088d5c5be50b08cfce1fb Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 19 Nov 2008 14:35:09 +0100 Subject: s3-ntsvcs: remove old _PNP_GetDeviceList. Guenther --- source3/include/proto.h | 3 --- source3/include/rpc_ntsvcs.h | 14 -------------- 2 files changed, 17 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 24929f6d7f..9c3aba29af 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6025,9 +6025,6 @@ bool policy_handle_is_valid(const POLICY_HND *hnd); /* The following definitions come from rpc_parse/parse_ntsvcs.c */ -bool ntsvcs_io_q_get_device_list(const char *desc, NTSVCS_Q_GET_DEVICE_LIST *q_u, prs_struct *ps, int depth); -bool ntsvcs_io_r_get_device_list(const char *desc, NTSVCS_R_GET_DEVICE_LIST *r_u, prs_struct *ps, int depth); - /* The following definitions come from rpc_parse/parse_prs.c */ void prs_dump(const char *name, int v, prs_struct *ps); diff --git a/source3/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h index dc74298cb9..14e11cf6a1 100644 --- a/source3/include/rpc_ntsvcs.h +++ b/source3/include/rpc_ntsvcs.h @@ -33,18 +33,4 @@ #define NTSVCS_GET_VERSION_INTERNAL 0x3e -/**************************/ - -typedef struct { - UNISTR2 *devicename; - uint32 buffer_size; - uint32 flags; -} NTSVCS_Q_GET_DEVICE_LIST; - -typedef struct { - UNISTR2 devicepath; - uint32 needed; - WERROR status; -} NTSVCS_R_GET_DEVICE_LIST; - #endif /* _RPC_NTSVCS_H */ -- cgit From 43d0a4813bf919e7fe6ab82f6920015d1a57f7bc Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 19 Nov 2008 14:37:47 +0100 Subject: s3-ntsvcs: remove last traces of hand-marshalled NTSVCS. Guenther --- source3/include/includes.h | 1 - source3/include/proto.h | 11 ----------- source3/include/rpc_ntsvcs.h | 36 ------------------------------------ 3 files changed, 48 deletions(-) delete mode 100644 source3/include/rpc_ntsvcs.h (limited to 'source3/include') diff --git a/source3/include/includes.h b/source3/include/includes.h index 38d6ec06b9..4e41fa3c05 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -620,7 +620,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "auth.h" #include "ntdomain.h" #include "rpc_svcctl.h" -#include "rpc_ntsvcs.h" #include "rpc_lsa.h" #include "reg_objects.h" #include "reg_db.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index 9c3aba29af..5e2b823d64 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6023,8 +6023,6 @@ bool make_bufhdr2(BUFHDR2 *hdr, uint32 info_level, uint32 length, uint32 buffer) uint32 str_len_uni(UNISTR *source); bool policy_handle_is_valid(const POLICY_HND *hnd); -/* The following definitions come from rpc_parse/parse_ntsvcs.c */ - /* The following definitions come from rpc_parse/parse_prs.c */ void prs_dump(const char *name, int v, prs_struct *ps); @@ -6551,15 +6549,6 @@ bool close_policy_hnd(pipes_struct *p, POLICY_HND *hnd); void close_policy_by_pipe(pipes_struct *p); bool pipe_access_check(pipes_struct *p); -/* The following definitions come from rpc_server/srv_ntsvcs.c */ - -void ntsvcs2_get_pipe_fns( struct api_struct **fns, int *n_fns ); -NTSTATUS rpc_ntsvcs2_init(void); - -/* The following definitions come from rpc_server/srv_ntsvcs_nt.c */ - -WERROR _ntsvcs_get_device_list( pipes_struct *p, NTSVCS_Q_GET_DEVICE_LIST *q_u, NTSVCS_R_GET_DEVICE_LIST *r_u ); - /* The following definitions come from rpc_server/srv_pipe.c */ bool create_next_pdu(pipes_struct *p); diff --git a/source3/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h deleted file mode 100644 index 14e11cf6a1..0000000000 --- a/source3/include/rpc_ntsvcs.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB parameters and setup - Copyright (C) Gerald (Jerry) Carter 2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _RPC_NTSVCS_H /* _RPC_NTSVCS_H */ -#define _RPC_NTSVCS_H - -/* ntsvcs pipe */ - -#define NTSVCS_GET_VERSION 0x02 -#define NTSVCS_VALIDATE_DEVICE_INSTANCE 0x06 -#define NTSVCS_GET_ROOT_DEVICE_INSTANCE 0x07 -#define NTSVCS_GET_DEVICE_LIST 0x0a -#define NTSVCS_GET_DEVICE_LIST_SIZE 0x0b -#define NTSVCS_GET_DEVICE_REG_PROPERTY 0x0d -#define NTSVCS_HW_PROFILE_FLAGS 0x28 -#define NTSVCS_GET_HW_PROFILE_INFO 0x29 -#define NTSVCS_GET_VERSION_INTERNAL 0x3e - - -#endif /* _RPC_NTSVCS_H */ -- cgit From 96a3d7be3151c93db9857bb065721c0c7961b2e8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 11 Sep 2008 07:31:34 +0200 Subject: cli_negprot_send -> cli_negprot_sendsync --- source3/include/proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 5e2b823d64..536855c66e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2364,7 +2364,7 @@ bool cli_ulogoff(struct cli_state *cli); bool cli_send_tconX(struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen); bool cli_tdis(struct cli_state *cli); -void cli_negprot_send(struct cli_state *cli); +void cli_negprot_sendsync(struct cli_state *cli); bool cli_negprot(struct cli_state *cli); bool cli_session_request(struct cli_state *cli, struct nmb_name *calling, struct nmb_name *called); -- cgit From bb8ca0fdbf0fe68ad2cd47d6f8d68743bfbacdec Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 11 Sep 2008 18:57:49 +0200 Subject: Make cli_negprot return NTSTATUS instead of bool --- source3/include/proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 536855c66e..8ec15da5d8 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2365,7 +2365,7 @@ bool cli_send_tconX(struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen); bool cli_tdis(struct cli_state *cli); void cli_negprot_sendsync(struct cli_state *cli); -bool cli_negprot(struct cli_state *cli); +NTSTATUS cli_negprot(struct cli_state *cli); bool cli_session_request(struct cli_state *cli, struct nmb_name *calling, struct nmb_name *called); NTSTATUS cli_connect(struct cli_state *cli, -- cgit From f87da49830960aebe4ffa551e7e1f16330d28cca Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 10:50:52 +0100 Subject: Make cli_negprot async --- source3/include/proto.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 8ec15da5d8..212bbf0df7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2366,6 +2366,10 @@ bool cli_send_tconX(struct cli_state *cli, bool cli_tdis(struct cli_state *cli); void cli_negprot_sendsync(struct cli_state *cli); NTSTATUS cli_negprot(struct cli_state *cli); +struct async_req *cli_negprot_send(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct cli_state *cli); +NTSTATUS cli_negprot_recv(struct async_req *req); bool cli_session_request(struct cli_state *cli, struct nmb_name *calling, struct nmb_name *called); NTSTATUS cli_connect(struct cli_state *cli, -- cgit From 4abdd3981e9688aaaf19173182ace7b1fdf93f6d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 14:27:20 +0100 Subject: Pass "bytes_alignment" up through cli_request_send This parameter makes smb_spice_chain add padding before the bytes field --- source3/include/async_smb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index 25fd353632..fd0b0d2c53 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -119,6 +119,7 @@ struct async_req *cli_request_send(TALLOC_CTX *mem_ctx, uint8_t smb_command, uint8_t additional_flags, uint8_t wct, const uint16_t *vwv, + size_t bytes_alignment, uint16_t num_bytes, const uint8_t *bytes); bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, -- cgit From 398ef0fb855b3b2d6e55ae26304589fd89110628 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 16:11:14 +0100 Subject: For large smbwrite&x, we need more than 64k bcc --- source3/include/async_smb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index fd0b0d2c53..f8f94aa4c9 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -120,7 +120,7 @@ struct async_req *cli_request_send(TALLOC_CTX *mem_ctx, uint8_t additional_flags, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, - uint16_t num_bytes, const uint8_t *bytes); + uint32_t num_bytes, const uint8_t *bytes); bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, size_t size_hint); @@ -129,7 +129,7 @@ bool cli_in_chain(struct cli_state *cli); bool smb_splice_chain(char **poutbuf, uint8_t smb_command, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, - uint16_t num_bytes, const uint8_t *bytes); + uint32_t num_bytes, const uint8_t *bytes); NTSTATUS cli_pull_reply(struct async_req *req, uint8_t *pwct, uint16_t **pvwv, -- cgit From 1f04d07db0d53630d400ed35cecf7c66d3bb491c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 17:44:32 +0100 Subject: Convert cli_request->outbuf to uint8_t --- source3/include/async_smb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index f8f94aa4c9..ef53ee2163 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -66,7 +66,7 @@ struct cli_request { /** * The bytes we have to ship to the server */ - char *outbuf; + uint8_t *outbuf; /** * How much from "outbuf" did we already send @@ -126,7 +126,7 @@ bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, size_t size_hint); void cli_chain_uncork(struct cli_state *cli); bool cli_in_chain(struct cli_state *cli); -bool smb_splice_chain(char **poutbuf, uint8_t smb_command, +bool smb_splice_chain(uint8_t **poutbuf, uint8_t smb_command, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, uint32_t num_bytes, const uint8_t *bytes); -- cgit