Remove unused marshalling for NET_AUTH3.

Guenther

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 8058b71e806f39696286769b92de380477934386..958078d5ca3983b9d3dbb0fd026ef4516239d36c 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -81,27 +81,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/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 064de5e4ea8821369aa63598f022f15c531790dc..cdf51c62411d449a75928afe782eb8c460b005d4 100644 (file)
--- 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
index c8f4862fc79ddafe9ab2b7247fd2f57d67db9252..5dcaccf1c35221af57e7b3b65630ecea2fdcd9bc 100644 (file)
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -24,94 +24,3 @@
 
 #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;
-}