r17206: Add a modular API for share configuration.

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

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c46cf51f4b6aa3ce633404dce867813429a16cfd..64713f74cfb7c273b774346e595021ed2915a542 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -68,6 +68,8 @@
 
 static BOOL bLoaded = False;
 
+#define standard_sub_basic(str,len)
+
 /* some helpful bits */
 #define LP_SNUM_OK(i) (((i) >= 0) && ((i) < iNumServices) && ServicePtrs[(i)]->valid)
 #define VALID(i) ServicePtrs[i]->valid
@@ -105,6 +107,7 @@ typedef struct
        char *szAutoServices;
        char *szPasswdChat;
        char *szConfigFile;
+       char *szShareBackend;
        char *szSAM_URL;
        char *szSPOOLSS_URL;
        char *szWINS_CONFIG_URL;
@@ -139,8 +142,10 @@ typedef struct
        int max_mux;
        int max_xmit;
        int pwordlevel;
-       int maxprotocol;
-       int minprotocol;
+       int srv_maxprotocol;
+       int srv_minprotocol;
+       int cli_maxprotocol;
+       int cli_minprotocol;
        int security;
        char **AuthMethods;
        int paranoid_server_security;
@@ -448,8 +453,10 @@ static struct parm_struct parm_table[] = {
        {"tls crlfile", P_STRING, P_GLOBAL, &Globals.tls_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"swat directory", P_STRING, P_GLOBAL, &Globals.swat_directory, 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},
+       {"server max protocol", P_ENUM, P_GLOBAL, &Globals.srv_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
+       {"server min protocol", P_ENUM, P_GLOBAL, &Globals.srv_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
+       {"client max protocol", P_ENUM, P_GLOBAL, &Globals.cli_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
+       {"client min protocol", P_ENUM, P_GLOBAL, &Globals.cli_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
        {"unicode", P_BOOL, P_GLOBAL, &Globals.bUnicode, NULL, NULL, FLAG_DEVELOPER},
        {"read raw", P_BOOL, P_GLOBAL, &Globals.bReadRaw, NULL, NULL, FLAG_DEVELOPER},
        {"write raw", P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, FLAG_DEVELOPER},
@@ -525,6 +532,7 @@ static struct parm_struct parm_table[] = {
        {"Miscellaneous Options", P_SEP, P_SEPARATOR},
        
        {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
+       {"share backend", P_STRING, P_GLOBAL, &Globals.szShareBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
@@ -585,6 +593,8 @@ static void init_globals(void)
 
        do_parameter("config file", dyn_CONFIGFILE, NULL);
 
+       do_parameter("share backend", "classic", NULL);
+       
        do_parameter("server role", "standalone", NULL);
 
        /* options that can be set on the command line must be initialised via
@@ -647,8 +657,10 @@ static void init_globals(void)
        do_parameter("max xmit", "12288", NULL);
        do_parameter("password level", "0", NULL);
        do_parameter("LargeReadwrite", "True", NULL);
-       do_parameter("min protocol", "CORE", NULL);
-       do_parameter("max protocol", "NT1", NULL);
+       do_parameter("server min protocol", "CORE", NULL);
+       do_parameter("server max protocol", "NT1", NULL);
+       do_parameter("client min protocol", "CORE", NULL);
+       do_parameter("client max protocol", "NT1", NULL);
        do_parameter("security", "USER", NULL);
        do_parameter("paranoid server security", "True", NULL);
        do_parameter("EncryptPasswords", "True", NULL);
@@ -784,7 +796,7 @@ static const char *lp_string(const char *s)
 #define FN_GLOBAL_LIST(fn_name,ptr) \
  const char **fn_name(void) {return(*(const char ***)(ptr));}
 #define FN_GLOBAL_BOOL(fn_name,ptr) \
- BOOL fn_name(void) {return(*(BOOL *)(ptr));}
+ BOOL fn_name(void) {return((BOOL)*(int *)(ptr));}
 #define FN_GLOBAL_CHAR(fn_name,ptr) \
  char fn_name(void) {return(*(char *)(ptr));}
 #define FN_GLOBAL_INTEGER(fn_name,ptr) \
@@ -821,6 +833,7 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile)
 _PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
 _PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
 _PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, &Globals.szShareBackend)
 _PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, &Globals.szWINS_CONFIG_URL)
@@ -882,8 +895,10 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_maxprotocol, &Globals.srv_maxprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, &Globals.srv_minprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, &Globals.cli_maxprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, &Globals.cli_minprotocol)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &Globals.security)
 _PUBLIC_ FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
@@ -1443,7 +1458,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, int *
 
                        switch (parm_table[i].type) {
                                case P_BOOL:
-                                       *(BOOL *)dest_ptr = *(BOOL *)src_ptr;
+                                       *(int *)dest_ptr = *(int *)src_ptr;
                                        break;
 
                                case P_INTEGER:
@@ -1701,6 +1716,7 @@ static void init_copymap(service * pservice)
                        pservice->copymap[i] = True;
 }
 
+#if 0 /* not used anywhere */
 /***************************************************************************
  Return the local pointer to a parameter given the service number and the 
  pointer into the default structure.
@@ -1710,7 +1726,7 @@ void *lp_local_ptr(int snum, void *ptr)
 {
        return (void *)(((char *)ServicePtrs[snum]) + PTR_DIFF(ptr, &sDefault));
 }
-
+#endif
 
 /***************************************************************************
  Process a parametric option
@@ -2035,7 +2051,7 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                        break;
 
                case P_BOOL:
-                       fprintf(f, "%s", BOOLSTR(*(BOOL *)ptr));
+                       fprintf(f, "%s", BOOLSTR((BOOL)*(int *)ptr));
                        break;
 
                case P_INTEGER:
@@ -2072,7 +2088,7 @@ static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
 {
        switch (type) {
                case P_BOOL:
-                       return (*((BOOL *)ptr1) == *((BOOL *)ptr2));
+                       return (*((int *)ptr1) == *((int *)ptr2));
 
                case P_INTEGER:
                case P_BYTES:
@@ -2162,7 +2178,7 @@ static BOOL is_default(int i)
                                        *(char **)parm_table[i].ptr);
                case P_BOOL:
                        return parm_table[i].def.bvalue ==
-                               *(BOOL *)parm_table[i].ptr;
+                               *(int *)parm_table[i].ptr;
                case P_INTEGER:
                case P_BYTES:
                case P_ENUM:
@@ -2543,6 +2559,24 @@ int lp_servicenumber(const char *pszServiceName)
        return (iService);
 }
 
+int lp_find_valid_service(const char *pszServiceName)
+{
+       int iService;
+
+       iService = lp_servicenumber(pszServiceName);
+
+       if (iService >= 0 && !lp_snum_ok(iService)) {
+               DEBUG(0,("lp_find_valid_service: Invalid snum %d for '%s'\n",iService, pszServiceName));
+               iService = -1;
+       }
+
+       if (iService == -1) {
+               DEBUG(3,("lp_find_valid_service: failed to find service '%s'\n", pszServiceName));
+       }
+
+       return iService;
+}
+
 /*******************************************************************
  A useful volume label function. 
 ********************************************************************/