[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue May 31 21:31:02 MDT 2011
The branch, master has been updated
via 5a8218b s3-param Make lp_ncalrpc_dir() const
via b9d61ef s3-param Make lp_dedicated_keytab_file() const
via edc3041 s3-param Make lp_realm() const
via 860b437 s3-param Make lp_name_resolv_order() const
via 08a72f3 s3-param Make lp_utmpdir() and lp_wtmpdir const
via 47ece3f s3-param Make lp_piddir() const
via a0758bb s3-param Make lp_cachedir() const
via 9aef68f s3-param Make lp_statedir() const
via 5f17637 s3-param Make lp_lockdir() const
via f331936 s3-param Make lp_smb_passwd_file() and lp_private_dir() const
via a74e7fb s3-param Make lp_smb_ports() const
via f52b97a s3-param Make charset parameters const
via ec9ff19 s3-param Make lp_passwordserver() const.
via 7630e73 s3-param prepare for some lp_ functions to return const
from c7d2f6d Remove the char * argument from the SMB_VFS_GETWD() call. Now always returns malloc'ed memory.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5a8218b147ac62c065903591a15360a906da9bec
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 12:18:00 2011 +1000
s3-param Make lp_ncalrpc_dir() const
This disables % substitutions in the 'ncalrpc dir' parameter. This is
used as a communication point between multiple parts of the codebase,
and needs to be internally consistent between all the Samba tasks.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed Jun 1 05:30:53 CEST 2011 on sn-devel-104
commit b9d61ef55a45bc58d7e0c6dae0969cf938974020
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 12:15:48 2011 +1000
s3-param Make lp_dedicated_keytab_file() const
This disables % substitutions in the 'dedicated keytab file' parameter.
Andrew Bartlett
commit edc3041093b17ae6e18c5b7a64a94b5bfb3c3998
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:55:59 2011 +1000
s3-param Make lp_realm() const
This disables % substitutions in the 'realm' parameter. This is
used all over the codebase, and needs to be internally consistent
between all the Samba tasks.
Andrew Bartlett
commit 860b43737c0544cf651c2e93a30ca65f3f347219
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:54:52 2011 +1000
s3-param Make lp_name_resolv_order() const
This disables % substitutions in the 'name resolv order' parameter. This is
used all over the codebase, and needs to be internally consistent
between all the Samba tasks.
Andrew Bartlett
commit 08a72f3a1571649eb52c7e06bab2789e0887c173
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:53:21 2011 +1000
s3-param Make lp_utmpdir() and lp_wtmpdir const
This disables % substitutions in the 'utmp dir' and 'wtmp dir'
parameters. These are system paths, and need to be consistent between
all the Samba tasks.
Andrew Bartlett
commit 47ece3f897305970999fbcf012229105838c3687
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:52:07 2011 +1000
s3-param Make lp_piddir() const
This disables % substitutions in the 'pid dir' parameter. This is
used all over the codebase, and need to be internally consistent
between all the Samba tasks.
Andrew Bartlett
commit a0758bb5e5035a2547808a1fc89fe4fef51ed90c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:51:12 2011 +1000
s3-param Make lp_cachedir() const
This disables % substitutions in the 'cache dir' parameter. This is
used all over the codebase, and need to be internally consistent
between all the Samba tasks.
Andrew Bartlett
commit 9aef68f4c2791227186fa81f1ec19c40df435e18
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:48:38 2011 +1000
s3-param Make lp_statedir() const
This disables % substitutions in the 'state dir' parameter. This is
used all over the codebase, and need to be internally consistent
between all the Samba tasks.
Andrew Bartlett
commit 5f176378a802703778ae07c36e95fe186b6e57a8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:45:44 2011 +1000
s3-param Make lp_lockdir() const
This disables % substitutions in the 'lock dir' parameter. This is
used all over the codebase, and needs to be internally consistent
for the life of the process, as they determine the location of
our locking databases.
Andrew Bartlett
commit f331936db2990589047edd4aee61ac298262123d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:19:21 2011 +1000
s3-param Make lp_smb_passwd_file() and lp_private_dir() const
This disables % substitutions in the 'smb passwd file' and 'private
dir' parameters. These are used all over the codebase, and need to be
internally consistent for the life of the process, as they determine
the location of secrets.tdb, as well as the passdb databases.
Andrew Bartlett
commit a74e7fbc6abb16e85eb6ac14193be0e0f664a6f0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:18:09 2011 +1000
s3-param Make lp_smb_ports() const
It makes no sense to have a % substiution in the 'smb ports' parameter.
Andrew Bartlett
commit f52b97a1292e4e84fccd4601d341de857cc5e586
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:13:30 2011 +1000
s3-param Make charset parameters const
This removes the dangerous ability for these parameters to change
based on % substitutions.
Andrew Bartlett
commit ec9ff19e60907d6858c6a04f3fcd0e61d5c83100
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:10:47 2011 +1000
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
commit 7630e73dac6562f91f05fdf09940ad3f1511a66e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 1 11:09:39 2011 +1000
s3-param prepare for some lp_ functions to return const
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/security/passwordserver.xml | 8 ----
source3/include/proto.h | 34 ++++++++--------
source3/libads/ldap.c | 2 +-
source3/param/loadparm.c | 50 +++++++++++-----------
source3/smbd/server.c | 2 +-
5 files changed, 44 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 0ac39f1..09d335c 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 8338259..c6fd38d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1175,14 +1175,14 @@ NTSTATUS change_trust_account_password( const char *domain, const char *remote_m
/* The following definitions come from param/loadparm.c */
-char *lp_smb_ports(void);
-char *lp_dos_charset(void);
-char *lp_unix_charset(void);
-char *lp_display_charset(void);
+const char *lp_smb_ports(void);
+const char *lp_dos_charset(void);
+const char *lp_unix_charset(void);
+const char *lp_display_charset(void);
char *lp_logfile(void);
char *lp_configfile(void);
-char *lp_smb_passwd_file(void);
-char *lp_private_dir(void);
+const char *lp_smb_passwd_file(void);
+const char *lp_private_dir(void);
char *lp_serverstring(void);
int lp_printcap_cache_time(void);
char *lp_addport_cmd(void);
@@ -1190,14 +1190,14 @@ char *lp_enumports_cmd(void);
char *lp_addprinter_cmd(void);
char *lp_deleteprinter_cmd(void);
char *lp_os2_driver_map(void);
-char *lp_lockdir(void);
-char *lp_statedir(void);
-char *lp_cachedir(void);
-char *lp_piddir(void);
+const char *lp_lockdir(void);
+const char *lp_statedir(void);
+const char *lp_cachedir(void);
+const char *lp_piddir(void);
char *lp_mangling_method(void);
int lp_mangle_prefix(void);
-char *lp_utmpdir(void);
-char *lp_wtmpdir(void);
+const char *lp_utmpdir(void);
+const char *lp_wtmpdir(void);
bool lp_utmp(void);
char *lp_rootdir(void);
char *lp_defaultservice(void);
@@ -1207,9 +1207,9 @@ 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);
-char *lp_name_resolve_order(void);
-char *lp_realm(void);
+const char *lp_passwordserver(void);
+const char *lp_name_resolve_order(void);
+const char *lp_realm(void);
const char *lp_afs_username_map(void);
int lp_afs_token_lifetime(void);
char *lp_log_nt_token_command(void);
@@ -1352,7 +1352,7 @@ bool lp_send_spnego_principal(void);
bool lp_hostname_lookups(void);
bool lp_change_notify(const struct share_params *p );
bool lp_kernel_change_notify(const struct share_params *p );
-char * lp_dedicated_keytab_file(void);
+const char * lp_dedicated_keytab_file(void);
int lp_kerberos_method(void);
bool lp_defer_sharing_violations(void);
bool lp_enable_privileges(void);
@@ -1660,7 +1660,7 @@ int lp_min_receive_file_size(void);
char* lp_perfcount_module(void);
void lp_set_passdb_backend(const char *backend);
void widelinks_warning(int snum);
-char *lp_ncalrpc_dir(void);
+const char *lp_ncalrpc_dir(void);
/* The following definitions come from param/loadparm_server_role.c */
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 19cb3ad..375dc3b 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -529,7 +529,7 @@ ADS_STATUS ads_connect_gc(ADS_STRUCT *ads)
TALLOC_CTX *frame = talloc_stackframe();
struct dns_rr_srv *gcs_list;
int num_gcs;
- char *realm = ads->server.realm;
+ const char *realm = ads->server.realm;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
ADS_STATUS ads_status = ADS_ERROR_NT(NT_STATUS_UNSUCCESSFUL);
int i;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 08597ad..c4cb37b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5564,14 +5564,14 @@ static char *lp_string(const char *s)
#define FN_LOCAL_CHAR(fn_name,val) \
char fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
-FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports)
-FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
-FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
-FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
+FN_GLOBAL_CONST_STRING(lp_smb_ports, &Globals.smb_ports)
+FN_GLOBAL_CONST_STRING(lp_dos_charset, &Globals.dos_charset)
+FN_GLOBAL_CONST_STRING(lp_unix_charset, &Globals.unix_charset)
+FN_GLOBAL_CONST_STRING(lp_display_charset, &Globals.display_charset)
FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)
FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
-FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile)
-FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
+FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile)
+FN_GLOBAL_CONST_STRING(lp_private_dir, &Globals.szPrivateDir)
FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
FN_GLOBAL_INTEGER(lp_printcap_cache_time, &Globals.PrintcapCacheTime)
FN_GLOBAL_STRING(lp_addport_cmd, &Globals.szAddPortCommand)
@@ -5579,33 +5579,33 @@ FN_GLOBAL_STRING(lp_enumports_cmd, &Globals.szEnumPortsCommand)
FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_CONST_STRING(lp_lockdir, &Globals.szLockDir)
/* If lp_statedir() and lp_cachedir() are explicitely set during the
* build process or in smb.conf, we use that value. Otherwise they
* default to the value of lp_lockdir(). */
-char *lp_statedir(void) {
+const char *lp_statedir(void) {
if ((strcmp(get_dyn_STATEDIR(), get_dyn_LOCKDIR()) != 0) ||
(strcmp(get_dyn_STATEDIR(), Globals.szStateDir) != 0))
- return(lp_string(*(char **)(&Globals.szStateDir) ?
- *(char **)(&Globals.szStateDir) : ""));
+ return(*(char **)(&Globals.szStateDir) ?
+ *(char **)(&Globals.szStateDir) : "");
else
- return(lp_string(*(char **)(&Globals.szLockDir) ?
- *(char **)(&Globals.szLockDir) : ""));
+ return(*(char **)(&Globals.szLockDir) ?
+ *(char **)(&Globals.szLockDir) : "");
}
-char *lp_cachedir(void) {
+const char *lp_cachedir(void) {
if ((strcmp(get_dyn_CACHEDIR(), get_dyn_LOCKDIR()) != 0) ||
(strcmp(get_dyn_CACHEDIR(), Globals.szCacheDir) != 0))
- return(lp_string(*(char **)(&Globals.szCacheDir) ?
- *(char **)(&Globals.szCacheDir) : ""));
+ return(*(char **)(&Globals.szCacheDir) ?
+ *(char **)(&Globals.szCacheDir) : "");
else
- return(lp_string(*(char **)(&Globals.szLockDir) ?
- *(char **)(&Globals.szLockDir) : ""));
+ return(*(char **)(&Globals.szLockDir) ?
+ *(char **)(&Globals.szLockDir) : "");
}
-FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
+FN_GLOBAL_CONST_STRING(lp_piddir, &Globals.szPidDir)
FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
-FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
+FN_GLOBAL_CONST_STRING(lp_utmpdir, &Globals.szUtmpDir)
+FN_GLOBAL_CONST_STRING(lp_wtmpdir, &Globals.szWtmpDir)
FN_GLOBAL_BOOL(lp_utmp, &Globals.bUtmp)
FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
FN_GLOBAL_STRING(lp_perfcount_module, &Globals.szSMBPerfcountModule)
@@ -5616,9 +5616,9 @@ 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_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
-FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
+FN_GLOBAL_CONST_STRING(lp_passwordserver, &Globals.szPasswordServer)
+FN_GLOBAL_CONST_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
+FN_GLOBAL_CONST_STRING(lp_realm, &Globals.szRealm)
FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)
FN_GLOBAL_STRING(lp_log_nt_token_command, &Globals.szLogNtTokenCommand)
@@ -5823,7 +5823,7 @@ FN_GLOBAL_BOOL(lp_send_spnego_principal, &Globals.send_spnego_principal)
FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
FN_LOCAL_PARM_BOOL(lp_change_notify, bChangeNotify)
FN_LOCAL_PARM_BOOL(lp_kernel_change_notify, bKernelChangeNotify)
-FN_GLOBAL_STRING(lp_dedicated_keytab_file, &Globals.szDedicatedKeytabFile)
+FN_GLOBAL_CONST_STRING(lp_dedicated_keytab_file, &Globals.szDedicatedKeytabFile)
FN_GLOBAL_INTEGER(lp_kerberos_method, &Globals.iKerberosMethod)
FN_GLOBAL_BOOL(lp_defer_sharing_violations, &Globals.bDeferSharingViolations)
FN_GLOBAL_BOOL(lp_enable_privileges, &Globals.bEnablePrivileges)
@@ -6048,7 +6048,7 @@ FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
-FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
+FN_GLOBAL_CONST_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
/* local prototypes */
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index fc6ab3a..5aa3ddb 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -597,7 +597,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
{
int num_interfaces = iface_count();
int i;
- char *ports;
+ const char *ports;
unsigned dns_port = 0;
#ifdef HAVE_ATEXIT
--
Samba Shared Repository
More information about the samba-cvs
mailing list