Revert the merge of 3.3.0~pre2 in upstream branch

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 0 insertions, 315 deletions

diff --git a/source/lib/netapi/libnetapi.h b/source/lib/netapi/libnetapi.h
index 1b84b75f94..7aff355652 100644
--- a/source/lib/netapi/libnetapi.h
+++ b/source/lib/netapi/libnetapi.h
@@ -35,15 +35,6 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 			   struct NetGetJoinableOUs *r);
 WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
 			   struct NetGetJoinableOUs *r);
-NET_API_STATUS NetRenameMachineInDomain(const char * server_name /* [in] */,
-					const char * new_machine_name /* [in] */,
-					const char * account /* [in] */,
-					const char * password /* [in] */,
-					uint32_t rename_options /* [in] */);
-WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
-				  struct NetRenameMachineInDomain *r);
-WERROR NetRenameMachineInDomain_l(struct libnetapi_ctx *ctx,
-				  struct NetRenameMachineInDomain *r);
 NET_API_STATUS NetServerGetInfo(const char * server_name /* [in] [unique] */,
 				uint32_t level /* [in] */,
 				uint8_t **buffer /* [out] [ref] */);
@@ -109,78 +100,6 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 		     struct NetUserEnum *r);
 WERROR NetUserEnum_l(struct libnetapi_ctx *ctx,
 		     struct NetUserEnum *r);
-NET_API_STATUS NetUserChangePassword(const char * domain_name /* [in] */,
-				     const char * user_name /* [in] */,
-				     const char * old_password /* [in] */,
-				     const char * new_password /* [in] */);
-WERROR NetUserChangePassword_r(struct libnetapi_ctx *ctx,
-			       struct NetUserChangePassword *r);
-WERROR NetUserChangePassword_l(struct libnetapi_ctx *ctx,
-			       struct NetUserChangePassword *r);
-NET_API_STATUS NetUserGetInfo(const char * server_name /* [in] */,
-			      const char * user_name /* [in] */,
-			      uint32_t level /* [in] */,
-			      uint8_t **buffer /* [out] [ref] */);
-WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
-			struct NetUserGetInfo *r);
-WERROR NetUserGetInfo_l(struct libnetapi_ctx *ctx,
-			struct NetUserGetInfo *r);
-NET_API_STATUS NetUserSetInfo(const char * server_name /* [in] */,
-			      const char * user_name /* [in] */,
-			      uint32_t level /* [in] */,
-			      uint8_t *buffer /* [in] [ref] */,
-			      uint32_t *parm_err /* [out] [ref] */);
-WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
-			struct NetUserSetInfo *r);
-WERROR NetUserSetInfo_l(struct libnetapi_ctx *ctx,
-			struct NetUserSetInfo *r);
-NET_API_STATUS NetUserGetGroups(const char * server_name /* [in] */,
-				const char * user_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t **buffer /* [out] [ref] */,
-				uint32_t prefmaxlen /* [in] */,
-				uint32_t *entries_read /* [out] [ref] */,
-				uint32_t *total_entries /* [out] [ref] */);
-WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
-			  struct NetUserGetGroups *r);
-WERROR NetUserGetGroups_l(struct libnetapi_ctx *ctx,
-			  struct NetUserGetGroups *r);
-NET_API_STATUS NetUserSetGroups(const char * server_name /* [in] */,
-				const char * user_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t *buffer /* [in] [ref] */,
-				uint32_t num_entries /* [in] */);
-WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
-			  struct NetUserSetGroups *r);
-WERROR NetUserSetGroups_l(struct libnetapi_ctx *ctx,
-			  struct NetUserSetGroups *r);
-NET_API_STATUS NetUserGetLocalGroups(const char * server_name /* [in] */,
-				     const char * user_name /* [in] */,
-				     uint32_t level /* [in] */,
-				     uint32_t flags /* [in] */,
-				     uint8_t **buffer /* [out] [ref] */,
-				     uint32_t prefmaxlen /* [in] */,
-				     uint32_t *entries_read /* [out] [ref] */,
-				     uint32_t *total_entries /* [out] [ref] */);
-WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
-			       struct NetUserGetLocalGroups *r);
-WERROR NetUserGetLocalGroups_l(struct libnetapi_ctx *ctx,
-			       struct NetUserGetLocalGroups *r);
-NET_API_STATUS NetUserModalsGet(const char * server_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t **buffer /* [out] [ref] */);
-WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
-			  struct NetUserModalsGet *r);
-WERROR NetUserModalsGet_l(struct libnetapi_ctx *ctx,
-			  struct NetUserModalsGet *r);
-NET_API_STATUS NetUserModalsSet(const char * server_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t *buffer /* [in] [ref] */,
-				uint32_t *parm_err /* [out] [ref] */);
-WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
-			  struct NetUserModalsSet *r);
-WERROR NetUserModalsSet_l(struct libnetapi_ctx *ctx,
-			  struct NetUserModalsSet *r);
 NET_API_STATUS NetQueryDisplayInformation(const char * server_name /* [in] [unique] */,
 					  uint32_t level /* [in] */,
 					  uint32_t idx /* [in] */,
@@ -192,238 +111,4 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 				    struct NetQueryDisplayInformation *r);
 WERROR NetQueryDisplayInformation_l(struct libnetapi_ctx *ctx,
 				    struct NetQueryDisplayInformation *r);
