Author: jelmer Date: 2007-08-04 13:13:20 +0000 (Sat, 04 Aug 2007) New Revision: 24177
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24177 Log: Fix the build. Added: branches/4.0-regwrite/source/lib/policy/adm.h Modified: branches/4.0-regwrite/ branches/4.0-regwrite/source/lib/policy/config.mk branches/4.0-regwrite/source/lib/policy/lex.l branches/4.0-regwrite/source/lib/policy/parse_adm.y branches/4.0-regwrite/source/lib/registry/patchfile.c branches/4.0-regwrite/source/lib/registry/patchfile_preg.c Changeset: Property changes on: branches/4.0-regwrite ___________________________________________________________________ Name: bzr:revision-info - timestamp: Sun 2007-01-14 07:15:26.973000050 +0100 committer: Wilco Baan Hofman <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] + timestamp: Sun 2007-01-14 14:36:02.812000036 +0100 committer: Wilco Baan Hofman <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] Name: bzr:file-ids - + source/lib/policy/adm.h adm.h-20070114133121-z0u1of9z8skvbesc-1 Name: bzr:revision-id:v3-trunk0 - 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] + 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] 11150 [EMAIL PROTECTED] Added: branches/4.0-regwrite/source/lib/policy/adm.h =================================================================== --- branches/4.0-regwrite/source/lib/policy/adm.h 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/policy/adm.h 2007-08-04 13:13:20 UTC (rev 24177) @@ -0,0 +1,48 @@ +/* + Unix SMB/CIFS implementation. + Copyright (C) 2006 Wilco Baan Hofman <[EMAIL PROTECTED]> + Copyright (C) 2006 Jelmer Vernooij <[EMAIL PROTECTED]> + + 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 2 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, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef __ADM_H__ +#define __ADM_H__ + +struct adm_file { + struct adm_class *classes; +}; + +struct adm_class { + struct adm_category *categories; +}; + +struct adm_category { + struct adm_category *subcategories; + struct adm_policy *policies; +}; + +struct adm_policy { + struct adm_part *parts; + +}; + +struct adm_part { + +}; + +struct adm_file *adm_read_file(const char *); + +#endif /* __ADM_H__ */ Modified: branches/4.0-regwrite/source/lib/policy/config.mk =================================================================== --- branches/4.0-regwrite/source/lib/policy/config.mk 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/policy/config.mk 2007-08-04 13:13:20 UTC (rev 24177) @@ -1,12 +1,12 @@ [LIBRARY::LIBPOLICY] CFLAGS = -Iheimdal/lib/roken OBJ_FILES = lex.o parse_adm.o -PRIVATE_DEPENDENCIES = CHARSET +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET -lib/policy/lex.c: lib/policy/lex.l - @echo "Building $< with $(LEX)" - @-$(srcdir)/script/lex_compile.sh "$(LEX)" "$<" "$@" -i +lib/policy/lex.l: lib/policy/parse_adm.h +lib/policy/parse_adm.h: lib/policy/parse_adm.c + [BINARY::dumpadm] OBJ_FILES = dumpadm.o -PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL +PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET Modified: branches/4.0-regwrite/source/lib/policy/lex.l =================================================================== --- branches/4.0-regwrite/source/lib/policy/lex.l 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/policy/lex.l 2007-08-04 13:13:20 UTC (rev 24177) @@ -22,7 +22,6 @@ %{ #include "includes.h" #include "lib/policy/parse_adm.h" -#include "lex.h" void error_message (const char *format, ...); int yyparse (void); Modified: branches/4.0-regwrite/source/lib/policy/parse_adm.y =================================================================== --- branches/4.0-regwrite/source/lib/policy/parse_adm.y 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/policy/parse_adm.y 2007-08-04 13:13:20 UTC (rev 24177) @@ -23,7 +23,6 @@ %{ #include "config.h" -#include "lex.h" void yyerror (const char *s); Modified: branches/4.0-regwrite/source/lib/registry/patchfile.c =================================================================== --- branches/4.0-regwrite/source/lib/registry/patchfile.c 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/registry/patchfile.c 2007-08-04 13:13:20 UTC (rev 24177) @@ -323,11 +323,11 @@ return WERR_OK; } -static WERROR reg_diff_apply_del_all_values(void *_ctx, const char *key_name, const char *value_name) +static WERROR reg_diff_apply_del_all_values(void *_ctx, const char *key_name) { struct registry_context *ctx = _ctx; struct registry_key *tmp; - struct registry_value val; + struct registry_value *val; WERROR error; int i; @@ -339,7 +339,7 @@ } i = 0; while (W_ERROR_IS_OK(error = reg_key_get_value_by_index(ctx, tmp, i, &val))) { - reg_del_value(tmp, val.name); + reg_del_value(tmp, val->name); i++; } if (!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) { Modified: branches/4.0-regwrite/source/lib/registry/patchfile_preg.c =================================================================== --- branches/4.0-regwrite/source/lib/registry/patchfile_preg.c 2007-08-04 13:13:14 UTC (rev 24176) +++ branches/4.0-regwrite/source/lib/registry/patchfile_preg.c 2007-08-04 13:13:20 UTC (rev 24177) @@ -52,7 +52,7 @@ return WERR_OK; } -static WERROR reg_preg_diff_set_value(void *_data, const char *key_name, const char *value_name, uint32_t value_type, DATA_BLOB data) +static WERROR reg_preg_diff_set_value(void *_data, const char *key_name, const char *value_name, uint32_t value_type, DATA_BLOB value_data) { struct preg_data *data = _data; return WERR_OK;
