From: Phil Mayers <p.mayers@imperial.ac.uk>
Date: Fri, 21 Sep 2012 14:42:44 +0000 (+0100)
Subject: fix soh_xlat function prototype; fix warning about const discarded
X-Git-Tag: release_3_0_0_beta1~1662^2~1^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b21906123aac2246966f4e245c23986ac48b0bc0;p=thirdparty%2Ffreeradius-server.git

fix soh_xlat function prototype; fix warning about const discarded
---

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 1e459f9fa6b..2edaffb41e5 100644
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 
 
 typedef struct rlm_soh_t {
-	const char *xlat_name;
+	char *xlat_name;
 	int dhcp;
 } rlm_soh_t;
 
@@ -38,7 +38,7 @@ typedef struct rlm_soh_t {
 /*
  * Not sure how to make this useful yet...
  */
-static size_t soh_xlat(UNUSED void *instance, REQUEST *request, char *fmt, char *out, size_t outlen, UNUSED RADIUS_ESCAPE_STRING func) {
+static size_t soh_xlat(UNUSED void *instance, REQUEST *request, const char *fmt, char *out, size_t outlen, UNUSED RADIUS_ESCAPE_STRING func) {
 
 	VALUE_PAIR* vp[6];
 	const char *osname;
@@ -116,6 +116,7 @@ static int soh_detach(void *instance) {
 }
 
 static int soh_instantiate(CONF_SECTION *conf, void **instance) {
+	const char *name;
 	rlm_soh_t *inst;
 
 	inst = *instance = rad_malloc(sizeof(*inst));
@@ -129,9 +130,9 @@ static int soh_instantiate(CONF_SECTION *conf, void **instance) {
 		return -1;
 	}
 
-	inst->xlat_name = cf_section_name2(conf);
-	if (!inst->xlat_name) inst->xlat_name = cf_section_name1(conf);
-	inst->xlat_name = strdup(inst->xlat_name);
+	name = cf_section_name2(conf);
+	if (!name) name = cf_section_name1(conf);
+	inst->xlat_name = strdup(name);
 	xlat_register(inst->xlat_name, soh_xlat, inst);
 
 	return 0;