appl/test: Sprinkle const and rk_UNCONST.
This commit is contained in:
committed by
Nicolas Williams
parent
ac3f9212da
commit
e293353c4d
@@ -36,10 +36,10 @@
|
||||
static int help_flag;
|
||||
static int version_flag;
|
||||
static char *port_str;
|
||||
char *keytab_str;
|
||||
const char *keytab_str;
|
||||
krb5_keytab keytab;
|
||||
char *service = SERVICE;
|
||||
char *mech = "krb5";
|
||||
const char *service = SERVICE;
|
||||
const char *mech = "krb5";
|
||||
int fork_flag;
|
||||
char *password = NULL;
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ do_trans (int sock, gss_ctx_id_t context_hdl)
|
||||
/* get_mic */
|
||||
|
||||
input_token->length = 3;
|
||||
input_token->value = strdup("hej");
|
||||
input_token->value = rk_UNCONST("hej");
|
||||
|
||||
maj_stat = gss_get_mic(&min_stat,
|
||||
context_hdl,
|
||||
@@ -84,7 +84,7 @@ do_trans (int sock, gss_ctx_id_t context_hdl)
|
||||
/* wrap */
|
||||
|
||||
input_token->length = 7;
|
||||
input_token->value = "hemligt";
|
||||
input_token->value = rk_UNCONST("hemligt");
|
||||
|
||||
maj_stat = gss_wrap (&min_stat,
|
||||
context_hdl,
|
||||
|
||||
@@ -149,7 +149,8 @@ process_it(int sock,
|
||||
gss_release_buffer (&min_stat, input_token);
|
||||
gss_release_buffer (&min_stat, output_token);
|
||||
|
||||
input_token->value = "hejhej";
|
||||
/* used read-only by gss_wrap */
|
||||
input_token->value = rk_UNCONST("hejhej");
|
||||
input_token->length = 6;
|
||||
|
||||
maj_stat = gss_wrap (&min_stat,
|
||||
@@ -190,7 +191,8 @@ proto (int sock, const char *service)
|
||||
u_char init_buf[4];
|
||||
u_char acct_buf[4];
|
||||
gss_OID mech_oid;
|
||||
char *mech, *p;
|
||||
const char *mech;
|
||||
char *p;
|
||||
|
||||
memset(&remote, 0, sizeof(remote));
|
||||
local = remote;
|
||||
|
||||
@@ -113,8 +113,8 @@ static int version_flag;
|
||||
static int verbose_flag;
|
||||
static int mutual_flag = 1;
|
||||
static int delegate_flag;
|
||||
static char *port_str = "http";
|
||||
static char *gss_service = "HTTP";
|
||||
static const char *port_str = "http";
|
||||
static const char *gss_service = "HTTP";
|
||||
|
||||
static struct getargs http_args[] = {
|
||||
{ "verbose", 'v', arg_flag, &verbose_flag, "verbose logging", NULL },
|
||||
|
||||
@@ -140,7 +140,8 @@ proto (int sock, const char *hostname, const char *service)
|
||||
/* wrap */
|
||||
|
||||
input_token->length = 7;
|
||||
input_token->value = "hemligt";
|
||||
/* used read-only by gss_wrap */
|
||||
input_token->value = rk_UNCONST("hemligt");
|
||||
|
||||
|
||||
maj_stat = gss_wrap (&min_stat,
|
||||
|
||||
@@ -50,8 +50,8 @@ RCSID("$Id$");
|
||||
static int help_flag;
|
||||
static int version_flag;
|
||||
static char *port_str;
|
||||
char *service = SERVICE;
|
||||
static char *auth_file;
|
||||
const char *service = SERVICE;
|
||||
static const char *auth_file;
|
||||
|
||||
static struct getargs args[] = {
|
||||
{ "port", 'p', arg_string, &port_str, "port to listen to", "port" },
|
||||
|
||||
@@ -80,7 +80,8 @@ proto (int sock, const char *hostname, const char *service)
|
||||
if (status)
|
||||
krb5_err (context, 1, status, "krb5_sendauth");
|
||||
|
||||
data.data = "hej";
|
||||
/* used read-only by krb5_mk_safe */
|
||||
data.data = rk_UNCONST("hej");
|
||||
data.length = 3;
|
||||
|
||||
krb5_data_zero (&packet);
|
||||
@@ -101,7 +102,7 @@ proto (int sock, const char *hostname, const char *service)
|
||||
if (krb5_net_write (context, &sock, packet.data, len) != len)
|
||||
err (1, "krb5_net_write");
|
||||
|
||||
data.data = "hemligt";
|
||||
data.data = rk_UNCONST("hemligt");
|
||||
data.length = 7;
|
||||
|
||||
krb5_data_free (&packet);
|
||||
|
||||
@@ -78,9 +78,9 @@
|
||||
|
||||
#define PORT "test"
|
||||
|
||||
extern char *service;
|
||||
extern char *mech;
|
||||
extern char *keytab_str;
|
||||
extern const char *service;
|
||||
extern const char *mech;
|
||||
extern const char *keytab_str;
|
||||
extern krb5_keytab keytab;
|
||||
extern int fork_flag;
|
||||
int server_setup(krb5_context*, int, char**);
|
||||
|
||||
@@ -148,7 +148,8 @@ proto (int sock, const char *hostname, const char *service)
|
||||
}
|
||||
}
|
||||
|
||||
data.data = "hej";
|
||||
/* used read-only by krb5_mk_safe */
|
||||
data.data = rk_UNCONST("hej");
|
||||
data.length = 3;
|
||||
|
||||
krb5_data_zero (&packet);
|
||||
@@ -165,7 +166,8 @@ proto (int sock, const char *hostname, const char *service)
|
||||
if(status)
|
||||
krb5_err(context, 1, status, "krb5_write_message");
|
||||
|
||||
data.data = "hemligt";
|
||||
/* used read-only by krb5_mk_priv */
|
||||
data.data = rk_UNCONST("hemligt");
|
||||
data.length = 7;
|
||||
|
||||
krb5_data_free (&packet);
|
||||
|
||||
Reference in New Issue
Block a user