git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r6619: realm should not be forced uppercase
[samba.git] / source / param / loadparm.c
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 405caf6fc4eb547f8e6099594b284cbfcbd906ee..f436d8fd0bfeed616df01309632f884d92ac2e77 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -53,12 +53,15 @@
  */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "system/time.h"
 #include "system/iconv.h"
 #include "system/network.h"
 #include "system/printing.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "dlinklist.h"
 
 BOOL in_client = False;                /* Not in the client by default */
@@ -130,7 +133,7 @@ struct parm_struct
                int ivalue;
                char *svalue;
                char cvalue;
-               char **lvalue;
+               const char **lvalue;
        } def;
 };
 
@@ -167,9 +170,10 @@ typedef struct
        char *szSMBPasswdFile;
        char *szSAM_URL;
        char *szSPOOLSS_URL;
+       char *szWINS_URL;
        char *szPrivateDir;
        char **szPreloadModules;
-       char *szPasswordServer;
+       char **szPasswordServers;
        char *szSocketOptions;
        char *szRealm;
        char *szADSserver;
@@ -188,7 +192,7 @@ typedef struct
        char **szNetbiosAliases;
        char *szNetbiosScope;
        char *szDomainOtherSIDs;
-       char *szNameResolveOrder;
+       char **szNameResolveOrder;
        char *szPanicAction;
        char *szAddUserScript; 
        char *szAddMachineScript;
@@ -231,6 +235,8 @@ typedef struct
        int winbind_cache_time;
        int iLockSpinCount;
        int iLockSpinTime;
+       int nbt_port;
+       int dgram_port;
        char *socket_options;
        BOOL bDNSproxy;
        BOOL bWINSsupport;