-NET_API_STATUS NetGroupAdd(const char * server_name /* [in] */,
-			   uint32_t level /* [in] */,
-			   uint8_t *buffer /* [in] [ref] */,
-			   uint32_t *parm_err /* [out] [ref] */);
-WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
-		     struct NetGroupAdd *r);
-WERROR NetGroupAdd_l(struct libnetapi_ctx *ctx,
-		     struct NetGroupAdd *r);
-NET_API_STATUS NetGroupDel(const char * server_name /* [in] */,
-			   const char * group_name /* [in] */);
-WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
-		     struct NetGroupDel *r);
-WERROR NetGroupDel_l(struct libnetapi_ctx *ctx,
-		     struct NetGroupDel *r);
-NET_API_STATUS NetGroupEnum(const char * server_name /* [in] */,
-			    uint32_t level /* [in] */,
-			    uint8_t **buffer /* [out] [ref] */,
-			    uint32_t prefmaxlen /* [in] */,
-			    uint32_t *entries_read /* [out] [ref] */,
-			    uint32_t *total_entries /* [out] [ref] */,
-			    uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
-		      struct NetGroupEnum *r);
-WERROR NetGroupEnum_l(struct libnetapi_ctx *ctx,
-		      struct NetGroupEnum *r);
-NET_API_STATUS NetGroupSetInfo(const char * server_name /* [in] */,
-			       const char * group_name /* [in] */,
-			       uint32_t level /* [in] */,
-			       uint8_t *buffer /* [in] [ref] */,
-			       uint32_t *parm_err /* [out] [ref] */);
-WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
-			 struct NetGroupSetInfo *r);
-WERROR NetGroupSetInfo_l(struct libnetapi_ctx *ctx,
-			 struct NetGroupSetInfo *r);
-NET_API_STATUS NetGroupGetInfo(const char * server_name /* [in] */,
-			       const char * group_name /* [in] */,
-			       uint32_t level /* [in] */,
-			       uint8_t **buffer /* [out] [ref] */);
-WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
-			 struct NetGroupGetInfo *r);
-WERROR NetGroupGetInfo_l(struct libnetapi_ctx *ctx,
-			 struct NetGroupGetInfo *r);
-NET_API_STATUS NetGroupAddUser(const char * server_name /* [in] */,
-			       const char * group_name /* [in] */,
-			       const char * user_name /* [in] */);
-WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
-			 struct NetGroupAddUser *r);
-WERROR NetGroupAddUser_l(struct libnetapi_ctx *ctx,
-			 struct NetGroupAddUser *r);
-NET_API_STATUS NetGroupDelUser(const char * server_name /* [in] */,
-			       const char * group_name /* [in] */,
-			       const char * user_name /* [in] */);
-WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
-			 struct NetGroupDelUser *r);
-WERROR NetGroupDelUser_l(struct libnetapi_ctx *ctx,
-			 struct NetGroupDelUser *r);
-NET_API_STATUS NetGroupGetUsers(const char * server_name /* [in] */,
-				const char * group_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t **buffer /* [out] [ref] */,
-				uint32_t prefmaxlen /* [in] */,
-				uint32_t *entries_read /* [out] [ref] */,
-				uint32_t *total_entries /* [out] [ref] */,
-				uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
-			  struct NetGroupGetUsers *r);
-WERROR NetGroupGetUsers_l(struct libnetapi_ctx *ctx,
-			  struct NetGroupGetUsers *r);
-NET_API_STATUS NetGroupSetUsers(const char * server_name /* [in] */,
-				const char * group_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t *buffer /* [in] [ref] */,
-				uint32_t num_entries /* [in] */);
-WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
-			  struct NetGroupSetUsers *r);
-WERROR NetGroupSetUsers_l(struct libnetapi_ctx *ctx,
-			  struct NetGroupSetUsers *r);
-NET_API_STATUS NetLocalGroupAdd(const char * server_name /* [in] */,
-				uint32_t level /* [in] */,
-				uint8_t *buffer /* [in] [ref] */,
-				uint32_t *parm_err /* [out] [ref] */);
-WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
-			  struct NetLocalGroupAdd *r);
-WERROR NetLocalGroupAdd_l(struct libnetapi_ctx *ctx,
-			  struct NetLocalGroupAdd *r);
-NET_API_STATUS NetLocalGroupDel(const char * server_name /* [in] */,
-				const char * group_name /* [in] */);
-WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
-			  struct NetLocalGroupDel *r);
-WERROR NetLocalGroupDel_l(struct libnetapi_ctx *ctx,
-			  struct NetLocalGroupDel *r);
-NET_API_STATUS NetLocalGroupGetInfo(const char * server_name /* [in] */,
-				    const char * group_name /* [in] */,
-				    uint32_t level /* [in] */,
-				    uint8_t **buffer /* [out] [ref] */);
-WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
-			      struct NetLocalGroupGetInfo *r);
-WERROR NetLocalGroupGetInfo_l(struct libnetapi_ctx *ctx,
-			      struct NetLocalGroupGetInfo *r);
-NET_API_STATUS NetLocalGroupSetInfo(const char * server_name /* [in] */,
-				    const char * group_name /* [in] */,
-				    uint32_t level /* [in] */,
-				    uint8_t *buffer /* [in] [ref] */,
-				    uint32_t *parm_err /* [out] [ref] */);
-WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
-			      struct NetLocalGroupSetInfo *r);
-WERROR NetLocalGroupSetInfo_l(struct libnetapi_ctx *ctx,
-			      struct NetLocalGroupSetInfo *r);
-NET_API_STATUS NetLocalGroupEnum(const char * server_name /* [in] */,
-				 uint32_t level /* [in] */,
-				 uint8_t **buffer /* [out] [ref] */,
-				 uint32_t prefmaxlen /* [in] */,
-				 uint32_t *entries_read /* [out] [ref] */,
-				 uint32_t *total_entries /* [out] [ref] */,
-				 uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
-			   struct NetLocalGroupEnum *r);
-WERROR NetLocalGroupEnum_l(struct libnetapi_ctx *ctx,
-			   struct NetLocalGroupEnum *r);
-NET_API_STATUS NetLocalGroupAddMembers(const char * server_name /* [in] */,
-				       const char * group_name /* [in] */,
-				       uint32_t level /* [in] */,
-				       uint8_t *buffer /* [in] [ref] */,
-				       uint32_t total_entries /* [in] */);
-WERROR NetLocalGroupAddMembers_r(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupAddMembers *r);
-WERROR NetLocalGroupAddMembers_l(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupAddMembers *r);
-NET_API_STATUS NetLocalGroupDelMembers(const char * server_name /* [in] */,
-				       const char * group_name /* [in] */,
-				       uint32_t level /* [in] */,
-				       uint8_t *buffer /* [in] [ref] */,
-				       uint32_t total_entries /* [in] */);
-WERROR NetLocalGroupDelMembers_r(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupDelMembers *r);
-WERROR NetLocalGroupDelMembers_l(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupDelMembers *r);
-NET_API_STATUS NetLocalGroupGetMembers(const char * server_name /* [in] */,
-				       const char * local_group_name /* [in] */,
-				       uint32_t level /* [in] */,
-				       uint8_t **buffer /* [out] [ref] */,
-				       uint32_t prefmaxlen /* [in] */,
-				       uint32_t *entries_read /* [out] [ref] */,
-				       uint32_t *total_entries /* [out] [ref] */,
-				       uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetLocalGroupGetMembers_r(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupGetMembers *r);
-WERROR NetLocalGroupGetMembers_l(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupGetMembers *r);
-NET_API_STATUS NetLocalGroupSetMembers(const char * server_name /* [in] */,
-				       const char * group_name /* [in] */,
-				       uint32_t level /* [in] */,
-				       uint8_t *buffer /* [in] [ref] */,
-				       uint32_t total_entries /* [in] */);
-WERROR NetLocalGroupSetMembers_r(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupSetMembers *r);
-WERROR NetLocalGroupSetMembers_l(struct libnetapi_ctx *ctx,
-				 struct NetLocalGroupSetMembers *r);
-NET_API_STATUS NetRemoteTOD(const char * server_name /* [in] */,
-			    uint8_t **buffer /* [out] [ref] */);
-WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
-		      struct NetRemoteTOD *r);
-WERROR NetRemoteTOD_l(struct libnetapi_ctx *ctx,
-		      struct NetRemoteTOD *r);
-NET_API_STATUS NetShareAdd(const char * server_name /* [in] */,
-			   uint32_t level /* [in] */,
-			   uint8_t *buffer /* [in] [ref] */,
-			   uint32_t *parm_err /* [out] [ref] */);
-WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
-		     struct NetShareAdd *r);
-WERROR NetShareAdd_l(struct libnetapi_ctx *ctx,
-		     struct NetShareAdd *r);
-NET_API_STATUS NetShareDel(const char * server_name /* [in] */,
-			   const char * net_name /* [in] */,
-			   uint32_t reserved /* [in] */);
-WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
-		     struct NetShareDel *r);
-WERROR NetShareDel_l(struct libnetapi_ctx *ctx,
-		     struct NetShareDel *r);
-NET_API_STATUS NetShareEnum(const char * server_name /* [in] */,
-			    uint32_t level /* [in] */,
-			    uint8_t **buffer /* [out] [ref] */,
-			    uint32_t prefmaxlen /* [in] */,
-			    uint32_t *entries_read /* [out] [ref] */,
-			    uint32_t *total_entries /* [out] [ref] */,
-			    uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
-		      struct NetShareEnum *r);
-WERROR NetShareEnum_l(struct libnetapi_ctx *ctx,
-		      struct NetShareEnum *r);
-NET_API_STATUS NetShareGetInfo(const char * server_name /* [in] */,
-			       const char * net_name /* [in] */,
-			       uint32_t level /* [in] */,
-			       uint8_t **buffer /* [out] [ref] */);
-WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
-			 struct NetShareGetInfo *r);
-WERROR NetShareGetInfo_l(struct libnetapi_ctx *ctx,
-			 struct NetShareGetInfo *r);
-NET_API_STATUS NetShareSetInfo(const char * server_name /* [in] */,
-			       const char * net_name /* [in] */,
-			       uint32_t level /* [in] */,
-			       uint8_t *buffer /* [in] [ref] */,
-			       uint32_t *parm_err /* [out] [ref] */);
-WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
-			 struct NetShareSetInfo *r);
-WERROR NetShareSetInfo_l(struct libnetapi_ctx *ctx,
-			 struct NetShareSetInfo *r);
-NET_API_STATUS NetFileClose(const char * server_name /* [in] */,
-			    uint32_t fileid /* [in] */);
-WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
-		      struct NetFileClose *r);
-WERROR NetFileClose_l(struct libnetapi_ctx *ctx,
-		      struct NetFileClose *r);
-NET_API_STATUS NetFileGetInfo(const char * server_name /* [in] */,
-			      uint32_t fileid /* [in] */,
-			      uint32_t level /* [in] */,
-			      uint8_t **buffer /* [out] [ref] */);
-WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
-			struct NetFileGetInfo *r);
-WERROR NetFileGetInfo_l(struct libnetapi_ctx *ctx,
-			struct NetFileGetInfo *r);
-NET_API_STATUS NetFileEnum(const char * server_name /* [in] */,
-			   const char * base_path /* [in] */,
-			   const char * user_name /* [in] */,
-			   uint32_t level /* [in] */,
-			   uint8_t **buffer /* [out] [ref] */,
-			   uint32_t prefmaxlen /* [in] */,
-			   uint32_t *entries_read /* [out] [ref] */,
-			   uint32_t *total_entries /* [out] [ref] */,
-			   uint32_t *resume_handle /* [in,out] [ref] */);
-WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
-		     struct NetFileEnum *r);
-WERROR NetFileEnum_l(struct libnetapi_ctx *ctx,
-		     struct NetFileEnum *r);
 #endif /* __LIBNETAPI_LIBNETAPI__ */