s3-param Make lp_passwordserver() const.

This means that it no longer takes % substituations, and so the documentation for this behaviour is removed from the smb.conf manpage.  (This mode is only useful in security=server, which is already marked as deprecated in 3.6).

Andrew Bartlett

diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 0ac39f103cefd84b65848947f9b02df4d6e2a5c4..09d335c3ac036945dbffc86cb0b224b3cb716998 100644 (file)
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -82,14 +82,6 @@
          This will cause a loop and could lock up your Samba  server!</para>
        </listitem>
 
-       <listitem>
-         <para>The name of the password server takes the standard 
-         substitutions, but probably the only useful one is <parameter moreinfo="none">%m
-         </parameter>, which means the Samba server will use the incoming 
-         client as the password server. If you use this then you better 
-         trust your clients, and you had better restrict them with hosts allow!</para>
-       </listitem>
-
     </itemizedlist>
 </description>
 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 83382594f91ce532af77e0bc7a996a1ae9e8f14f..82bea2e1220c40a90008183c246930e3134ae182 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1207,7 +1207,7 @@ char *lp_set_quota_command(void);
 char *lp_auto_services(void);
 char *lp_passwd_program(void);
 char *lp_passwd_chat(void);
-char *lp_passwordserver(void);
+const char *lp_passwordserver(void);
 char *lp_name_resolve_order(void);
 char *lp_realm(void);
 const char *lp_afs_username_map(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 08597adf2a2612509913a4d24fe0bfb4725ed930..02b08a60a234c6e14f161831f9770c4fac1ca079 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5616,7 +5616,7 @@ FN_GLOBAL_STRING(lp_set_quota_command, &Globals.szSetQuota)
 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_CONST_STRING(lp_passwordserver, &Globals.szPasswordServer)
 FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
 FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
 FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)