@@ -538,7 +544,7 @@ static struct parm_struct parm_table[] = {
        {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_HIDE},
        {"workgroup", P_USTRING, P_GLOBAL, &Globals.szWorkgroup, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"realm", P_USTRING, P_GLOBAL, &Globals.szRealm, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"realm", P_STRING, P_GLOBAL, &Globals.szRealm, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"ADS server", P_STRING, P_GLOBAL, &Globals.szADSserver, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"netbios name", P_USTRING, P_GLOBAL, &Globals.szNetbiosName, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"netbios aliases", P_LIST, P_GLOBAL, &Globals.szNetbiosAliases, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
@@ -560,10 +566,11 @@ static struct parm_struct parm_table[] = {
        {"idmap backend", P_STRING, P_GLOBAL, &Globals.szIDMapBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"password server", P_STRING, P_GLOBAL, &Globals.szPasswordServer, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"password server", P_LIST, P_GLOBAL, &Globals.szPasswordServers, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"wins database", P_STRING, P_GLOBAL, &Globals.szWINS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -610,6 +617,8 @@ static struct parm_struct parm_table[] = {
        {"Protocol Options", P_SEP, P_SEPARATOR},
        
        {"smb ports", P_LIST, P_GLOBAL, &Globals.smb_ports, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"nbt port", P_INTEGER, P_GLOBAL, &Globals.nbt_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"dgram port", P_INTEGER, P_GLOBAL, &Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
        {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
        {"min protocol", P_ENUM, P_GLOBAL, &Globals.minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
@@ -625,7 +634,7 @@ static struct parm_struct parm_table[] = {
        {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
-       {"name resolve order", P_STRING, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"name resolve order", P_LIST, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
        {"max wins ttl", P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"min wins ttl", P_INTEGER, P_GLOBAL, &Globals.min_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -926,13 +935,14 @@ static void init_globals(void)
        do_parameter("ntvfs handler", "unixuid default");
        do_parameter("max connections", "-1");
 
-       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg IOXIDResolver IRemoteActivation");
-       do_parameter("server services", "smb rpc");
+       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup");
+       do_parameter("server services", "smb rpc nbt");
        do_parameter("auth methods", "anonymous sam_ignoredomain");
        do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE);
        do_parameter("private dir", dyn_PRIVATE_DIR);
        do_parameter_var("sam database", "tdb://%s/sam.ldb", dyn_PRIVATE_DIR);
        do_parameter_var("spoolss database", "tdb://%s/spoolss.ldb", dyn_PRIVATE_DIR);
+       do_parameter_var("wins database", "tdb://%s/wins.ldb", dyn_PRIVATE_DIR);
        do_parameter_var("registry:HKEY_LOCAL_MACHINE", "ldb:/%s/hklm.ldb", dyn_PRIVATE_DIR);
        do_parameter("guest account", GUEST_ACCOUNT);
 
@@ -1042,8 +1052,13 @@ static void init_globals(void)
        do_parameter("use spnego", "True");
 
        do_parameter("smb ports", SMB_PORTS);
+       do_parameter("nbt port", "137");
+       do_parameter("dgram port", "138");
 
        do_parameter("nt status support", "True");
+
+       do_parameter("max wins ttl", "432000");
+       do_parameter("min wins ttl", "10");
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1086,7 +1101,7 @@ static const char *lp_string(const char *s)
        if (!lp_talloc)
                lp_talloc = talloc_init("lp_talloc");
 
-       ret = (char *)talloc(lp_talloc, len + 100);     /* leave room for substitution */
+       ret = talloc_array(lp_talloc, char, len + 100); /* leave room for substitution */
 
        if (!ret)
                return NULL;
@@ -1139,6 +1154,8 @@ static const char *lp_string(const char *s)
  int fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
 
 FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports)
+FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port)
+FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port)
 FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
 FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
 FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
@@ -1147,6 +1164,7 @@ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
 FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile)
 FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL)
 FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
+FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL)
 FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
 FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
 FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname)
@@ -1161,8 +1179,8 @@ FN_GLOBAL_STRING(lp_hosts_equiv, &Globals.szHostsEquiv)
 FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
 FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
 FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
-FN_GLOBAL_STRING(lp_passwordserver, &Globals.szPasswordServer)
-FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
+FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers)
+FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder)
 FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
 FN_GLOBAL_STRING(lp_ads_server, &Globals.szADSserver)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
@@ -1424,13 +1442,13 @@ const char *lp_parm_string(int lookup_service, const char *type, const char *opt
 /* Parametric option has following syntax: 'Type: option = value' */
 /* Returned value is allocated in 'lp_talloc' context */
 
-char **lp_parm_string_list(int lookup_service, const char *type, const char *option,
-                          const char *separator)
+const char **lp_parm_string_list(int lookup_service, const char *type, const char *option,
+                                const char *separator)
 {
        const char *value = get_parametrics(lookup_service, type, option);
        
        if (value)
-               return str_list_make(value, separator);
+               return str_list_make(talloc_autofree_context(), value, separator);
 
        return NULL;
 }
@@ -1506,15 +1524,17 @@ static void free_service(service *pservice)
        for (i = 0; parm_table[i].label; i++) {
                if ((parm_table[i].type == P_STRING ||
                     parm_table[i].type == P_USTRING) &&
-                   parm_table[i].class == P_LOCAL)
+                   parm_table[i].class == P_LOCAL) {
                        string_free((char **)
                                    (((char *)pservice) +
                                     PTR_DIFF(parm_table[i].ptr, &sDefault)));
-               else if (parm_table[i].type == P_LIST &&
-                        parm_table[i].class == P_LOCAL)
-                            str_list_free((char ***)
-                                           (((char *)pservice) +
-                                            PTR_DIFF(parm_table[i].ptr, &sDefault)));
+               } else if (parm_table[i].type == P_LIST &&
+                          parm_table[i].class == P_LOCAL) {
+                       char ***listp = (char ***)(((char *)pservice) + 
+                                                  PTR_DIFF(parm_table[i].ptr, &sDefault));
+                       talloc_free(*listp);
+                       *listp = NULL;
+               }
        }
                                
        DEBUG(5,("Freeing parametrics:\n"));
@@ -1846,7 +1866,8 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       str_list_copy((char ***)dest_ptr, *(const char ***)src_ptr);
+                                       *(const char ***)dest_ptr = str_list_copy(talloc_autofree_context(), 
+                                                                                 *(const char ***)src_ptr);
                                        break;
                                default:
                                        break;
@@ -1909,6 +1930,7 @@ static BOOL service_ok(int iService)
                        DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
                               ServicePtrs[iService]->szService));
                        ServicePtrs[iService]->bPrint_ok = True;
