samba36: reorganize patches, fix windows 7 compatibility
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30505 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
30
net/samba36/patches/270-remove_registry_backend.patch
Normal file
30
net/samba36/patches/270-remove_registry_backend.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- a/source3/lib/smbconf/smbconf_init.c
|
||||
+++ b/source3/lib/smbconf/smbconf_init.c
|
||||
@@ -68,9 +68,12 @@ sbcErr smbconf_init(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef REGISTRY_BACKEND
|
||||
if (strequal(backend, "registry") || strequal(backend, "reg")) {
|
||||
err = smbconf_init_reg(mem_ctx, conf_ctx, path);
|
||||
- } else if (strequal(backend, "file") || strequal(backend, "txt")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+ if (strequal(backend, "file") || strequal(backend, "txt")) {
|
||||
err = smbconf_init_txt(mem_ctx, conf_ctx, path);
|
||||
} else if (sep == NULL) {
|
||||
/*
|
||||
--- a/source3/lib/netapi/serverinfo.c
|
||||
+++ b/source3/lib/netapi/serverinfo.c
|
||||
@@ -557,7 +557,10 @@ static WERROR NetServerSetInfo_l_1005(st
|
||||
return WERR_INVALID_PARAM;
|
||||
}
|
||||
|
||||
- if (!lp_config_backend_is_registry()) {
|
||||
+#ifdef REGISTRY_BACKEND
|
||||
+ if (!lp_config_backend_is_registry())
|
||||
+#endif
|
||||
+ {
|
||||
libnetapi_set_error_string(ctx,
|
||||
"Configuration manipulation requested but not "
|
||||
"supported by backend");
|
Reference in New Issue
Block a user