[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-496-gd87133d

[Günther Deschner]

The branch, v3-2-test has been updated
       via  d87133d0516294e7d5f123e3bb2e93c179c72677 (commit)
      from  c61499ce02355f5969fa0475ed6e3c278995ecdb (commit)

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


- Log -----------------------------------------------------------------
commit d87133d0516294e7d5f123e3bb2e93c179c72677
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 27 21:58:11 2008 +0100

    Remove unused marshalling for Netlogon Lockout String.
    
    Guenther

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

Summary of changes:
 source/include/includes.h     |    1 -
 source/include/rpc_netlogon.h |   45 ---------------------------------------
 source/rpc_parse/parse_misc.c |   47 -----------------------------------------
 3 files changed, 0 insertions(+), 93 deletions(-)
 delete mode 100644 source/include/rpc_netlogon.h


Changeset truncated at 500 lines:

diff --git a/source/include/includes.h b/source/include/includes.h
index 15a7484..0b3565f 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -695,7 +695,6 @@ typedef char fstring[FSTRING_LEN];
 #include "rpc_svcctl.h"
 #include "rpc_ntsvcs.h"
 #include "rpc_lsa.h"
-#include "rpc_netlogon.h"
 #include "reg_objects.h"
 #include "reg_db.h"
 #include "rpc_spoolss.h"
diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
deleted file mode 100644
index d6cdb67..0000000
--- a/source/include/rpc_netlogon.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   Copyright (C) Jean François 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/>.
-*/
-
-#ifndef _RPC_NETLOGON_H /* _RPC_NETLOGON_H */
-#define _RPC_NETLOGON_H 
-
-/* LOCKOUT_STRING */
-typedef struct account_lockout_string {
-	uint32 array_size;
-	uint32 offset;
-	uint32 length;
-/*	uint16 *bindata;	*/
-	uint64 lockout_duration;
-	uint64 reset_count;
-	uint32 bad_attempt_lockout;
-	uint32 dummy;
-} LOCKOUT_STRING;
-
-/* HDR_LOCKOUT_STRING */
-typedef struct hdr_account_lockout_string {
-	uint16 size;
-	uint16 length;
-	uint32 buffer;
-} HDR_LOCKOUT_STRING;
-
-#endif /* _RPC_NETLOGON_H */
diff --git a/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index 3850c44..cf989c8 100644
--- a/source/rpc_parse/parse_misc.c
+++ b/source/rpc_parse/parse_misc.c
@@ -1145,53 +1145,6 @@ bool init_unistr4_array( UNISTR4_ARRAY *array, uint32 count, const char **string
 	return True;
 }
 
-bool smb_io_lockout_string_hdr(const char *desc, HDR_LOCKOUT_STRING *hdr_account_lockout, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_lockout_string_hdr");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint16("size", ps, depth, &hdr_account_lockout->size))
-		return False;
-	if(!prs_uint16("length", ps, depth, &hdr_account_lockout->length))
-		return False;
-	if(!prs_uint32("buffer", ps, depth, &hdr_account_lockout->buffer))
-		return False;
-
-	return True;
-}
-
-bool smb_io_account_lockout_str(const char *desc, LOCKOUT_STRING *account_lockout, uint32 buffer, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "smb_io_account_lockout_string");
-	depth++;
-
-	if(!prs_uint32("array_size", ps, depth, &account_lockout->array_size))
-		return False;
-
-	if(!prs_uint32("offset", ps, depth, &account_lockout->offset))
-		return False;
-	if(!prs_uint32("length", ps, depth, &account_lockout->length))
-		return False;
-
-	if (!prs_uint64("lockout_duration", ps, depth, &account_lockout->lockout_duration))
-		return False;
-	if (!prs_uint64("reset_count", ps, depth, &account_lockout->reset_count))
-		return False;
-	if (!prs_uint32("bad_attempt_lockout", ps, depth, &account_lockout->bad_attempt_lockout))
-		return False;
-	if (!prs_uint32("dummy", ps, depth, &account_lockout->dummy))
-		return False;
-#if 0
-	if(!prs_uint16s (False, "bindata", ps, depth, &account_lockout->bindata, length))
-		return False;
-#endif
-
-	return True;
-}
-
 /*******************************************************************
  Inits a DOM_RID structure.
 ********************************************************************/


-- 
Samba Shared Repository