[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2305-g4543113
Michael Adam
obnox at samba.org
Thu May 8 15:44:46 GMT 2008
The branch, v3-2-test has been updated
via 45431136f6b8fa602cf0dbaae35ba5054a7b6f4e (commit)
via 1966b19b6140d68b32e0ee77702b75ed8098a0a7 (commit)
via 02ebb520bee7ea2d5bbaf389dfd4cd1763a666fc (commit)
via 47038fdcd233fc959401a37d6ca87b5bc45cec9e (commit)
via 49a1b81293c4d874cc82ed106370a1823d2cc3ac (commit)
via 6803038bcb0c46e27134654f9ddaf6d84a894ff6 (commit)
via 928093ea9737b422bae9debbbf9118ab40d0eff6 (commit)
via 097e911eb608016c6c25ddcf631bd3698354ecf9 (commit)
via 46c3767116f24eef36218ab3f190e5600374dde8 (commit)
via 898d8822b43063b922a6991ec89882d057da0e9b (commit)
via a79b2edd8e08a95be5b991e563bc38575f980b1d (commit)
via bb747915ae009ec97d0e4ed47dbf8a8db7cdabdd (commit)
via 64d33846f435746c483fc7a56f5b4512d4ca26b5 (commit)
via 0325df3986cec0694975619138ac1e14ef565457 (commit)
via 23f9977ca85a1840ef6718c0cec9f46c7befe130 (commit)
via ab55676996ec4b85e2d59b00d57b2db9ba52a018 (commit)
via babaa9c4cab35da6c952e2f21fbec5f9f41f6436 (commit)
via fb4e0c586446e7ea858b9eea5262aa2729837fa5 (commit)
via 326061ee51b3a51ca5a078d0aa2d162c03879b78 (commit)
via b311b8bf909698ef9f6d812b467952ccaafa67d7 (commit)
via 5afabaa690e1c99de27b5975de92f38265f13bea (commit)
via e06083196405fdba3a32a772ff99cae50c0f7019 (commit)
via 1636b6cbaf165bc8f999e92bfd3fea6e4d383484 (commit)
via 9f32c3912a406de60636453957ee1bd7b3a890fa (commit)
via 593fdbc3e25234ad5e38db16c5f3d8541247eb27 (commit)
from 69f64557fc94d3f5ccd139701ffe26603b21914b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 45431136f6b8fa602cf0dbaae35ba5054a7b6f4e
Author: Michael Adam <obnox at samba.org>
Date: Sun Apr 13 15:21:31 2008 +0200
registry: refactor common part of registry initialization out.
into a new function registry_init_common().
Michael
(cherry picked from commit 5da52b95ac69e4abfbc44335df2447bec8f16e13)
commit 1966b19b6140d68b32e0ee77702b75ed8098a0a7
Author: Björn Jacke <bj at sernet.de>
Date: Wed Apr 9 18:20:07 2008 +0200
fix some extrasemi compile warnings
(cherry picked from parts of cbdb79b7a1044945e515a294f487e4c1a9c91be5)
(cherry picked from commit 49be6c8dac6ddb90cd3ea2324d2dbc5d7cc503dd)
commit 02ebb520bee7ea2d5bbaf389dfd4cd1763a666fc
Author: Michael Adam <obnox at samba.org>
Date: Sun Apr 13 15:12:04 2008 +0200
registry: change registry_init_basic() to return WERROR instead of bool
Michael
(cherry picked from commit 44018f864a40604196863c032e6f10ffbf7ee8b4)
commit 47038fdcd233fc959401a37d6ca87b5bc45cec9e
Author: Michael Adam <obnox at samba.org>
Date: Sun Apr 13 15:25:47 2008 +0200
registry: change registry_init_smbconf() to return WERROR instead of bool
Michael
(cherry picked from commit 7c343c60574cda091f59861fbcb2893aefb564e9)
(cherry picked from commit 6c898b0285a2f822fe401cd0ced1e82873ec7c6d)
commit 49a1b81293c4d874cc82ed106370a1823d2cc3ac
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 4 12:59:21 2008 +0200
net_registry: fix build/linking of net_registry.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 6acb709ed872c3864fde48eb396e7b9c3103c070)
commit 6803038bcb0c46e27134654f9ddaf6d84a894ff6
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:03 2008 +0200
Revert "Add infrastructure for reading/storing Group Policy state and control data in the registry."
This reverts commit f673bbd300d972dd7ae2d092b3b1e642ed29cfd2.
commit 928093ea9737b422bae9debbbf9118ab40d0eff6
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:03 2008 +0200
Revert "Add Group Policy extension infrastructure."
This reverts commit 6d543b1a1a5a7af98affc9aea2edf650cb476379.
commit 097e911eb608016c6c25ddcf631bd3698354ecf9
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:02 2008 +0200
Revert "Add "registry" Group Policy extension."
This reverts commit 4e93301ca4931908a7d1994be45c57002f8c6fea.
commit 46c3767116f24eef36218ab3f190e5600374dde8
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:02 2008 +0200
Revert "Add gp_get_machine_token()."
This reverts commit 2f1bc7ddad97b9137ae4cce696bf4e08f9b7ca20.
commit 898d8822b43063b922a6991ec89882d057da0e9b
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:02 2008 +0200
Revert "Fix the build w/o ldap."
This reverts commit 5f592d030b7e94331a634e0d625aefc60cfb1f70.
commit a79b2edd8e08a95be5b991e563bc38575f980b1d
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:01 2008 +0200
Revert "Fix gp_find_file() which broke during the pstring removal."
This reverts commit f18ba6c877fa934d19ecc6a65be74b8bad7ee7e4.
commit bb747915ae009ec97d0e4ed47dbf8a8db7cdabdd
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:01 2008 +0200
Revert "Bind Group Policy processing closer to the samba registry."
This reverts commit e9c56250eb7a2dc4e69962c5b48875834941ccfc.
commit 64d33846f435746c483fc7a56f5b4512d4ca26b5
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:01 2008 +0200
Revert "libgpo: use reg_setkeysecurity() instead of regdb_set_secdesc()."
This reverts commit 4717e6d0cf9df53a55e5d55ede5480181b33920d.
commit 0325df3986cec0694975619138ac1e14ef565457
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:00 2008 +0200
Revert "libgpo: replace hand-crafted registry initialization by registry_init_basic."
This reverts commit 10ae8accb486956ebb1638cee540868a11623b11.
commit 23f9977ca85a1840ef6718c0cec9f46c7befe130
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:00 2008 +0200
Revert "libgpo: open the registry in gp_init_reg_ctx()."
This reverts commit 4185ed03a3879ab708b004ef87b9ffaa6a9e6f3d.
commit ab55676996ec4b85e2d59b00d57b2db9ba52a018
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:00 2008 +0200
Revert "Makefile: reassign reg_init_basic.o to REG_BASE_OBJ, where it belongs..."
This reverts commit 7b16cb1023abd4fb2b2f08cf723d38c8c6ae68a0.
commit babaa9c4cab35da6c952e2f21fbec5f9f41f6436
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:44:00 2008 +0200
Revert "fix some extrasemi compile warnings"
This reverts commit cbdb79b7a1044945e515a294f487e4c1a9c91be5.
commit fb4e0c586446e7ea858b9eea5262aa2729837fa5
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:59 2008 +0200
Revert "registry: change registry_init_basic() to return WERROR instead of bool"
This reverts commit 6a31e659cb371395dff0906786f3c6ef0cc2b3de.
commit 326061ee51b3a51ca5a078d0aa2d162c03879b78
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:59 2008 +0200
Revert "registry: refactor common part of registry initialization out."
This reverts commit 5da52b95ac69e4abfbc44335df2447bec8f16e13.
commit b311b8bf909698ef9f6d812b467952ccaafa67d7
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:59 2008 +0200
Revert "registry: change registry_init_smbconf() to return WERROR instead of bool"
This reverts commit 7c343c60574cda091f59861fbcb2893aefb564e9.
commit 5afabaa690e1c99de27b5975de92f38265f13bea
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:59 2008 +0200
Revert "gpo: make integer debug print more readable."
This reverts commit b2cf8010aea3221bb6b108b9395b9d89cc1bc0d5.
commit e06083196405fdba3a32a772ff99cae50c0f7019
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:58 2008 +0200
Revert "libgpo: fix build warning."
This reverts commit cb3f1df7d8f35848a432764ea7d6720ec131ede1.
commit 1636b6cbaf165bc8f999e92bfd3fea6e4d383484
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:58 2008 +0200
Revert "libgpo: try nicer output when dumping gpo registry values."
This reverts commit 2b788429478868d1b0cbfd88027809be33edcfc5.
commit 9f32c3912a406de60636453957ee1bd7b3a890fa
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:58 2008 +0200
Revert "gpo: add scripts plugin."
This reverts commit cd6388f04041a667bf0909d81e8af5f7b3bdc4af.
commit 593fdbc3e25234ad5e38db16c5f3d8541247eb27
Author: Michael Adam <obnox at samba.org>
Date: Thu May 8 17:43:57 2008 +0200
Revert "libgpo: Fallback to NTLMSSP fails while pulling policy from SYSVOL."
This reverts commit 7ed1397e25d50e6616040677cfe26148e7211538.
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 23 +-
source/configure.in | 5 -
source/include/gpo.h | 64 +---
source/include/reg_objects.h | 7 -
source/lib/util_nttoken.c | 50 --
source/libgpo/gpext/gpext.c | 746 ----------------------------
source/libgpo/gpext/gpext.h | 79 ---
source/libgpo/gpext/registry.c | 634 ------------------------
source/libgpo/gpext/scripts.c | 443 -----------------
source/libgpo/gpo_ldap.c | 2 +-
source/libgpo/gpo_reg.c | 1009 --------------------------------------
source/libgpo/gpo_util.c | 287 +++---------
source/registry/reg_backend_db.c | 8 -
source/utils/net_ads_gpo.c | 194 ++------
14 files changed, 104 insertions(+), 3447 deletions(-)
delete mode 100644 source/libgpo/gpext/gpext.c
delete mode 100644 source/libgpo/gpext/gpext.h
delete mode 100644 source/libgpo/gpext/registry.c
delete mode 100644 source/libgpo/gpext/scripts.c
delete mode 100644 source/libgpo/gpo_reg.c
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 87dc067..dd98db1 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -103,7 +103,6 @@ NSSINFOLIBDIR = $(LIBDIR)/nss_info
CHARSETLIBDIR = $(LIBDIR)/charset
AUTHLIBDIR = $(LIBDIR)/auth
CONFIGLIBDIR = $(LIBDIR)/config
-GPEXTLIBDIR = $(LIBDIR)/gpext
CONFIGDIR = @configdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -234,10 +233,8 @@ IDMAP_MODULES = @IDMAP_MODULES@
CHARSET_MODULES = @CHARSET_MODULES@
AUTH_MODULES = @AUTH_MODULES@
NSS_INFO_MODULES = @NSS_INFO_MODULES@
-GPEXT_MODULES = @GPEXT_MODULES@
MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
- $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \
- $(GPEXT_MODULES)
+ $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES)
######################################################################
# object file lists
@@ -380,12 +377,8 @@ LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
$(WBCOMMON_OBJ) \
@LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
-GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
-
LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
- libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o \
- libgpo/gpo_reg.o \
- $(GPEXT_OBJ)
+ libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
LIBGPO_OBJ = $(LIBGPO_OBJ0)
LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
@@ -1145,8 +1138,6 @@ nss_modules : $(NSS_MODULES)
pam_modules : $(PAM_MODULES)
-gpext_modules : SHOWFLAGS $(GPEXT_MODULES)
-
pam_smbpass : SHOWFLAGS bin/pam_smbpass. at SHLIBEXT@
pam_winbind : SHOWFLAGS bin/pam_winbind. at SHLIBEXT@
@@ -1983,14 +1974,6 @@ bin/aio_fork. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_FORK_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
-bin/registry. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o
- @echo "Building plugin $@"
- @$(SHLD_MODULE) libgpo/gpext/registry.o
-
-bin/scripts. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/scripts.o
- @echo "Building plugin $@"
- @$(SHLD_MODULE) libgpo/gpext/scripts.o
-
#########################################################
## IdMap NSS plugins
@@ -2101,7 +2084,6 @@ installmodules: modules installdirs
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
- @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam. at SHLIBEXT@ NDS_ldapsam. at SHLIBEXT@
@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam. at SHLIBEXT@ NDS_ldapsam_compat. at SHLIBEXT@
@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam. at SHLIBEXT@ ldapsam_compat. at SHLIBEXT@
@@ -2224,7 +2206,6 @@ uninstallmodules:
@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
- @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
uninstallscripts:
@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
diff --git a/source/configure.in b/source/configure.in
index bbce8b6..acf8d96 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -110,7 +110,6 @@ AC_SUBST(IDMAP_LIBS)
AC_SUBST(KRB5_LIBS)
AC_SUBST(UUID_LIBS)
AC_SUBST(LDAP_LIBS)
-AC_SUBST(GPEXT_LIBS)
AC_SUBST(PAM_MODULES)
AC_SUBST(INSTALL_PAM_MODULES)
AC_SUBST(UNINSTALL_PAM_MODULES)
@@ -6154,10 +6153,6 @@ SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", V
SMB_SUBSYSTEM(VFS,smbd/vfs.o)
-SMB_MODULE(gpext_registry, libgpo/gpext/registry.o, "bin/registry.$SHLIBEXT", GPEXT)
-SMB_MODULE(gpext_scripts, libgpo/gpext/scripts.o, "bin/scripts.$SHLIBEXT", GPEXT)
-SMB_SUBSYSTEM(GPEXT, libgpo/gpext/gpext.o)
-
AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
#################################################
diff --git a/source/include/gpo.h b/source/include/gpo.h
index bf5ff6a..9b1a672 100644
--- a/source/include/gpo.h
+++ b/source/include/gpo.h
@@ -1,7 +1,7 @@
/*
* Unix SMB/CIFS implementation.
* Group Policy Object Support
- * Copyright (C) Guenther Deschner 2005-2008
+ * Copyright (C) Guenther Deschner 2005-2007
*
* 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
@@ -22,8 +22,7 @@ enum GPO_LINK_TYPE {
GP_LINK_MACHINE = 1,
GP_LINK_SITE = 2,
GP_LINK_DOMAIN = 3,
- GP_LINK_OU = 4,
- GP_LINK_LOCAL = 5 /* for convenience */
+ GP_LINK_OU = 4
};
/* GPO_OPTIONS */
@@ -34,17 +33,6 @@ enum GPO_LINK_TYPE {
#define GPO_LIST_FLAG_MACHINE 0x00000001
#define GPO_LIST_FLAG_SITEONLY 0x00000002
-/* following flags from http://support.microsoft.com/kb/312164/EN-US/ */
-#define GPO_INFO_FLAG_MACHINE 0x00000001
-#define GPO_INFO_FLAG_BACKGROUND 0x00000010
-#define GPO_INFO_FLAG_SLOWLINK 0x00000020
-#define GPO_INFO_FLAG_VERBOSE 0x00000040
-#define GPO_INFO_FLAG_NOCHANGES 0x00000080
-#define GPO_INFO_FLAG_LINKTRANSITION 0x00000100
-#define GPO_INFO_FLAG_LOGRSOP_TRANSITION 0x00000200
-#define GPO_INFO_FLAG_FORCED_REFRESH 0x00000400
-#define GPO_INFO_FLAG_SAFEMODE_BOOT 0x00000800
-
#define GPO_VERSION_USER(x) (x >> 16)
#define GPO_VERSION_MACHINE(x) (x & 0xffff)
@@ -100,59 +88,11 @@ struct GP_EXT {
char **extensions_guid;
char **snapins;
char **snapins_guid;
- struct GP_EXT *next, *prev;
};
#define GPO_CACHE_DIR "gpo_cache"
#define GPT_INI "GPT.INI"
-#define GPO_REFRESH_INTERVAL 60*90
-
-#define GPO_REG_STATE_MACHINE "State\\Machine"
-
-enum gp_reg_action {
- GP_REG_ACTION_NONE = 0,
- GP_REG_ACTION_ADD_VALUE = 1,
- GP_REG_ACTION_ADD_KEY = 2,
- GP_REG_ACTION_DEL_VALUES = 3,
- GP_REG_ACTION_DEL_VALUE = 4,
- GP_REG_ACTION_DEL_ALL_VALUES = 5,
- GP_REG_ACTION_DEL_KEYS = 6,
- GP_REG_ACTION_SEC_KEY_SET = 7,
- GP_REG_ACTION_SEC_KEY_RESET = 8
-};
-
-struct gp_registry_entry {
- enum gp_reg_action action;
- const char *key;
- const char *value;
- struct registry_value *data;
-};
-
-struct gp_registry_value {
- const char *value;
- struct registry_value *data;
-};
-
-struct gp_registry_entry2 {
- enum gp_reg_action action;
- const char *key;
- size_t num_values;
- struct gp_registry_value **values;
-};
-
-struct gp_registry_entries {
- size_t num_entries;
- struct gp_registry_entry **entries;
-};
-
-struct gp_registry_context {
- const struct nt_user_token *token;
- const char *path;
- struct registry_key *curr_key;
-};
#define GP_EXT_GUID_SECURITY "827D319E-6EAC-11D2-A4EA-00C04F79F83A"
#define GP_EXT_GUID_REGISTRY "35378EAC-683F-11D2-A89A-00C04FBBCFA2"
#define GP_EXT_GUID_SCRIPTS "42B5FAAE-6536-11D2-AE5A-0000F87571E3"
-
-#include "libgpo/gpext/gpext.h"
diff --git a/source/include/reg_objects.h b/source/include/reg_objects.h
index d9159dd..5d6c5a1 100644
--- a/source/include/reg_objects.h
+++ b/source/include/reg_objects.h
@@ -105,16 +105,9 @@ typedef struct {
#define KEY_CURRENT_VERSION "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"
#define KEY_PERFLIB "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib"
#define KEY_PERFLIB_009 "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009"
-#define KEY_GROUP_POLICY "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Group Policy"
-#define KEY_WINLOGON "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"
#define KEY_SMBCONF "HKLM\\SOFTWARE\\Samba\\smbconf"
-#define KEY_SAMBA_GROUP_POLICY "HKLM\\SOFTWARE\\Samba\\Group Policy"
#define KEY_TREE_ROOT ""
-#define KEY_GP_MACHINE_POLICY "HKLM\\Software\\Policies"
-#define KEY_GP_MACHINE_WIN_POLICY "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies"
-#define KEY_GP_USER_POLICY "HKCU\\Software\\Policies"
-#define KEY_GP_USER_WIN_POLICY "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies"
/*
* Registry key types
* Most keys are going to be GENERIC -- may need a better name?
diff --git a/source/lib/util_nttoken.c b/source/lib/util_nttoken.c
index f81191a..13c66a5 100644
--- a/source/lib/util_nttoken.c
+++ b/source/lib/util_nttoken.c
@@ -7,7 +7,6 @@
* Copyright (C) Rafal Szczesniak 2002
* Copyright (C) Volker Lendecke 2006
* Copyright (C) Michael Adam 2007
- * Copyright (C) Guenther Deschner 2007
*
* 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
@@ -68,52 +67,3 @@ NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken)
return token;
}
-/****************************************************************************
- merge NT tokens
-****************************************************************************/
-
-NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
- const struct nt_user_token *token_1,
- const struct nt_user_token *token_2,
- struct nt_user_token **token_out)
-{
- struct nt_user_token *token = NULL;
- NTSTATUS status;
- int i;
-
- if (!token_1 || !token_2 || !token_out) {
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token);
- NT_STATUS_HAVE_NO_MEMORY(token);
-
- for (i=0; i < token_1->num_sids; i++) {
- status = add_sid_to_array_unique(mem_ctx,
- &token_1->user_sids[i],
- &token->user_sids,
- &token->num_sids);
- if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(token);
- return status;
- }
- }
-
- for (i=0; i < token_2->num_sids; i++) {
- status = add_sid_to_array_unique(mem_ctx,
- &token_2->user_sids[i],
- &token->user_sids,
- &token->num_sids);
- if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(token);
- return status;
- }
- }
-
- se_priv_add(&token->privileges, &token_1->privileges);
- se_priv_add(&token->privileges, &token_2->privileges);
-
- *token_out = token;
-
- return NT_STATUS_OK;
-}
diff --git a/source/libgpo/gpext/gpext.c b/source/libgpo/gpext/gpext.c
deleted file mode 100644
index 184a2fa..0000000
--- a/source/libgpo/gpext/gpext.c
+++ /dev/null
@@ -1,746 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Group Policy Support
- * Copyright (C) Guenther Deschner 2007-2008
- *
- * 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"
-
-static struct gp_extension *extensions = NULL;
-
-/****************************************************************
-****************************************************************/
-
-struct gp_extension *get_gp_extension_list(void)
-{
- return extensions;
-}
-
-/****************************************************************
-****************************************************************/
-
-/* see http://support.microsoft.com/kb/216358/en-us/ for more info */
-
-struct gp_extension_reg_table gpext_reg_vals[] = {
- { "DllName", REG_EXPAND_SZ },
- { "ProcessGroupPolicy", REG_SZ },
- { "NoMachinePolicy", REG_DWORD },
- { "NoUserPolicy", REG_DWORD },
- { "NoSlowLink", REG_DWORD },
- { "NoBackgroundPolicy", REG_DWORD },
- { "NoGPOListChanges", REG_DWORD },
- { "PerUserLocalSettings", REG_DWORD },
- { "RequiresSuccessfulRegistry", REG_DWORD },
- { "EnableAsynchronousProcessing", REG_DWORD },
- { "ExtensionDebugLevel", REG_DWORD },
- /* new */
- { "GenerateGroupPolicy", REG_SZ }, /* not supported on w2k */
- { "NotifyLinkTransition", REG_DWORD },
- { "ProcessGroupPolicyEx", REG_SZ }, /* not supported on w2k */
- { "ExtensionEventSource", REG_MULTI_SZ }, /* not supported on w2k */
- { "GenerateGroupPolicy", REG_SZ },
- { "MaxNoGPOListChangesInterval", REG_DWORD },
- { NULL, REG_NONE }
-};
-
-/****************************************************************
-****************************************************************/
-
-static struct gp_extension *get_extension_by_name(struct gp_extension *be,
- const char *name)
-{
- struct gp_extension *b;
-
- for (b = be; b; b = b->next) {
- if (strequal(b->name, name)) {
- return b;
- }
- }
-
- return NULL;
-}
-
-/****************************************************************
-****************************************************************/
-
-static struct gp_extension_methods *get_methods_by_name(struct gp_extension *be,
- const char *name)
-{
- struct gp_extension *b;
-
- for (b = be; b; b = b->next) {
- if (strequal(b->name, name)) {
- return b->methods;
- }
- }
-
- return NULL;
-}
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS unregister_gp_extension(const char *name)
-{
- struct gp_extension *ext;
-
- ext = get_extension_by_name(extensions, name);
- if (!ext) {
- return NT_STATUS_OK;
- }
-
- DLIST_REMOVE(extensions, ext);
- TALLOC_FREE(ext);
-
- DEBUG(2,("Successfully removed GP extension '%s'\n", name));
-
- return NT_STATUS_OK;
-}
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS register_gp_extension(TALLOC_CTX *gpext_ctx,
- int version,
- const char *name,
- const char *guid,
- struct gp_extension_methods *methods)
-{
- struct gp_extension_methods *test;
- struct gp_extension *entry;
- NTSTATUS status;
-
- if (!gpext_ctx) {
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
-
- if ((version != SMB_GPEXT_INTERFACE_VERSION)) {
- DEBUG(0,("Failed to register gp extension.\n"
- "The module was compiled against "
- "SMB_GPEXT_INTERFACE_VERSION %d,\n"
- "current SMB_GPEXT_INTERFACE_VERSION is %d.\n"
- "Please recompile against the current "
- "version of samba!\n",
- version, SMB_GPEXT_INTERFACE_VERSION));
- return NT_STATUS_OBJECT_TYPE_MISMATCH;
- }
-
- if (!guid || !name || !name[0] || !methods) {
- DEBUG(0,("Called with NULL pointer or empty name!\n"));
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- test = get_methods_by_name(extensions, name);
- if (test) {
- DEBUG(0,("GP extension module %s already registered!\n",
- name));
- return NT_STATUS_OBJECT_NAME_COLLISION;
- }
-
- entry = TALLOC_ZERO_P(gpext_ctx, struct gp_extension);
- NT_STATUS_HAVE_NO_MEMORY(entry);
-
- entry->name = talloc_strdup(gpext_ctx, name);
- NT_STATUS_HAVE_NO_MEMORY(entry->name);
-
- entry->guid = TALLOC_ZERO_P(gpext_ctx, struct GUID);
- NT_STATUS_HAVE_NO_MEMORY(entry->guid);
- status = GUID_from_string(guid, entry->guid);
- NT_STATUS_NOT_OK_RETURN(status);
-
- entry->methods = methods;
- DLIST_ADD(extensions, entry);
-
- DEBUG(2,("Successfully added GP extension '%s' %s\n",
- name, GUID_string2(gpext_ctx, entry->guid)));
-
- return NT_STATUS_OK;
-}
-
-/****************************************************************
-****************************************************************/
-
-static NTSTATUS gp_extension_init_module(TALLOC_CTX *mem_ctx,
- const char *name,
- struct gp_extension **gpext)
-{
- NTSTATUS status;
- struct gp_extension *ext = NULL;
-
- ext = TALLOC_ZERO_P(mem_ctx, struct gp_extension);
- NT_STATUS_HAVE_NO_MEMORY(gpext);
-
- ext->methods = get_methods_by_name(extensions, name);
- if (!ext->methods) {
-
- status = smb_probe_module(SAMBA_SUBSYSTEM_GPEXT,
- name);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- ext->methods = get_methods_by_name(extensions, name);
- if (!ext->methods) {
- return NT_STATUS_DLL_INIT_FAILED;
- }
- }
-
- *gpext = ext;
-
- return NT_STATUS_OK;
-}
-
-/****************************************************************
--
Samba Shared Repository
More information about the samba-cvs
mailing list