Author: metze Date: 2006-12-12 21:47:56 +0000 (Tue, 12 Dec 2006) New Revision: 20135
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20135 Log: attach default gensec features to the cli_credentials structure, so make it possible to force encryption or signing. metze Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.c branches/SAMBA_4_0/source/auth/credentials/credentials.h branches/SAMBA_4_0/source/auth/gensec/gensec.c Changeset: Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.c =================================================================== --- branches/SAMBA_4_0/source/auth/credentials/credentials.c 2006-12-12 21:47:47 UTC (rev 20134) +++ branches/SAMBA_4_0/source/auth/credentials/credentials.c 2006-12-12 21:47:56 UTC (rev 20135) @@ -63,6 +63,7 @@ cred->callback_running = False; cli_credentials_set_kerberos_state(cred, CRED_AUTO_USE_KERBEROS); + cli_credentials_set_gensec_features(cred, 0); return cred; } @@ -78,7 +79,17 @@ return creds->use_kerberos; } +void cli_credentials_set_gensec_features(struct cli_credentials *creds, uint32_t gensec_features) +{ + creds->gensec_features = gensec_features; +} +uint32_t cli_credentials_get_gensec_features(struct cli_credentials *creds) +{ + return creds->gensec_features; +} + + /** * Obtain the username for this credentials context. * @param cred credentials context Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.h =================================================================== --- branches/SAMBA_4_0/source/auth/credentials/credentials.h 2006-12-12 21:47:47 UTC (rev 20134) +++ branches/SAMBA_4_0/source/auth/credentials/credentials.h 2006-12-12 21:47:56 UTC (rev 20135) @@ -106,6 +106,9 @@ /* Should we be trying to use kerberos? */ enum credentials_use_kerberos use_kerberos; + /* gensec features which should be used for connections */ + uint32_t gensec_features; + /* Number of retries left before bailing out */ int tries; Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-12-12 21:47:47 UTC (rev 20134) +++ branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-12-12 21:47:56 UTC (rev 20135) @@ -1047,6 +1047,8 @@ _PUBLIC_ NTSTATUS gensec_set_credentials(struct gensec_security *gensec_security, struct cli_credentials *credentials) { gensec_security->credentials = talloc_reference(gensec_security, credentials); + NT_STATUS_HAVE_NO_MEMORY(gensec_security->credentials); + gensec_want_feature(gensec_security, cli_credentials_get_gensec_features(gensec_security->credentials)); return NT_STATUS_OK; }
