[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-141-g5baac15

[Jelmer Vernooij]

The branch, master has been updated
       via  5baac15781779a3ebfa3807299e5329809835370 (commit)
       via  c9d193eb08b036c5196d63c22790f3cd3583ba82 (commit)
      from  8b804077128cd981bf238b2506c589dff3bf8ff4 (commit)

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


- Log -----------------------------------------------------------------
commit 5baac15781779a3ebfa3807299e5329809835370
Merge: c9d193eb08b036c5196d63c22790f3cd3583ba82 8b804077128cd981bf238b2506c589dff3bf8ff4
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jan 25 05:35:21 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit c9d193eb08b036c5196d63c22790f3cd3583ba82
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jan 25 05:32:30 2009 +0100

    Add prototypes required by samba-gtk.

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

Summary of changes:
 source4/auth/credentials/credentials.h |    9 +++++++++
 source4/librpc/rpc/dcerpc.h            |    2 ++
 2 files changed, 11 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index a4fe3f2..3c2fb8f 100644
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -186,8 +186,17 @@ void cli_credentials_set_kerberos_state(struct cli_credentials *creds,
 bool cli_credentials_set_domain(struct cli_credentials *cred, 
 				const char *val, 
 				enum credentials_obtained obtained);
+bool cli_credentials_set_domain_callback(struct cli_credentials *cred,
+					 const char *(*domain_cb) (struct cli_credentials *));
 bool cli_credentials_set_username(struct cli_credentials *cred, 
 				  const char *val, enum credentials_obtained obtained);
+bool cli_credentials_set_username_callback(struct cli_credentials *cred,
+				  const char *(*username_cb) (struct cli_credentials *));
+bool cli_credentials_set_principal(struct cli_credentials *cred, 
+				   const char *val, 
+				   enum credentials_obtained obtained);
+bool cli_credentials_set_principal_callback(struct cli_credentials *cred,
+				  const char *(*principal_cb) (struct cli_credentials *));
 bool cli_credentials_set_password(struct cli_credentials *cred, 
 				  const char *val, 
 				  enum credentials_obtained obtained);
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index b2e3a8c..d6619ac 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -385,4 +385,6 @@ typedef NTSTATUS (*dcerpc_call_fn) (struct dcerpc_pipe *, TALLOC_CTX *, void *);
 
 enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
 
+const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
+
 #endif /* __DCERPC_H__ */


-- 
Samba Shared Repository