diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-15 23:19:49 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-15 23:19:49 +0100 |
commit | 2be233ebe39d6ce584848a7e6bbd68b011dd6930 (patch) | |
tree | ca75915525e4414b57a8fdfaaf68175e990055cc /source3/include | |
parent | 1e419cd31bea64c664c36dee10fa9e843b6f76d6 (diff) | |
parent | 51118b1974fd91d7f60ed1a68e1eb5717690362b (diff) | |
download | samba-2be233ebe39d6ce584848a7e6bbd68b011dd6930.tar.gz samba-2be233ebe39d6ce584848a7e6bbd68b011dd6930.tar.bz2 samba-2be233ebe39d6ce584848a7e6bbd68b011dd6930.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 6c6bba3a71..24929f6d7f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4252,7 +4252,7 @@ const char *lp_ldap_machine_suffix(void); const char *lp_ldap_user_suffix(void); const char *lp_ldap_group_suffix(void); const char *lp_ldap_idmap_suffix(void); -void *lp_local_ptr(int snum, void *ptr); +void *lp_local_ptr_by_snum(int snum, void *ptr); bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue); void init_locals(void); bool lp_is_default(int snum, struct parm_struct *parm); |