[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2339-gb9cc5cf

Günther Deschner gd at samba.org
Sun Feb 17 02:03:11 GMT 2008


The branch, v3-2-test has been updated
       via  b9cc5cfaf9a87d342c23fa0f68f29050947b5102 (commit)
       via  ee22ac6bb8e8c5281fc3dd35cb724f6c7a610933 (commit)
       via  584b2453530deeaa0260d78818fbcf30cea5b702 (commit)
       via  ccf3ba0f5ce30d45a3d644552d1245391bf01754 (commit)
      from  ead1f11dd21b1df9a595295b3513c5f6088397c9 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit b9cc5cfaf9a87d342c23fa0f68f29050947b5102
Author: Günther Deschner <gd at samba.org>
Date:   Sun Feb 17 02:57:16 2008 +0100

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

commit ee22ac6bb8e8c5281fc3dd35cb724f6c7a610933
Author: Günther Deschner <gd at samba.org>
Date:   Sun Feb 17 02:56:09 2008 +0100

    Re-run make idl.
    
    Guenther

commit 584b2453530deeaa0260d78818fbcf30cea5b702
Author: Günther Deschner <gd at samba.org>
Date:   Sun Feb 17 02:55:22 2008 +0100

    Add sync netr_LogonControlCode from samba3.
    
    Guenther

commit ccf3ba0f5ce30d45a3d644552d1245391bf01754
Author: Günther Deschner <gd at samba.org>
Date:   Sun Feb 17 02:53:23 2008 +0100

    Remove unused marshalling for NET_AUTH3.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in                   |    6 +-
 source/include/rpc_netlogon.h        |   51 ---------------
 source/librpc/gen_ndr/ndr_netlogon.c |    1 +
 source/librpc/gen_ndr/netlogon.h     |    2 +
 source/librpc/idl/netlogon.idl       |    1 +
 source/rpc_client/cli_netlogon.c     |   52 ---------------
 source/rpc_parse/parse_net.c         |  117 ----------------------------------
 7 files changed, 7 insertions(+), 223 deletions(-)
 delete mode 100644 source/rpc_parse/parse_net.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index c0e4578..a28972f 100644
--- 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 8058b71..cd88ffe 100644
--- 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 */
 
@@ -81,27 +51,6 @@
 #define MSV1_0_RETURN_PROFILE_PATH		0x00000200
 #endif
 
-/* NEG_FLAGS */
-typedef struct neg_flags_info {
-	uint32 neg_flags; /* negotiated flags */
-} NEG_FLAGS;
-
-/* NET_Q_AUTH_3 */
-typedef struct net_q_auth3_info {
-	DOM_LOG_INFO clnt_id;	/* client identification info */
-	DOM_CHAL clnt_chal;		/* client-calculated credentials */
-	NEG_FLAGS clnt_flgs;	/* usually 0x6007 ffff */
-} NET_Q_AUTH_3;
-
-/* NET_R_AUTH_3 */
-typedef struct net_r_auth3_info {
-	DOM_CHAL srv_chal;	/* server-calculated credentials */
-	NEG_FLAGS srv_flgs;	/* usually 0x6007 ffff */
-	uint32 unknown;		/* 0x0000045b */
-	NTSTATUS status;	/* return code */
-} NET_R_AUTH_3;
-
-
 #define INTERACTIVE_LOGON_TYPE 1
 #define NET_LOGON_TYPE 2
 
diff --git a/source/librpc/gen_ndr/ndr_netlogon.c b/source/librpc/gen_ndr/ndr_netlogon.c
index 3968bcd..fb5c460 100644
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -5714,6 +5714,7 @@ _PUBLIC_ void ndr_print_netr_LogonControlCode(struct ndr_print *ndr, const char
 	const char *val = NULL;
 
 	switch (r) {
+		case NETLOGON_CONTROL_SYNC: val = "NETLOGON_CONTROL_SYNC"; break;
 		case NETLOGON_CONTROL_REDISCOVER: val = "NETLOGON_CONTROL_REDISCOVER"; break;
 		case NETLOGON_CONTROL_TC_QUERY: val = "NETLOGON_CONTROL_TC_QUERY"; break;
 		case NETLOGON_CONTROL_TRANSPORT_NOTIFY: val = "NETLOGON_CONTROL_TRANSPORT_NOTIFY"; break;
diff --git a/source/librpc/gen_ndr/netlogon.h b/source/librpc/gen_ndr/netlogon.h
index bff2d91..058e5e7 100644
--- a/source/librpc/gen_ndr/netlogon.h
+++ b/source/librpc/gen_ndr/netlogon.h
@@ -603,6 +603,7 @@ union netr_CONTROL_QUERY_INFORMATION {
 enum netr_LogonControlCode
 #ifndef USE_UINT_ENUMS
  {
+	NETLOGON_CONTROL_SYNC=2,
 	NETLOGON_CONTROL_REDISCOVER=5,
 	NETLOGON_CONTROL_TC_QUERY=6,
 	NETLOGON_CONTROL_TRANSPORT_NOTIFY=7,
@@ -610,6 +611,7 @@ enum netr_LogonControlCode
 }
 #else
  { __donnot_use_enum_netr_LogonControlCode=0x7FFFFFFF}
+#define NETLOGON_CONTROL_SYNC ( 2 )
 #define NETLOGON_CONTROL_REDISCOVER ( 5 )
 #define NETLOGON_CONTROL_TC_QUERY ( 6 )
 #define NETLOGON_CONTROL_TRANSPORT_NOTIFY ( 7 )
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 6095160..5979701 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -798,6 +798,7 @@ interface netlogon
 
 	/* function_code values */
 	typedef [v1_enum] enum {
+		NETLOGON_CONTROL_SYNC             = 2,
 		NETLOGON_CONTROL_REDISCOVER       = 5,
 		NETLOGON_CONTROL_TC_QUERY         = 6,
 		NETLOGON_CONTROL_TRANSPORT_NOTIFY = 7,
diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 064de5e..cdf51c6 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -112,58 +112,6 @@ password ?).\n", cli->cli->desthost ));
 /* instead of rpccli_net_auth2() we use rpccli_netr_ServerAuthenticate2() now -  gd */
 
 
-#if 0	/* not currebntly used */
-/****************************************************************************
- LSA Authenticate 3
-
- Send the client credential, receive back a server credential.
- The caller *must* ensure that the server credential returned matches the session key
- encrypt of the server challenge originally received. JRA.
-****************************************************************************/
-
-static NTSTATUS rpccli_net_auth3(struct rpc_pipe_client *cli,
-			TALLOC_CTX *mem_ctx,
-			const char *server_name,
-			const char *account_name,
-			uint16 sec_chan_type,
-			const char *computer_name,
-			uint32 *neg_flags_inout,
-			const DOM_CHAL *clnt_chal_in,
-			DOM_CHAL *srv_chal_out)
-{
-        prs_struct qbuf, rbuf;
-        NET_Q_AUTH_3 q;
-        NET_R_AUTH_3 r;
-        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-        /* create and send a MSRPC command with api NET_AUTH2 */
-
-        DEBUG(4,("cli_net_auth3: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n",
-		server_name, account_name, sec_chan_type, computer_name,
-		credstr(clnt_chal_in->data), *neg_flags_inout));
-
-        /* store the parameters */
-        init_q_auth_3(&q, server_name, account_name, sec_chan_type,
-			computer_name, clnt_chal_in, *neg_flags_inout);
-
-        /* turn parameters into data stream */
-
-	CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_AUTH3,
-		q, r,
-		qbuf, rbuf,
-		net_io_q_auth_3,
-		net_io_r_auth_3,
-		NT_STATUS_UNSUCCESSFUL);
-
-        if (NT_STATUS_IS_OK(result)) {
-		*srv_chal_out = r.srv_chal;
-		*neg_flags_inout = r.srv_flgs.neg_flags;
-        }
-
-        return result;
-}
-#endif 	/* not currebntly used */
-
 /****************************************************************************
  Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
  credentials chain. Stores the credentials in the struct dcinfo in the
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
deleted file mode 100644
index c8f4862..0000000
--- a/source/rpc_parse/parse_net.c
+++ /dev/null
@@ -1,117 +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
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-static bool net_io_neg_flags(const char *desc, NEG_FLAGS *neg, prs_struct *ps, int depth)
-{
-	if (neg == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_neg_flags");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-	
-	if(!prs_uint32("neg_flags", ps, depth, &neg->neg_flags))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Inits a NET_Q_AUTH_3 struct.
-********************************************************************/
-
-void init_q_auth_3(NET_Q_AUTH_3 *q_a,
-		const char *logon_srv, const char *acct_name, uint16 sec_chan, const char *comp_name,
-		const DOM_CHAL *clnt_chal, uint32 clnt_flgs)
-{
-	DEBUG(5,("init_q_auth_3: %d\n", __LINE__));
-
-	init_log_info(&q_a->clnt_id, logon_srv, acct_name, sec_chan, comp_name);
-	memcpy(q_a->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
-	q_a->clnt_flgs.neg_flags = clnt_flgs;
-
-	DEBUG(5,("init_q_auth_3: %d\n", __LINE__));
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool net_io_q_auth_3(const char *desc, NET_Q_AUTH_3 *q_a, prs_struct *ps, int depth)
-{
-	if (q_a == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_q_auth_3");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-    
-	if(!smb_io_log_info ("", &q_a->clnt_id, ps, depth)) /* client identification info */
-		return False;
-	if(!smb_io_chal("", &q_a->clnt_chal, ps, depth))
-		return False;
-	if(!net_io_neg_flags("", &q_a->clnt_flgs, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool net_io_r_auth_3(const char *desc, NET_R_AUTH_3 *r_a, prs_struct *ps, int depth)
-{
-	if (r_a == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_r_auth_3");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-    
-	if(!smb_io_chal("srv_chal", &r_a->srv_chal, ps, depth)) /* server challenge */
-		return False;
-	if(!net_io_neg_flags("srv_flgs", &r_a->srv_flgs, ps, depth))
-		return False;
-	if (!prs_uint32("unknown", ps, depth, &r_a->unknown))
-		return False;
-
-	if(!prs_ntstatus("status", ps, depth, &r_a->status))
-		return False;
-
-	return True;
-}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list