more merging

it is now at the stage that winbindd can compile in the head branch,
but not link
(This used to be commit d178c00aae77710ae6ff20a7f54a30e3bd8232bb)

1 files changed, 5 insertions, 0 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index ec786985d3..4d6a2f88b4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1283,6 +1283,10 @@ char *lp_domain_admin_users(void);
 char *lp_domain_guest_users(void);
 char *lp_nt_forms(void);
 char *lp_nt_drivers_file(void);
+char *lp_winbind_uid(void);
+char *lp_winbind_gid(void);
+char *lp_template_homedir(void);
+char *lp_template_shell(void);
 char *lp_ldap_server(void);
 char *lp_ldap_suffix(void);
 char *lp_ldap_filter(void);
@@ -1460,6 +1464,7 @@ int lp_printing(int );
 int lp_oplock_contention_limit(int );
 int lp_write_cache_size(int );
 char lp_magicchar(int );
+int lp_winbind_cache_time(void);
 BOOL lp_add_home(char *pszHomename, int iDefaultService, char *pszHomedir);
 int lp_add_service(char *pszService, int iDefaultService);
 BOOL lp_add_printer(char *pszPrintername, int iDefaultService);