+                       update_server_announce_as_printserver();
                }
                /* [printers] service must also be non-browsable. */
                if (ServicePtrs[iService]->bBrowseable)
@@ -2019,7 +2041,7 @@ static BOOL handle_include(const char *pszParmValue, char **ptr)
 
        string_set(ptr, fname);
 
-       if (file_exist(fname, NULL))
+       if (file_exist(fname))
                return (pm_process(fname, do_section, do_parameter));
 
        DEBUG(2, ("Can't find include file %s\n", fname));
@@ -2358,7 +2380,8 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
 
                case P_LIST:
-                       *(char ***)parm_ptr = str_list_make(pszParmValue, NULL);
+                       *(const char ***)parm_ptr = str_list_make(talloc_autofree_context(), 
+                                                                 pszParmValue, NULL);
                        break;
 
                case P_STRING:
@@ -2497,6 +2520,8 @@ BOOL lp_set_option(const char *option)
 }
 
 
+#define BOOLSTR(b) ((b) ? "Yes" : "No")
+
 /***************************************************************************
  Print a parameter of the specified type.
 ***************************************************************************/
@@ -2581,7 +2606,8 @@ static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
                        return (*((char *)ptr1) == *((char *)ptr2));
                
                case P_LIST:
-                       return str_list_compare(*(char ***)ptr1, *(char ***)ptr2);
+                       return str_list_equal((const char **)(*(char ***)ptr1), 
+                                             (const char **)(*(char ***)ptr2));
 
                case P_STRING:
                case P_USTRING:
@@ -2657,8 +2683,8 @@ static BOOL is_default(int i)
                return False;
        switch (parm_table[i].type) {
                case P_LIST:
-                       return str_list_compare (parm_table[i].def.lvalue, 
-                                               *(char ***)parm_table[i].ptr);
+                       return str_list_equal((const char **)parm_table[i].def.lvalue, 
+                                             (const char **)(*(char ***)parm_table[i].ptr));
                case P_STRING:
                case P_USTRING:
                        return strequal(parm_table[i].def.svalue,
@@ -2915,8 +2941,8 @@ static void lp_save_defaults(void)
                        continue;
                switch (parm_table[i].type) {
                        case P_LIST:
-                               str_list_copy(&(parm_table[i].def.lvalue),
-                                           *(const char ***)parm_table[i].ptr);
+                               parm_table[i].def.lvalue = str_list_copy(talloc_autofree_context(), 
+                                                                        *(const char ***)parm_table[i].ptr);
                                break;
                        case P_STRING:
                        case P_USTRING:
@@ -2965,7 +2991,10 @@ static void set_server_role(void)
                case SEC_DOMAIN:
                case SEC_ADS:
                        if (lp_domain_logons()) {
-                               server_role = ROLE_DOMAIN_PDC;
+                               if (Globals.bDomainMaster) /* auto or yes */ 
+                                       server_role = ROLE_DOMAIN_PDC;
+                               else
+                                       server_role = ROLE_DOMAIN_BDC;
                                break;
                        }
                        server_role = ROLE_DOMAIN_MEMBER;
@@ -3075,9 +3104,6 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
                lp_do_parameter(-1, "wins server", "127.0.0.1");
        }
 
-       lp_do_parameter(-1, "gensec:krb5", "False");
-       lp_do_parameter(-1, "gensec:ms_krb5", "False");
-
        init_iconv();
 
        return (bRetval);
@@ -3224,6 +3250,9 @@ static void set_default_server_announce_type(void)
 
        if (lp_host_msdfs())
                default_server_announce |= SV_TYPE_DFS_SERVER;
+
+       /* TODO: only announce us as print server when we are a print server */
+       default_server_announce |= SV_TYPE_PRINTQ_SERVER;
 }
 
 /***********************************************************
Samba Shared Repository