The branch, v3-6-test has been updated via fb85cf6 s3-proto: remove remaining nss_info prototypes to nss_info.h from 40d20d1 s3: Document gpfs:syncio
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit fb85cf65b0cc36a568df03dd0fbc6a605fa17b08 Author: Günther Deschner <g...@samba.org> Date: Fri Apr 29 15:02:49 2011 +0200 s3-proto: remove remaining nss_info prototypes to nss_info.h Guenther (cherry picked from commit d6289641f5d421d188c37819f5fe8ceeb5a86aba) ----------------------------------------------------------------------- Summary of changes: source3/include/nss_info.h | 7 +++++++ source3/include/proto.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/nss_info.h b/source3/include/nss_info.h index bf66ef0..f92937e 100644 --- a/source3/include/nss_info.h +++ b/source3/include/nss_info.h @@ -95,5 +95,12 @@ NTSTATUS nss_map_from_alias( TALLOC_CTX *mem_ctx, const char *domain, NTSTATUS nss_close( const char *parameters ); +/* The following definitions come from winbindd/nss_info.c */ + + +/* The following definitions come from winbindd/nss_info_template.c */ + +NTSTATUS nss_info_template_init( void ); + #endif /* _IDMAP_NSS_H_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 6c76029..fedc951 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2803,13 +2803,6 @@ int sessionid_traverse_read(int (*fn)(const char *key, char *stdin_new_passwd( void); char *get_pass( const char *prompt, bool stdin_get); -/* The following definitions come from winbindd/nss_info.c */ - - -/* The following definitions come from winbindd/nss_info_template.c */ - -NTSTATUS nss_info_template_init( void ); - /* The following definitions come from lib/avahi.c */ struct AvahiPoll *tevent_avahi_poll(TALLOC_CTX *mem_ctx, -- Samba Shared Repository