[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2968-g63c1a51

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  63c1a5146e25e05678d2bef95286add5c95a5f38 (commit)
       via  b5f9176b6ca8c137d5c065abed943fa437b5531f (commit)
      from  64a4dfaa826cf9319ef3f5c65023352bf8af539e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 63c1a5146e25e05678d2bef95286add5c95a5f38
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 24 15:55:30 2008 +0200

    net ads: Fix typos.
    
    Karolin

commit b5f9176b6ca8c137d5c065abed943fa437b5531f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 24 15:53:23 2008 +0200

    rpc_client: Avoid warning in builds without krb5 headers.
    
    warning: ‘cli_auth_kerberos_data_destructor’ defined but not used
    
    Karolin

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

Summary of changes:
 source/rpc_client/cli_pipe.c |    2 ++
 source/utils/net_ads.c       |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index ba6fbdd..2fd0a6e 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2439,11 +2439,13 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx, const char *domain,
 	return NT_STATUS_NO_MEMORY;
 }
 
+#ifdef HAVE_KRB5
 static int cli_auth_kerberos_data_destructor(struct kerberos_auth_struct *auth)
 {
 	data_blob_free(&auth->session_key);
 	return 0;
 }
+#endif
 
 NTSTATUS rpccli_kerberos_bind_data(TALLOC_CTX *mem_ctx,
 				   enum pipe_auth_level auth_level,
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index c0d04ac..4d37e2b 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1911,9 +1911,9 @@ static int net_ads_search_usage(struct net_context *c, int argc, const char **ar
 {
 	d_printf(
 		"\nnet ads search <expression> <attributes...>\n"
-		"\nperform a raw LDAP search on a ADS server and dump the results\n"
+		"\nPerform a raw LDAP search on a ADS server and dump the results.\n"
 		"The expression is a standard LDAP search expression, and the\n"
-		"attributes are a list of LDAP fields to show in the results\n\n"
+		"attributes are a list of LDAP fields to show in the results.\n\n"
 		"Example: net ads search '(objectCategory=group)' sAMAccountName\n\n"
 		);
 	net_common_flags_usage(c, argc, argv);


-- 
Samba Shared Repository