Rename param_opt.flags to priority.

[ira/wip.git] / source4 / param / loadparm.c

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index e63a7aa8a19c2f2c1e43e04d3b402270b5a834a9..b4098c840cdf50e27b015d74188db493e3ab41e3 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -60,10 +60,11 @@
 #include "system/network.h" /* needed for TCP_NODELAY */
 #include "smb_server/smb_server.h"
 #include "libcli/raw/signing.h"
-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "libcli/raw/libcliraw.h"
+#include "rpc_server/common/common.h"
 
 #define standard_sub_basic talloc_strdup
 
@@ -97,8 +98,6 @@ struct loadparm_global
        char *szWINS_CONFIG_URL;
        char *szWINS_URL;
        char *szPrivateDir;
-       const char **jsInclude;
-       char *jsonrpcServicesDir;
        const char **szPasswordServers;
        char *szSocketOptions;
        char *szRealm;
@@ -469,7 +468,6 @@ static struct parm_struct parm_table[] = {
        {"lock directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szLockDir), NULL, NULL},
        {"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL},
        {"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL}, 
-       {"js include", P_LIST, P_GLOBAL, GLOBAL_VAR(jsInclude), NULL, NULL},
        {"setup directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szSetupDir), NULL, NULL},
 
        {"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL},
@@ -619,11 +617,6 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, kpasswd_port)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, web_port)
 _PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, swat_directory)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, tls_enabled)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, tls_keyfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, tls_certfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, tls_cafile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, tls_crlfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_dhpfile, tls_dhpfile)
 _PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, szShareBackend)
 _PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, szSAM_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_idmap_url, szIDMAP_URL)
@@ -702,7 +695,6 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, cli_minprotocol)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_security, security)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, announce_as)
-_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, jsInclude)
 const char *lp_servicename(const struct loadparm_service *service)
 {
        return lp_string((const char *)service->szService);
@@ -889,7 +881,7 @@ const char **lp_parm_string_list(TALLOC_CTX *mem_ctx,
        const char *value = lp_get_parametric(lp_ctx, service, type, option);
 
        if (value != NULL)
-               return str_list_make(mem_ctx, value, separator);
+               return (const char **)str_list_make(mem_ctx, value, separator);
 
        return NULL;
 }
@@ -1303,7 +1295,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       *(const char ***)dest_ptr = str_list_copy(pserviceDest, 
+                                       *(const char ***)dest_ptr = (const char **)str_list_copy(pserviceDest, 
                                                                                  *(const char ***)src_ptr);
                                        break;
                                default:
@@ -1578,14 +1570,14 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
                /* If we already have the option set, override it unless
                   it was a command line option and the new one isn't */
                if (strcmp(paramo->key, name) == 0) {
-                       if ((paramo->flags & FLAG_CMDLINE) &&
+                       if ((paramo->priority & FLAG_CMDLINE) &&
                            !(flags & FLAG_CMDLINE)) {
                                return true;
                        }
 
                        talloc_free(paramo->value);
                        paramo->value = talloc_strdup(paramo, pszParmValue);
-                       paramo->flags = flags;
+                       paramo->priority = flags;
                        free(name);
                        return true;
                }
@@ -1596,7 +1588,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
                smb_panic("OOM");
        paramo->key = talloc_strdup(paramo, name);
        paramo->value = talloc_strdup(paramo, pszParmValue);
-       paramo->flags = flags;
+       paramo->priority = flags;
        if (service == NULL) {
                DLIST_ADD(lp_ctx->globals->param_opt, paramo);
        } else {
@@ -1657,7 +1649,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
                }
 
                case P_LIST:
-                       *(const char ***)parm_ptr = str_list_make(mem_ctx,
+                       *(const char ***)parm_ptr = (const char **)str_list_make(mem_ctx,
                                                                  pszParmValue, NULL);
                        break;
 
@@ -2228,7 +2220,7 @@ static int lp_destructor(struct loadparm_context *lp_ctx)
                struct param_opt *next;
                for (data = lp_ctx->globals->param_opt; data; data=next) {
                        next = data->next;
-                       if (data->flags & FLAG_CMDLINE) continue;
+                       if (data->priority & FLAG_CMDLINE) continue;
                        DLIST_REMOVE(lp_ctx->globals->param_opt, data);
                        talloc_free(data);
                }
@@ -2299,7 +2291,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        SAFE_FREE(myname);
        lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
 
-       lp_do_global_parameter(lp_ctx, "fstype", FSTYPE_STRING);
+       lp_do_global_parameter(lp_ctx, "fstype", "NTFS");
+
        lp_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
        lp_do_global_parameter(lp_ctx, "max connections", "-1");
 
@@ -2369,8 +2362,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_do_global_parameter(lp_ctx, "TimeServer", "False");
        lp_do_global_parameter(lp_ctx, "BindInterfacesOnly", "False");
        lp_do_global_parameter(lp_ctx, "Unicode", "True");
-       lp_do_global_parameter(lp_ctx, "ClientLanManAuth", "True");
-       lp_do_global_parameter(lp_ctx, "LanmanAuth", "True");
+       lp_do_global_parameter(lp_ctx, "ClientLanManAuth", "False");
+       lp_do_global_parameter(lp_ctx, "LanmanAuth", "False");
        lp_do_global_parameter(lp_ctx, "NTLMAuth", "True");
        lp_do_global_parameter(lp_ctx, "client use spnego principal", "False");
 
@@ -2413,7 +2406,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
        lp_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
        lp_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-       lp_do_global_parameter_var(lp_ctx, "js include", "%s", dyn_JSDIR);
        lp_do_global_parameter_var(lp_ctx, "setup directory", "%s",
                                   dyn_SETUPDIR);
 
@@ -2617,7 +2609,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_c
 _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx)
 {
        talloc_free(lp_ctx->iconv_convenience);
-       lp_ctx->iconv_convenience = smb_iconv_convenience_init_lp(lp_ctx, lp_ctx);
+       global_iconv_convenience = lp_ctx->iconv_convenience = smb_iconv_convenience_init_lp(lp_ctx, lp_ctx);
 }
 
 void lp_smbcli_options(struct loadparm_context *lp_ctx,
@@ -2634,3 +2626,48 @@ void lp_smbcli_options(struct loadparm_context *lp_ctx,
        options->use_oplocks = true;
        options->use_level2_oplocks = true;
 }
+
+void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
+                                struct smbcli_session_options *options)
+{
+       options->lanman_auth = lp_client_lanman_auth(lp_ctx);
+       options->ntlmv2_auth = lp_client_ntlmv2_auth(lp_ctx);
+       options->plaintext_auth = lp_client_plaintext_auth(lp_ctx);
+}
+
+_PUBLIC_ char *lp_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile);
+}
+
+_PUBLIC_ char *lp_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile);
+}
+
+_PUBLIC_ char *lp_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile);
+}
+
+_PUBLIC_ char *lp_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile);
+}
+
+_PUBLIC_ char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile);
+}
+
+_PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+       struct dcerpc_server_info *ret = talloc_zero(mem_ctx, struct dcerpc_server_info);
+
+       ret->domain_name = talloc_reference(mem_ctx, lp_workgroup(lp_ctx));
+       ret->version_major = lp_parm_int(lp_ctx, NULL, "server_info", "version_major", 5);
+       ret->version_minor = lp_parm_int(lp_ctx, NULL, "server_info", "version_minor", 2);
+       ret->version_build = lp_parm_int(lp_ctx, NULL, "server_info", "version_build", 3790);
+
+       return ret;
+}