diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 12:34:29 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 12:34:29 +0000 |
commit | 445936955ee182517b6db29bc3baf1a42d762161 (patch) | |
tree | 80c88c92e955db9ba70db0369a9017b078b3c8a2 /package/network/services/samba36/patches/270-remove_registry_backend.patch | |
parent | 405e21d16731b2764ab82aaaadcf36a813b105f7 (diff) | |
download | upstream-445936955ee182517b6db29bc3baf1a42d762161.tar.gz upstream-445936955ee182517b6db29bc3baf1a42d762161.tar.bz2 upstream-445936955ee182517b6db29bc3baf1a42d762161.zip |
samba36: move to trunk and add myself as a maintainer
SVN-Revision: 33689
Diffstat (limited to 'package/network/services/samba36/patches/270-remove_registry_backend.patch')
-rw-r--r-- | package/network/services/samba36/patches/270-remove_registry_backend.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/network/services/samba36/patches/270-remove_registry_backend.patch b/package/network/services/samba36/patches/270-remove_registry_backend.patch new file mode 100644 index 0000000000..a1cc87771a --- /dev/null +++ b/package/network/services/samba36/patches/270-remove_registry_backend.patch @@ -0,0 +1,43 @@ +--- 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"); +--- a/source3/smbd/server.c ++++ b/source3/smbd/server.c +@@ -1210,8 +1210,10 @@ extern void build_options(bool screen); + exit(1); + } + ++#ifdef REGISTRY_BACKEND + if (!W_ERROR_IS_OK(registry_init_full())) + exit(1); ++#endif + + #ifdef PRINTER_SUPPORT + if (!print_backend_init(smbd_messaging_context())) |