r3957: fix compiler warning

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

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c535509ca6080afc2a583f5183b5d5d6dd80e881..978d86a9a3ada1093c724b049b3d8ee48c887946 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -59,7 +59,7 @@
 #include "system/network.h"
 #include "system/printing.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
-#include "include/dlinklist.h"
+#include "dlinklist.h"
 
 BOOL in_client = False;                /* Not in the client by default */
 static BOOL bLoaded = False;
@@ -470,12 +470,6 @@ static const struct enum_list enum_announce_as[] = {
        {-1, NULL}
 };
 
-static const struct enum_list enum_case[] = {
-       {CASE_LOWER, "lower"},
-       {CASE_UPPER, "upper"},
-       {-1, NULL}
-};
-
 static const struct enum_list enum_bool_auto[] = {
        {False, "No"},
        {False, "False"},
@@ -928,7 +922,7 @@ static void init_globals(void)
        do_parameter("fstype", FSTYPE_STRING);
        do_parameter("ntvfs handler", "unixuid default");
 
-       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg");
+       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("auth methods", "guest sam_ignoredomain");
        do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE);
@@ -1179,7 +1173,6 @@ FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync)
 FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
 FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
 FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
-static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
 FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
 FN_GLOBAL_LIST(lp_preload_modules, &Globals.szPreloadModules)
 FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
@@ -2820,28 +2813,6 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
 }
 
 
-#if 0
-/***************************************************************************
- Display the contents of a single copy structure.
-***************************************************************************/
-static void dump_copy_map(BOOL *pcopymap)
-{
-       int i;
-       if (!pcopymap)
-               return;
-
-       printf("\n\tNon-Copied parameters:\n");
-
-       for (i = 0; parm_table[i].label; i++)
-               if (parm_table[i].class == P_LOCAL &&
-                   parm_table[i].ptr && !pcopymap[i] &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
-               {
-                       printf("\t\t%s\n", parm_table[i].label);
-               }
-}
-#endif
-
 /***************************************************************************
  Return TRUE if the passed service number is within range.
 ***************************************************************************/
@@ -3309,60 +3280,11 @@ void lp_copy_service(int snum, const char *new_name)
 /*******************************************************************
  Get the default server type we will announce as via nmbd.
 ********************************************************************/
-
 int lp_default_server_announce(void)
 {
        return default_server_announce;
 }
 
-/*******************************************************************
- Split the announce version into major and minor numbers.
-********************************************************************/
-
-int lp_major_announce_version(void)
-{
-       static BOOL got_major = False;
-       static int major_version = DEFAULT_MAJOR_VERSION;
-       const char *vers;
-       char *p;
-
-       if (got_major)
-               return major_version;
-
-       got_major = True;
-       if ((vers = lp_announce_version()) == NULL)
-               return major_version;
-
-       if ((p = strchr_m(vers, '.')) == 0)
-               return major_version;
-
-       *p = '\0';
-       major_version = atoi(vers);
-       return major_version;
-}
-
-int lp_minor_announce_version(void)
-{
-       static BOOL got_minor = False;
-       static int minor_version = DEFAULT_MINOR_VERSION;
-       const char *vers;
-       char *p;
-
-       if (got_minor)
-               return minor_version;
-
-       got_minor = True;
-       if ((vers = lp_announce_version()) == NULL)
-               return minor_version;
-
-       if ((p = strchr_m(vers, '.')) == 0)
-               return minor_version;
-
-       p++;
-       minor_version = atoi(p);
-       return minor_version;
-}
-
 const char *lp_printername(int snum)
 {
        const char *ret = _lp_printername(snum);