r5502: announce us as a print server by default

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

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index c6a58386ece40af9387dfff776358df7c8215b8b..33026dd9e07d8cb1069d85c9db84a40bef007606 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -933,7 +933,7 @@ 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("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);
@@ -1053,6 +1053,9 @@ static void init_globals(void)
        do_parameter("nbt port", "137");
 
        do_parameter("nt status support", "True");
+
+       do_parameter("max wins ttl", "432000");
+       do_parameter("min wins ttl", "10");
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1441,7 +1444,7 @@ const char **lp_parm_string_list(int lookup_service, const char *type, const cha
        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;
 }
@@ -1859,7 +1862,8 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       *(const 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;
@@ -1922,6 +1926,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)
@@ -2371,7 +2376,8 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
 
                case P_LIST:
-                       *(const 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:
@@ -2931,7 +2937,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:
@@ -3240,6 +3246,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;
 }
 
 /***********************************************************