[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  8b68349... s4:auth: add auth_get_server_info_principal() prototype to auth.h
       via  27349a6... s4:auth: make auth_challenge_may_be_modified() public
       via  af25fb5... s4:auth: remove autogenerated auth/ntlm/auth_proto.h
      from  4afb211... s3:ntlmssp: remove unused p24 variable from ntlmssp_sign_init()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8b68349442a37d987b496344133d309f8af853cb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 29 11:50:46 2009 +0100

    s4:auth: add auth_get_server_info_principal() prototype to auth.h
    
    metze

commit 27349a68ea11493029bf0dbdf7399b70d7fe6ea4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 29 11:40:09 2009 +0100

    s4:auth: make auth_challenge_may_be_modified() public
    
    metze

commit af25fb55c0adb8ca0b552ace607ee285023c2652
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 29 11:51:37 2009 +0100

    s4:auth: remove autogenerated auth/ntlm/auth_proto.h
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                     |    2 +-
 source4/auth/auth.h            |    7 ++++-
 source4/auth/ntlm/auth.c       |    2 +-
 source4/auth/ntlm/auth_proto.h |   50 ----------------------------------------
 4 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 source4/auth/ntlm/auth_proto.h


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index e88fad0..4f93726 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,7 +119,7 @@ source3/samba4-data.mk
 source3/samba4-config.mk
 source3/torture.tdb
 source4/apidocs
-source4/auth/auth_proto.h
+source4/auth/ntlm/auth_proto.h
 source4/auth/auth_sam.h
 source4/auth/auth_sam_reply.h
 source4/auth/credentials/credentials_krb5_proto.h
diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 28b955a..fa2329d 100644
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -284,9 +284,14 @@ NTSTATUS auth_check_password_recv(struct tevent_req *req,
 				  TALLOC_CTX *mem_ctx,
 				  struct auth_serversupplied_info **server_info);
 
-
+bool auth_challenge_may_be_modified(struct auth_context *auth_ctx);
 NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, const uint8_t chal[8], const char *set_by);
 
+NTSTATUS auth_get_server_info_principal(TALLOC_CTX *mem_ctx,
+					struct auth_context *auth_ctx,
+					const char *principal,
+					struct auth_serversupplied_info **server_info);
+
 NTSTATUS samba_server_gensec_start(TALLOC_CTX *mem_ctx,
 				   struct tevent_context *event_ctx,
 				   struct messaging_context *msg_ctx,
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index fafaf9c..d5df387 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -43,7 +43,7 @@ _PUBLIC_ NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, cons
 /***************************************************************************
  Set a fixed challenge
 ***************************************************************************/
-bool auth_challenge_may_be_modified(struct auth_context *auth_ctx) 
+_PUBLIC_ bool auth_challenge_may_be_modified(struct auth_context *auth_ctx)
 {
 	return auth_ctx->challenge.may_be_modified;
 }
diff --git a/source4/auth/ntlm/auth_proto.h b/source4/auth/ntlm/auth_proto.h
deleted file mode 100644
index 5e8c725..0000000
--- a/source4/auth/ntlm/auth_proto.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __AUTH_NTLM_AUTH_PROTO_H__
-#define __AUTH_NTLM_AUTH_PROTO_H__
-
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
-/* This file was automatically generated by mkproto.pl. DO NOT EDIT */
-
-/* this file contains prototypes for functions that are private 
- * to this subsystem or library. These functions should not be 
- * used outside this particular subsystem! */
-
-
-/* The following definitions come from auth/ntlm/auth.c  */
-
-
-/***************************************************************************
- Set a fixed challenge
-***************************************************************************/
-bool auth_challenge_may_be_modified(struct auth_context *auth_ctx) ;
-const struct auth_operations *auth_backend_byname(const char *name);
-const struct auth_critical_sizes *auth_interface_version(void);
-NTSTATUS server_service_auth_init(void);
-
-/* The following definitions come from auth/ntlm/auth_util.c  */
-
-NTSTATUS auth_get_challenge_not_implemented(struct auth_method_context *ctx, TALLOC_CTX *mem_ctx, uint8_t chal[8]);
-
-/****************************************************************************
- Create an auth_usersupplied_data structure after appropriate mapping.
-****************************************************************************/
-NTSTATUS map_user_info(TALLOC_CTX *mem_ctx,
-		       const char *default_domain,
-		       const struct auth_usersupplied_info *user_info,
-		       struct auth_usersupplied_info **user_info_mapped);
-
-/****************************************************************************
- Create an auth_usersupplied_data structure after appropriate mapping.
-****************************************************************************/
-NTSTATUS encrypt_user_info(TALLOC_CTX *mem_ctx, struct auth_context *auth_context, 
-			   enum auth_password_state to_state,
-			   const struct auth_usersupplied_info *user_info_in,
-			   const struct auth_usersupplied_info **user_info_encrypted);
-
-/* The following definitions come from auth/ntlm/auth_simple.c  */
-
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
-
-#endif /* __AUTH_NTLM_AUTH_PROTO_H__ */
-


-- 
Samba Shared Repository