librpc: move preg.idl to main directory.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Feb 10 13:56:49 CET 2011 on sn-devel-104

6 files changed, 3 insertions, 150 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3012caa7d3..8ad74c4506 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -336,7 +336,7 @@ LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
 			../librpc/ndr/ndr_ntprinting.o \
 
 LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
-		  librpc/ndr/ndr_preg.o
+		  ../librpc/ndr/ndr_preg.o
 
 LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
 		   ../librpc/ndr/ndr_xattr.o
@@ -1577,8 +1577,7 @@ IDL_FILES = librpc/idl/messaging.idl \
 	    librpc/idl/wbint.idl \
 	    librpc/idl/perfcount.idl \
 	    librpc/idl/secrets.idl \
-	    librpc/idl/libnet_join.idl \
-	    librpc/idl/preg.idl
+	    librpc/idl/libnet_join.idl
 
 samba3-idl::
 	@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
diff --git a/source3/librpc/idl/preg.idl b/source3/librpc/idl/preg.idl
deleted file mode 100644
index 6738f614b4..0000000000
--- a/source3/librpc/idl/preg.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "idl_types.h"
-
-import "misc.idl";
-
-/*
-   IDL structures defining PReg files
-
-   more info can be found at:
-   http://msdn2.microsoft.com/en-us/library/aa374407.aspx
-*/
-
-[
-	pointer_default(unique),
-	helper("../librpc/ndr/ndr_preg.h"),
-	helpstring("PReg structure"),
-	uuid("67655250-0000-0000-0000-00000000")
-]
-	interface preg
-{
-	typedef [public] struct {
-		[charset(DOS),value("["),noprint] uint8 _opening_bracket[2];
-		nstring keyname;
-		[charset(DOS),value(";"),noprint] uint8 _sep1[2];
-		nstring valuename;
-		[charset(DOS),value(";"),noprint] uint8 _sep2[2];
-		winreg_Type type;
-		[charset(DOS),value(";"),noprint] uint8 _sep3[2];
-		uint32 size;
-		[charset(DOS),value(";"),noprint] uint8 _sep4[2];
-		uint8 data[size];
-		[charset(DOS),value("]"),noprint] uint8 _closing_bracket[2];
-	} preg_entry;
-
-	typedef [public] struct {
-		[charset(DOS),value("PReg")] uint8 signature[4];
-		[value(1)] uint32 version;
-	} preg_header;
-
-	typedef [public,flag(NDR_NOALIGN),nopush,nopull] struct {
-		preg_header header;
-		uint32 num_entries;
-		preg_entry entries[num_entries];
-	} preg_file;
-
-	void decode_preg_file(
-		[in] preg_file file
-		);
-
-}
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 995761442c..a337f4f39a 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_PIDL_LIST('PIDL',
                     '''messaging.idl libnetapi.idl notify.idl
-                       perfcount.idl secrets.idl libnet_join.idl preg.idl''',
+                       perfcount.idl secrets.idl libnet_join.idl''',
                     options='--includedir=../librpc/idl --header --ndr-parser',
                     output_dir='../gen_ndr')
 
diff --git a/source3/librpc/ndr/ndr_preg.c b/source3/librpc/ndr/ndr_preg.c
deleted file mode 100644
index 2c684e2589..0000000000
--- a/source3/librpc/ndr/ndr_preg.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   routines for marshalling/unmarshalling preg structures
-
-   Copyright (C) Guenther Deschner 2010
-
-   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"
-#include "librpc/gen_ndr/ndr_preg.h"
-
-_PUBLIC_ enum ndr_err_code ndr_push_preg_file(struct ndr_push *ndr, int ndr_flags, const struct preg_file *r)
-{
-	uint32_t cntr_entries_0;
-	{
-		uint32_t _flags_save_STRUCT = ndr->flags;
-		ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
-		if (ndr_flags & NDR_SCALARS) {
-			NDR_CHECK(ndr_push_align(ndr, 4));
-			NDR_CHECK(ndr_push_preg_header(ndr, NDR_SCALARS, &r->header));
-			for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
-				NDR_CHECK(ndr_push_preg_entry(ndr, NDR_SCALARS, &r->entries[cntr_entries_0]));
-			}
-			NDR_CHECK(ndr_push_trailer_align(ndr, 4));
-		}
-		if (ndr_flags & NDR_BUFFERS) {
-		}
-		ndr->flags = _flags_save_STRUCT;
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_preg_file(struct ndr_pull *ndr, int ndr_flags, struct preg_file *r)
-{
-	{
-		uint32_t _flags_save_STRUCT = ndr->flags;
-		ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
-		if (ndr_flags & NDR_SCALARS) {
-			NDR_CHECK(ndr_pull_align(ndr, 4));
-			NDR_CHECK(ndr_pull_preg_header(ndr, NDR_SCALARS, &r->header));
-			r->num_entries = 0;
-			NDR_PULL_ALLOC_N(ndr, r->entries, r->num_entries);
-			while (ndr->offset + 12 <= ndr->data_size) {
-				r->entries = talloc_realloc(ndr, r->entries, struct preg_entry, r->num_entries + 1);
-				NDR_ERR_HAVE_NO_MEMORY(r->entries);
-				NDR_CHECK(ndr_pull_preg_entry(ndr, NDR_SCALARS, &r->entries[r->num_entries]));
-				r->num_entries++;
-			}
-			NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
-		}
-		if (ndr_flags & NDR_BUFFERS) {
-		}
-		ndr->flags = _flags_save_STRUCT;
-	}
-	return NDR_ERR_SUCCESS;
-}
diff --git a/source3/librpc/ndr/ndr_preg.h b/source3/librpc/ndr/ndr_preg.h
deleted file mode 100644
index d781e138be..0000000000
--- a/source3/librpc/ndr/ndr_preg.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   routines for marshalling/unmarshalling preg structures
-
-   Copyright (C) Guenther Deschner 2010
-
-   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/>.
-*/
-
-_PUBLIC_ enum ndr_err_code ndr_push_preg_file(struct ndr_push *ndr, int ndr_flags, const struct preg_file *r);
-_PUBLIC_ enum ndr_err_code ndr_pull_preg_file(struct ndr_pull *ndr, int ndr_flags, struct preg_file *r);
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index adf7f70c49..ae43531f39 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -20,11 +20,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
 	public_deps='ndr NDR_FILE_ID'
 	)
 
-bld.SAMBA_SUBSYSTEM('NDR_PREG',
-	source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
-	public_deps='ndr'
-	)
-
 bld.SAMBA_SUBSYSTEM('NDR_SECRETS',
 	source='gen_ndr/ndr_secrets.c',
 	public_deps='ndr'