summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-20 00:02:15 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:52:06 +0100
commit0500b87092540d300b4e021a0fb95ce16a44fbd2 (patch)
treed8ff9774916e84dbc568f77edd4925b1f6b51735 /source4/auth
parent3e75f222bcdf114238cc4f2bcc61332dc059135f (diff)
downloadsamba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.gz
samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.bz2
samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.zip
r26540: Revert my previous commit after concerns raised by Andrew.
(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/auth.c2
-rw-r--r--source4/auth/gensec/cyrus_sasl.c2
-rw-r--r--source4/auth/gensec/schannel_sign.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index 708e2f8d73..918890b3f6 100644
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -500,7 +500,7 @@ const struct auth_operations *auth_backend_byname(const char *name)
*/
const struct auth_critical_sizes *auth_interface_version(void)
{
- const static struct auth_critical_sizes critical_sizes = {
+ static const struct auth_critical_sizes critical_sizes = {
AUTH_INTERFACE_VERSION,
sizeof(struct auth_operations),
sizeof(struct auth_method_context),
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c
index 331499a466..64a0b2f0c7 100644
--- a/source4/auth/gensec/cyrus_sasl.c
+++ b/source4/auth/gensec/cyrus_sasl.c
@@ -365,7 +365,7 @@ NTSTATUS gensec_sasl_init(void)
int sasl_ret, i;
const char **sasl_mechs;
- const sasl_callback_t callbacks[] = {
+ static const sasl_callback_t callbacks[] = {
{
.id = SASL_CB_LOG,
.proc = gensec_sasl_log,
diff --git a/source4/auth/gensec/schannel_sign.c b/source4/auth/gensec/schannel_sign.c
index 71ac0cc933..1e57beba08 100644
--- a/source4/auth/gensec/schannel_sign.c
+++ b/source4/auth/gensec/schannel_sign.c
@@ -113,7 +113,7 @@ NTSTATUS schannel_unseal_packet(struct gensec_security *gensec_security,
uint8_t confounder[8];
uint8_t seq_num[8];
uint8_t sealing_key[16];
- const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
+ static const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
if (sig->length != 32) {
return NT_STATUS_ACCESS_DENIED;
@@ -162,7 +162,7 @@ NTSTATUS schannel_check_packet(struct gensec_security *gensec_security,
uint8_t digest_final[16];
uint8_t seq_num[8];
- const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
+ static const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
/* w2k sends just 24 bytes and skip the confounder */
if (sig->length != 32 && sig->length != 24) {
@@ -212,7 +212,7 @@ NTSTATUS schannel_seal_packet(struct gensec_security *gensec_security,
uint8_t confounder[8];
uint8_t seq_num[8];
uint8_t sealing_key[16];
- const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
+ static const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
generate_random_buffer(confounder, 8);
@@ -258,7 +258,7 @@ NTSTATUS schannel_sign_packet(struct gensec_security *gensec_security,
uint8_t digest_final[16];
uint8_t seq_num[8];
- const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
+ static const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
RSIVAL(seq_num, 0, state->seq_num);
SIVAL(seq_num, 4, state->initiator?0x80:0);