s/avps/vps/g

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 83d6c2d..f724f0b 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -60,7 +60,7 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
 
     gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
 
-    vp = pairfind(ctx->acceptorCtx.avps, PW_USER_NAME);
+    vp = pairfind(ctx->acceptorCtx.vps, PW_USER_NAME);
     if (vp != NULL) {
         nameBuf.length = vp->length;
         nameBuf.value = vp->vp_strvalue;
@@ -75,7 +75,7 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
 
     ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
 
-    major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.avps,
+    major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.vps,
                                   PW_MS_MPPE_SEND_KEY, VENDORPEC_MS, &vp);
     if (major == GSS_S_COMPLETE && ctx->encryptionType != ENCTYPE_NULL) {
         major = gssEapDeriveRfc3961Key(minor,
@@ -157,7 +157,7 @@ eapGssSmAcceptIdentity(OM_uint32 *minor,
 static OM_uint32
 setAcceptorIdentity(OM_uint32 *minor,
                     gss_ctx_id_t ctx,
-                    VALUE_PAIR **avps)
+                    VALUE_PAIR **vps)
 {
     OM_uint32 major;
     gss_buffer_desc nameBuf;
@@ -182,7 +182,7 @@ setAcceptorIdentity(OM_uint32 *minor,
     /* Acceptor-Service-Name */
     krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf);
 
-    major = gssEapRadiusAddAvp(minor, rh, avps,
+    major = gssEapRadiusAddAvp(minor, rh, vps,
                                PW_GSS_ACCEPTOR_SERVICE_NAME,
                                VENDORPEC_UKERNA,
                                &nameBuf);
@@ -192,7 +192,7 @@ setAcceptorIdentity(OM_uint32 *minor,
     /* Acceptor-Host-Name */
     krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf);
 
-    major = gssEapRadiusAddAvp(minor, rh, avps,
+    major = gssEapRadiusAddAvp(minor, rh, vps,
                                PW_GSS_ACCEPTOR_HOST_NAME,
                                VENDORPEC_UKERNA,
                                &nameBuf);
@@ -215,7 +215,7 @@ setAcceptorIdentity(OM_uint32 *minor,
         nameBuf.value = ssi;
         nameBuf.length = strlen(ssi);
 
-        major = gssEapRadiusAddAvp(minor, rh, avps,
+        major = gssEapRadiusAddAvp(minor, rh, vps,
                                    PW_GSS_ACCEPTOR_SERVICE_SPECIFIC,
                                    VENDORPEC_UKERNA,
                                    &nameBuf);
@@ -230,7 +230,7 @@ setAcceptorIdentity(OM_uint32 *minor,
     krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf);
     if (nameBuf.length != 0) {
         /* Acceptor-Realm-Name */
-        major = gssEapRadiusAddAvp(minor, rh, avps,
+        major = gssEapRadiusAddAvp(minor, rh, vps,
                                    PW_GSS_ACCEPTOR_REALM_NAME,
                                    VENDORPEC_UKERNA,
                                    &nameBuf);
@@ -332,7 +332,7 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor,
         if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
             goto cleanup;
     } else {
-        ctx->acceptorCtx.avps = frresp->vps;
+        ctx->acceptorCtx.vps = frresp->vps;
         frresp->vps = NULL;
 
         major = acceptReadyEap(minor, ctx, cred);

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 74fb522..8d3f86c 100644 (file)
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -160,7 +160,7 @@ struct gss_eap_acceptor_ctx {
     struct rs_connection *radConn;
     char *radServer;
     gss_buffer_desc state;
-    VALUE_PAIR *avps;
+    VALUE_PAIR *vps;
 };
 
 struct gss_ctx_id_struct {

diff --git a/util_context.c b/util_context.c
index be42260..16a361f 100644 (file)
--- a/util_context.c
+++ b/util_context.c
@@ -94,8 +94,8 @@ releaseAcceptorContext(struct gss_eap_acceptor_ctx *ctx)
     if (ctx->radServer != NULL)
         GSSEAP_FREE(ctx->radServer);
     gss_release_buffer(&tmpMinor, &ctx->state);
-    if (ctx->avps != NULL)
-        pairfree(&ctx->avps);
+    if (ctx->vps != NULL)
+        pairfree(&ctx->vps);
 }
 
 OM_uint32

diff --git a/util_radius.cpp b/util_radius.cpp
index d1ff877..43d329f 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -77,7 +77,7 @@ radiusAllocHandle(const char *configFile,
 gss_eap_radius_attr_provider::gss_eap_radius_attr_provider(void)
 {
     m_rh = NULL;
-    m_avps = NULL;
+    m_vps = NULL;
     m_authenticated = false;
 }
 
@@ -85,8 +85,8 @@ gss_eap_radius_attr_provider::~gss_eap_radius_attr_provider(void)
 {
     if (m_rh != NULL)
         rs_context_destroy(m_rh);
-    if (m_avps != NULL)
-        pairfree(&m_avps);
+    if (m_vps != NULL)
+        pairfree(&m_vps);
 }
 
 bool
@@ -121,8 +121,8 @@ gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *ma
     if (!allocRadHandle(radius->m_configFile))
         return false;
 
-    if (radius->m_avps != NULL)
-        m_avps = paircopy(const_cast<VALUE_PAIR *>(radius->getAvps()));
+    if (radius->m_vps != NULL)
+        m_vps = paircopy(const_cast<VALUE_PAIR *>(radius->getAvps()));
 
     return true;
 }
@@ -144,9 +144,9 @@ gss_eap_radius_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager
         return false;
 
     if (gssCtx != GSS_C_NO_CONTEXT) {
-        if (gssCtx->acceptorCtx.avps != NULL) {
-            m_avps = paircopy(gssCtx->acceptorCtx.avps);
-            if (m_avps == NULL)
+        if (gssCtx->acceptorCtx.vps != NULL) {
+            m_vps = paircopy(gssCtx->acceptorCtx.vps);
+            if (m_vps == NULL)
                 return false;
         }
     }
@@ -198,7 +198,7 @@ gss_eap_radius_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addA
     VALUE_PAIR *vp;
     std::vector <std::string> seen;
 
-    for (vp = m_avps; vp != NULL; vp = vp->next) {
+    for (vp = m_vps; vp != NULL; vp = vp->next) {
         gss_buffer_desc attribute;
         char attrid[64];
         if (isHiddenAttributeP(ATTRID(vp->attribute), VENDOR(vp->attribute)))
@@ -295,7 +295,7 @@ gss_eap_radius_attr_provider::getAttribute(uint16_t vattrid,
     if (i == -1)
         i = 0;
 
-    for (vp = pairfind(m_avps, attrid);
+    for (vp = pairfind(m_vps, attrid);
          vp != NULL;
          vp = pairfind(vp->next, attrid)) {
         if (count++ == i) {
@@ -345,7 +345,7 @@ gss_eap_radius_attr_provider::getFragmentedAttribute(uint16_t attribute,
 {
     OM_uint32 major, minor;
 
-    major = gssEapRadiusGetAvp(&minor, m_avps, attribute, vendor, value, TRUE);
+    major = gssEapRadiusGetAvp(&minor, m_vps, attribute, vendor, value, TRUE);
 
     if (authenticated != NULL)
         *authenticated = m_authenticated;
@@ -376,7 +376,7 @@ gss_eap_radius_attr_provider::mapToAny(int authenticated,
     if (authenticated && !m_authenticated)
         return (gss_any_t)NULL;
 
-    return (gss_any_t)paircopy(m_avps);
+    return (gss_any_t)paircopy(m_vps);
 }
 
 void
@@ -686,7 +686,7 @@ gss_eap_radius_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx,
     unsigned char *p = (unsigned char *)buffer->value;
     size_t remain = buffer->length;
     OM_uint32 configFileLen, count;
-    VALUE_PAIR **pNext = &m_avps;
+    VALUE_PAIR **pNext = &m_vps;
 
     if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
         return false;
@@ -741,7 +741,7 @@ gss_eap_radius_attr_provider::exportToBuffer(gss_buffer_t buffer) const
     unsigned char *p;
     size_t remain = 4 + m_configFile.length() + 4;
 
-    for (vp = m_avps; vp != NULL; vp = vp->next) {
+    for (vp = m_vps; vp != NULL; vp = vp->next) {
         remain += avpSize(vp);
         count++;
     }
@@ -767,7 +767,7 @@ gss_eap_radius_attr_provider::exportToBuffer(gss_buffer_t buffer) const
     p += 4;
     remain -= 4;
 
-    for (vp = m_avps; vp != NULL; vp = vp->next) {
+    for (vp = m_vps; vp != NULL; vp = vp->next) {
         avpExport(m_rh, vp, &p, &remain);
     }
 
@@ -779,7 +779,7 @@ gss_eap_radius_attr_provider::getExpiryTime(void) const
 {
     VALUE_PAIR *vp;
 
-    vp = pairfind(m_avps, PW_SESSION_TIMEOUT);
+    vp = pairfind(m_vps, PW_SESSION_TIMEOUT);
     if (vp == NULL || vp->lvalue == 0)
         return 0;
 

diff --git a/util_radius.h b/util_radius.h
index c505b2a..cbd8a92 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -98,11 +98,11 @@ public:
 private:
     bool allocRadHandle(const std::string &configFile);
     const VALUE_PAIR *getAvps(void) const {
-        return m_avps;
+        return m_vps;
     }
 
     struct rs_handle *m_rh;
-    VALUE_PAIR *m_avps;
+    VALUE_PAIR *m_vps;
     bool m_authenticated;
     std::string m_configFile;
 };