[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  ed59f21 s3-ntlmssp void function cannot return value
      from  84a940e s3: Fix some nonempty blank lines

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


- Log -----------------------------------------------------------------
commit ed59f21f65bf9c16422a01068535bf4a862372d7
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Aug 4 08:38:21 2011 +1000

    s3-ntlmssp void function cannot return value
    
    Removing the return is reasonable here because while no callers
    currently specify more than one flag at a time, the
    ntlmssp_want_feature code allows it.
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Aug  4 02:19:46 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/libsmb/ntlmssp_wrap.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c
index 31ba8f5..ad8ad27 100644
--- a/source3/libsmb/ntlmssp_wrap.c
+++ b/source3/libsmb/ntlmssp_wrap.c
@@ -133,13 +133,13 @@ void auth_ntlmssp_want_feature(struct auth_ntlmssp_state *ans, uint32_t feature)
 {
 	if (ans->gensec_security) {
 		if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
-			return gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SESSION_KEY);
+			gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SESSION_KEY);
 		}
 		if (feature & NTLMSSP_FEATURE_SIGN) {
-			return gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
+			gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
 		}
 		if (feature & NTLMSSP_FEATURE_SEAL) {
-			return gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
+			gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
 		}
 	} else {
 		ntlmssp_want_feature(ans->ntlmssp_state, feature);


-- 
Samba Shared Repository