Merge branch 'master' of ssh://git.samba.org/data/git/samba

5 files changed, 12 insertions, 72 deletions

diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index 25fd353632..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
@@ -119,16 +119,17 @@ 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,
-				   uint16_t num_bytes, const uint8_t *bytes);
+				   size_t bytes_alignment,
+				   uint32_t num_bytes, const uint8_t *bytes);
 
 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,
-		      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,
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 24929f6d7f..212bbf0df7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2364,8 +2364,12 @@ 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);
-bool cli_negprot(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,
@@ -6023,11 +6027,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  */
-
-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);
@@ -6554,15 +6553,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 dc74298cb9..0000000000
--- a/source3/include/rpc_ntsvcs.h
+++ /dev/null
@@ -1,50 +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 <http://www.gnu.org/licenses/>.
-*/
-
-#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
-
-
-/**************************/
-
-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 */
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};