summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-01 11:10:47 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-01 04:19:05 +0200
commitec9ff19e60907d6858c6a04f3fcd0e61d5c83100 (patch)
treea8e224ee466600793fc4030b5c963eeb666beb48
parent7630e73dac6562f91f05fdf09940ad3f1511a66e (diff)
downloadsamba-ec9ff19e60907d6858c6a04f3fcd0e61d5c83100.tar.gz
samba-ec9ff19e60907d6858c6a04f3fcd0e61d5c83100.tar.bz2
samba-ec9ff19e60907d6858c6a04f3fcd0e61d5c83100.zip
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
-rw-r--r--docs-xml/smbdotconf/security/passwordserver.xml8
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/param/loadparm.c2
3 files changed, 2 insertions, 10 deletions
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 0ac39f103c..09d335c3ac 100644
--- 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 83382594f9..82bea2e122 100644
--- 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 08597adf2a..02b08a60a2 100644
--- 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)