r6902: Turn the LDAP server on by default. It is no worse than the others...

[samba.git] / source / param / loadparm.c

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index f83754599997d244fd0c117196ef9cc0f9871336..649c28098ce7b6fea2112cc122ffca2e97e0634f 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -133,7 +133,7 @@ struct parm_struct
                int ivalue;
                char *svalue;
                char cvalue;
-               char **lvalue;
+               const char **lvalue;
        } def;
 };
 
@@ -170,6 +170,7 @@ typedef struct
        char *szSMBPasswdFile;
        char *szSAM_URL;
        char *szSPOOLSS_URL;
+       char *szWINS_URL;
        char *szPrivateDir;
        char **szPreloadModules;
        char **szPasswordServers;
@@ -235,6 +236,8 @@ typedef struct
        int iLockSpinCount;
        int iLockSpinTime;
        int nbt_port;
+       int dgram_port;
+       int cldap_port;
        char *socket_options;
        BOOL bDNSproxy;
        BOOL bWINSsupport;
@@ -542,7 +545,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},
@@ -568,6 +571,7 @@ static struct parm_struct parm_table[] = {
        {"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},
@@ -615,6 +619,8 @@ static struct parm_struct parm_table[] = {
        
        {"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},
+       {"cldap port", P_INTEGER, P_GLOBAL, &Globals.cldap_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},
@@ -931,13 +937,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 dssetup");
-       do_parameter("server services", "smb rpc nbt");
+       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup");
+       do_parameter("server services", "smb rpc nbt ldap cldap");
        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);
 
@@ -1048,8 +1055,13 @@ static void init_globals(void)
 
        do_parameter("smb ports", SMB_PORTS);
        do_parameter("nbt port", "137");
+       do_parameter("dgram port", "138");
+       do_parameter("cldap port", "389");
 
        do_parameter("nt status support", "True");
+
+       do_parameter("max wins ttl", "432000");
+       do_parameter("min wins ttl", "10");
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1146,6 +1158,8 @@ static const char *lp_string(const char *s)
 
 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_INTEGER(lp_cldap_port, &Globals.cldap_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)
@@ -1154,6 +1168,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)
@@ -1431,13 +1446,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(NULL, value, separator);
+               return str_list_make(talloc_autofree_context(), value, separator);
 
        return NULL;
 }
@@ -1855,7 +1870,8 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       *(char ***)dest_ptr = str_list_copy(NULL, *(const char ***)src_ptr);
+                                       *(const char ***)dest_ptr = str_list_copy(talloc_autofree_context(), 
+                                                                                 *(const char ***)src_ptr);
                                        break;
                                default:
                                        break;
@@ -1918,6 +1934,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)
@@ -2028,7 +2045,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));
@@ -2367,7 +2384,8 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
 
                case P_LIST:
-                       *(char ***)parm_ptr = str_list_make(NULL, pszParmValue, NULL);
+                       *(const char ***)parm_ptr = str_list_make(talloc_autofree_context(), 
+                                                                 pszParmValue, NULL);
                        break;
 
                case P_STRING:
@@ -2506,6 +2524,8 @@ BOOL lp_set_option(const char *option)
 }
 
 
+#define BOOLSTR(b) ((b) ? "Yes" : "No")
+
 /***************************************************************************
  Print a parameter of the specified type.
 ***************************************************************************/
@@ -2925,7 +2945,7 @@ static void lp_save_defaults(void)
                        continue;
                switch (parm_table[i].type) {
                        case P_LIST:
-                               parm_table[i].def.lvalue = str_list_copy(NULL, 
+                               parm_table[i].def.lvalue = str_list_copy(talloc_autofree_context(), 
                                                                         *(const char ***)parm_table[i].ptr);
                                break;
                        case P_STRING:
@@ -3234,6 +3254,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;
 }
 
 /***********************************************************