Remove rpc_parse/parse_net.c and some last unused netlogon headers.

Guenther

diff --git a/source/Makefile.in b/source/Makefile.in
index c0e4578ef43448fc42f7334bd9681c3d0c888597..a28972f22dba786faa041f13b691a3c384698abe 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -296,8 +296,8 @@ RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 # that requires knowledge of security contexts
 RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o
 
-RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o rpc_parse/parse_srv.o
-RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o rpc_parse/parse_srv.o \
+RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_srv.o
+RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_srv.o \
                 rpc_client/init_netlogon.o \
                 rpc_client/init_lsa.o
 
@@ -1052,7 +1052,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
                libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o libads/kerberos.o \
                $(SECRETS_OBJ) $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
                $(RPC_PARSE_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-               $(SMBLDAP_OBJ) $(DOSERR_OBJ) rpc_parse/parse_net.o $(LIBNMB_OBJ) \
+               $(SMBLDAP_OBJ) $(DOSERR_OBJ) $(LIBNMB_OBJ) \
                $(LDB_OBJ) $(ERRORMAP_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
                librpc/gen_ndr/ndr_samr.o \
                librpc/gen_ndr/ndr_lsa.o \

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 958078d5ca3983b9d3dbb0fd026ef4516239d36c..cd88ffef5950702728cc9048d4aa480929cce1e5 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -23,36 +23,6 @@
 #ifndef _RPC_NETLOGON_H /* _RPC_NETLOGON_H */
 #define _RPC_NETLOGON_H 
 
-
-/* NETLOGON pipe */
-#define NET_SAMLOGON           0x02
-#define NET_SAMLOGOFF          0x03
-#define NET_REQCHAL            0x04
-#define NET_AUTH               0x05
-#define NET_SRVPWSET           0x06
-#define NET_SAM_DELTAS         0x07
-#define NET_GETDCNAME          0x0b
-#define NET_LOGON_CTRL         0x0c
-#define NET_GETANYDCNAME       0x0d
-#define NET_AUTH2              0x0f
-#define NET_LOGON_CTRL2                0x0e
-#define NET_SAM_SYNC           0x10
-#define NET_TRUST_DOM_LIST     0x13
-#define NET_DSR_GETDCNAME      0x14
-#define NET_AUTH3              0x1a
-#define NET_DSR_GETDCNAMEEX    0x1b
-#define NET_DSR_GETSITENAME    0x1c
-#define NET_DSR_GETDCNAMEEX2   0x22
-#define NET_SAMLOGON_EX                0x27
-
-/* flags use when sending a NETLOGON_CONTROL request */
-
-#define NETLOGON_CONTROL_SYNC                  0x2
-#define NETLOGON_CONTROL_REDISCOVER            0x5
-#define NETLOGON_CONTROL_TC_QUERY              0x6
-#define NETLOGON_CONTROL_TRANSPORT_NOTIFY      0x7
-#define NETLOGON_CONTROL_SET_DBFLAG            0xfffe
-
 /* Some flag values reverse engineered from NLTEST.EXE */
 /* used in the NETLOGON_CONTROL[2] reply */
 

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
deleted file mode 100644 (file)
index 5dcaccf..0000000
--- a/source/rpc_parse/parse_net.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Jean Francois Micouleau           2002.
- *
- *  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/>.
- */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE